X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=f0cd64ef4b6a7d2de189b6874768d1675b234144;hb=91be5ebd10d16f1e5cf40fe1f115ed7f6b464743;hp=ff8e0327fa08c692501a3722e1ca369cb59b541e;hpb=34e424aa2709dfc457d751f55cdbf5b881ae3ef4;p=picodrive.git

diff --git a/Makefile b/Makefile
index ff8e032..f0cd64e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,15 @@
 TARGET ?= PicoDrive
-CFLAGS += -Wall -ggdb -falign-functions=2
+CFLAGS += -Wall -g
 CFLAGS += -I.
 ifndef DEBUG
-CFLAGS += -O3 -DNDEBUG -ffunction-sections
-ifeq ($(findstring clang,$(CC)),)
-LDFLAGS += -Wl,--gc-sections
+CFLAGS += -O3 -DNDEBUG
 endif
-endif
-#CFLAGS += -DEVT_LOG
-#CFLAGS += -DDRC_CMP
-#cpu_cmp = 1
-#drc_debug = 7
-#profile = 1
 
+# This is actually needed, bevieve me.
+# If you really have to disable this, set NO_ALIGN_FUNCTIONS elsewhere.
+ifndef NO_ALIGN_FUNCTIONS
+CFLAGS += -falign-functions=2
+endif
 
 all: config.mak target_
 
@@ -51,11 +48,6 @@ endif
 
 -include Makefile.local
 
-ifneq "$(use_cyclone)" "1"
-# due to CPU stop flag access
-asm_cdmemory = 0
-endif
-
 ifeq "$(PLATFORM)" "opendingux"
 opk: $(TARGET).opk
 
@@ -119,7 +111,7 @@ USE_FRONTEND = 1
 PLATFORM_MP3 = 1
 endif
 ifeq "$(PLATFORM)" "libretro"
-OBJS += platform/libretro.o 
+OBJS += platform/libretro/libretro.o
 endif
 
 ifeq "$(USE_FRONTEND)" "1"
@@ -189,7 +181,11 @@ clean:
 	$(RM) -r .opk_data
 
 $(TARGET): $(OBJS)
+ifeq ($(STATIC_LINKING), 1)
+	$(AR) rcs $@ $^
+else
 	$(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) $(LDLIBS)
+endif
 
 pprof: platform/linux/pprof.c
 	$(CC) -O2 -ggdb -DPPROF -DPPROF_TOOL -I../../ -I. $^ -o $@
@@ -200,6 +196,9 @@ tools/textfilter: tools/textfilter.c
 .s.o:
 	$(CC) $(CFLAGS) -c $< -o $@
 
+.S.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+
 # special flags - perhaps fix this someday instead?
 pico/draw.o: CFLAGS += -fno-strict-aliasing
 pico/draw2.o: CFLAGS += -fno-strict-aliasing
@@ -214,7 +213,12 @@ pico/cd/gfx_cd.o: CFLAGS += -fno-strict-aliasing
 # on x86, this is reduced by ~300MB when debug info is off (but not on ARM)
 # not using O3 and -fno-expensive-optimizations seems to also help, but you may
 # want to remove this stuff for better performance if your compiler can handle it
+ifndef DEBUG
 cpu/fame/famec.o: CFLAGS += -g0 -O2 -fno-expensive-optimizations
+endif
+
+pico/carthw_cfg.c: pico/carthw.cfg
+	tools/make_carthw_c $< $@
 
 # random deps
 pico/carthw/svp/compiler.o : cpu/drc/emit_$(ARCH).c