Don't depend on local path/lib settings for easier compilation

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 574e4f0813c2265b182022e5c82dbd0744d47e6b..b7b4d71007d24aad47b5c937a1a41f1ba6bfc905 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,3 +1,4 @@
+PATH=..\..\devkitARM\bin;%PATH%\r

 CC     = arm-elf-gcc\r
 AS     = arm-elf-as\r
 LD     = arm-elf-ld\r
 CC     = arm-elf-gcc\r
 AS     = arm-elf-as\r
 LD     = arm-elf-ld\r

diff --git a/winsrc/Makefile b/winsrc/Makefile
index b398c2c1958c82837d0773c47e434fffd7fd7963..637fa319e918a774ffed08003565d4e371e2d405 100644 (file)
--- a/winsrc/Makefile
+++ b/winsrc/Makefile
@@ -1,8 +1,10 @@
 BASE_DEFS   = /D_WIN32_WINNT=0x501 /DISOLATION_AWARE_ENABLED /D_WIN32_IE=0x600 /DWIN32_LEAN_AND_MEAN /DWIN32 /D_MT /D_CRT_SECURE_NO_WARNINGS\r
 BASE_CFLAGS = /W3 /nologo\r
 \r
 BASE_DEFS   = /D_WIN32_WINNT=0x501 /DISOLATION_AWARE_ENABLED /D_WIN32_IE=0x600 /DWIN32_LEAN_AND_MEAN /DWIN32 /D_MT /D_CRT_SECURE_NO_WARNINGS\r
 BASE_CFLAGS = /W3 /nologo\r
 \r

+LIB=..\..\devkitWIN\lib;%LIB%\r
+\r

 DEFINES  = $(BASE_DEFS)\r
 DEFINES  = $(BASE_DEFS)\r

-CFLAGS   = $(BASE_CFLAGS) /Zi /MT\r
+CFLAGS   = $(BASE_CFLAGS) /I..\..\devkitWIN/include /Zi /MT\r

 \r
 OBJDIR = obj\r
 \r
 \r
 OBJDIR = obj\r
 \r