port to 64bit. Some gcc 4.4 warning fixes

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 0fc42c3..cdfea37 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,8 +1,12 @@
-export CROSS = arm-linux-\r
+CROSS ?= arm-linux-\r
 \r
 # settings\r
-#mz80 = 1\r
-#debug_cyclone = 1\r
+use_cyclone = 1\r
+#use_musashi = 1\r
+use_drz80 = 1\r
+use_sh2drc = 1\r
+#use_sh2mame = 1\r
+\r
 asm_memory = 1\r
 asm_render = 1\r
 asm_ym2612 = 1\r
@@ -11,25 +15,23 @@ asm_cdpico = 1
 asm_cdmemory = 1\r
 amalgamate = 0\r
 #profile = 1\r
-#use_musashi = 1\r
-use_sh2mame = 1\r
-#up = 1\r
+#drc_debug = 3\r
 \r
+-include Makefile.local\r
 \r
 ifeq "$(debug_cyclone)" "1"\r
 use_cyclone = 1\r
 use_musashi = 1\r
 endif\r
 ifeq "$(use_musashi)" "1"\r
+# due to CPU stop flag acces\r
 asm_cdpico = 0\r
-asm_memory = 0\r
 asm_cdmemory = 0\r
-else\r
-use_cyclone = 1\r
 endif\r
 \r
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK\r
-CFLAGS += -Wall -Winline\r
+ARCH = arm\r
+DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK\r
+CFLAGS += -Wall -Winline -I../.. -I.\r
 ifeq ($(DEBUG),)\r
 CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 else\r
@@ -42,8 +44,9 @@ ifeq "$(profile)" "2"
 CFLAGS += -fprofile-use\r
 endif\r
 CFLAGS += -mcpu=arm920t -mtune=arm920t\r
-SFLAGS = $(CFLAGS)\r
 ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
+LDFLAGS += -lm -lpng\r
+\r
 CC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
@@ -51,7 +54,7 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o emu.o in_gp2x.o\r
+OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o soc_dummy.o emu.o in_gp2x.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
@@ -92,32 +95,8 @@ OBJS += unzip/unzip.o unzip/unzip_stream.o
 # zlib\r
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
        zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o\r
-# debug\r
-ifeq "$(debug_cyclone)" "1"\r
-OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
-endif\r
-# CPU cores\r
-ifeq "$(use_musashi)" "1"\r
-DEFINC += -DEMU_M68K\r
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
-endif\r
-ifeq "$(use_cyclone)" "1"\r
-DEFINC += -DEMU_C68K\r
-OBJS += pico/m68kif_cyclone.o cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
-endif\r
-ifeq "$(mz80)" "1"\r
-DEFINC += -D_USE_MZ80\r
-OBJS += cpu/mz80/mz80.o\r
-else\r
-DEFINC += -D_USE_DRZ80\r
-OBJS += cpu/DrZ80/drz80.o\r
-endif\r
-OBJS += cpu/sh2/sh2.o\r
-ifeq "$(use_sh2mame)" "1"\r
-OBJS += cpu/sh2/mame/sh2pico.o\r
-else\r
-endif\r
-OBJS += cpu/drc/cmn.o\r
+\r
+CFLAGS += $(addprefix -D,$(DEFINES))\r
 \r
 vpath %.c = ../..\r
 vpath %.s = ../..\r
@@ -130,6 +109,7 @@ DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/p
 \r
 all: mkdirs PicoDrive\r
 \r
+include ../common/common.mak\r
 include ../common/common_arm.mak\r
 include ../common/revision.mak\r
 \r
@@ -141,7 +121,7 @@ PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 # also libm on F100 is not compatible\r
 PicoDrive : PicoDrive.o\r
        @echo ">>>" $@\r
-       $(CC) -static -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=$@.map\r
+       $(CC) -static -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=$@.map\r
 ifeq ($(DEBUG),)\r
        $(STRIP) $@\r
 endif\r