Remove the devkitARM version dependency (#309)

haroohie-club · Jan 10, 2024 · ea433e5 · ea433e5
1 parent 1e97485
commit ea433e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/src/SerialLoops.Lib/Project.cs b/src/SerialLoops.Lib/Project.cs
@@ -150,16 +150,6 @@ public LoadProjectResult Load(Config config, ILogger log, IProgressTracker track
                 IO.CopyFileToDirectories(this, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Sources", "Makefile_main"), Path.Combine("src", "Makefile"), log);
                 IO.CopyFileToDirectories(this, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Sources", "Makefile_overlay"), Path.Combine("src", "overlays", "Makefile"), log);
             }
-            if (!string.IsNullOrEmpty(config.DevkitArmPath))
-            {
-                string devkitARMVersionish = Path.GetFileNameWithoutExtension(Directory.GetDirectories(Path.Combine(config.DevkitArmPath, "lib", "gcc", "arm-none-eabi"))[0]);
-
-                log.Log($"DevkitARM version detected as {devkitARMVersionish}");
-                if (!makefile.Contains(devkitARMVersionish))
-                {
-                    log.LogError($"DevkitARM is most likely out of date! (Or, possibly, we are!) If you haven't installed devkitARM recently, consider upgrading.");
-                }
-            }
             if (Directory.GetFiles(Path.Combine(IterativeDirectory, "assets"), "*", SearchOption.AllDirectories).Length > 0)
             {
                 return new(LoadProjectState.LOOSELEAF_FILES);

diff --git a/src/SerialLoops.Lib/Sources/Makefile_main b/src/SerialLoops.Lib/Sources/Makefile_main
@@ -83,7 +83,7 @@ endif
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS    := -lnds9 -lc -lgcc
+LIBS    := -lnds9 -lc
 
 
 #---------------------------------------------------------------------------------
@@ -118,7 +118,7 @@ export INCLUDE    :=    $(foreach dir,$(INCLUDES),-iquote $(CURDIR)/$(dir)) \
 					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
 					-I$(CURDIR)/$(BUILD)
 
-export LIBPATHS    :=    $(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(DEVKITARM)/lib/gcc/arm-none-eabi/13.1.0
+export LIBPATHS    :=    $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
 
 
 .PHONY: $(BUILD) clean

diff --git a/src/SerialLoops.Lib/Sources/Makefile_overlay b/src/SerialLoops.Lib/Sources/Makefile_overlay
@@ -83,7 +83,7 @@ endif
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS    := -lnds9 -lc -lgcc
+LIBS    := -lnds9 -lc
 
 
 #---------------------------------------------------------------------------------
@@ -118,7 +118,7 @@ export INCLUDE    :=    $(foreach dir,$(INCLUDES),-iquote $(CURDIR)/$(dir)) \
 					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
 					-I$(CURDIR)/$(BUILD)
 
-export LIBPATHS    :=    $(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(DEVKITARM)/lib/gcc/arm-none-eabi/13.1.0
+export LIBPATHS    :=    $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
 
 
 .PHONY: $(BUILD) clean