X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fcode940%2FMakefile;h=b939d3362982890ddc7e3dc13e9a81f25e95929f;hb=1f1ff763e661bab664151c4821c65dad35777976;hp=886ded9af08c8b7ab133e3dca3b72c7b81968975;hpb=7c34867ab6109c47ad099e903a57af6d2699074f;p=picodrive.git

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index 886ded9..b939d33 100644
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -1,18 +1,18 @@
-
 # you may or may not need to change this
 #devkit_path = x:/stuff/dev/devkitgp2x/
-devkit_path = /usr/local/devkitPro/devkitGP2X/
+devkit_path ?= $(HOME)/opt/devkitGP2X/
 lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/
-export CROSS = arm-linux-
+CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
 #up = 1
 
-DEFINC = -I../.. -I. -D__GP2X__ -DARM
-# -ftracer
-COPT_COMMON = -static -s -O2 -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math
-CFLAGS = $(COPT_COMMON) $(DEFINC) -mcpu=arm940t -mtune=arm940t
+CFLAGS += -O2 -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math
+CFLAGS += -I../.. -I. -D__GP2X__ -DARM
+CFLAGS += -mcpu=arm940t -mtune=arm940t
+LDFLAGS = -static -s -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc
+
 GCC = $(CROSS)gcc
 STRIP = $(CROSS)strip
 AS = $(CROSS)as
@@ -50,7 +50,7 @@ $(BIN) : code940.elf
 
 code940.elf : $(OBJS940) ../../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
-	$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map
+	$(LD) $^ $(LDFLAGS) -o $@ -Map code940.map
 
 940ym2612.o : ../../../pico/sound/ym2612.c
 	@echo ">>>" $@
@@ -78,6 +78,7 @@ tidy:
 	$(RM) code940.elf $(OBJS940) code940.map
 
 
+##
 OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o
 
 mp3test.gpe : $(OBJSMP3T) ../helix/helix_mp3.a
@@ -88,10 +89,3 @@ mp3test.gpe : $(OBJSMP3T) ../helix/helix_mp3.a
 cleanmp3test:
 	$(RM) $(OBJSMP3T) mp3test.gpe
 
-# uClibc/e_pow.o : uClibc/e_pow.c
-#	@echo $<
-#	@$(GCC) $(CFLAGS) -fno-profile-generate -c $< -o $@
-
-# uClibc/e_sqrt.o : uClibc/e_sqrt.c
-#	@echo $<
-#	@$(GCC) $(CFLAGS) -fno-profile-generate -c $< -o $@