X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=b9254507db4506ff58625b27f44a440730f1d01e;hb=a148806dc68520d05c8ace7051081a374422c340;hp=07ec24eda7a806b81df742a5a77544b0692ef2ea;hpb=13b692eb4ee66fd0c7d4d45bdead750a4defa90e;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 07ec24e..b925450 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,54 +1,51 @@
-
 # settings
 use_musashi = 1
 #use_fame = 1
 #use_mz80 = 1
+#profile = 1
+#fake_in_gp2x = 1
 
-# profile = 1
-
-
-DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT -DIO_STATS -DIN_EVDEV -DIN_GP2X -DFAKE_IN_GP2X # -DBENCHMARK
-GCC = gcc
-STRIP = strip
-AS = gcc
+-include Makefile.local
 
 ifeq "$(profile)" "1"
-COPT_COMMON = -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math -fprofile-generate
-COPT = $(COPT_COMMON)
+CFLAGS += -O3 -Wall
+CFLAGS += -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
+CFLAGS += -fprofile-generate
 else
-COPT = -ggdb -Wall -fno-strict-aliasing # -pg -O3  -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -ffast-math
-COPT_COMMON = $(COPT)
+CFLAGS = -ggdb -Wall -falign-functions=2
 endif
-
-# gtk
-COPT    += `pkg-config --cflags gtk+-2.0`
-LDFLAGS += `pkg-config --libs gtk+-2.0`
-COPT    += `pkg-config --cflags gthread-2.0`
-LDFLAGS += `pkg-config --libs gthread-2.0`
+DEFINES = _UNZIP_SUPPORT IO_STATS IN_EVDEV
+CFLAGS += -I../.. -I.
+LDFLAGS += -lX11 -lpthread
 
 # frontend
-OBJS += platform/gp2x/main.o platform/gp2x/menu.o platform/gp2x/emu.o usbjoy.o blit.o \
-		in_evdev.o sndout_oss.o gp2x.o 940ctl_ym2612.o log_io.o \
-		platform/gp2x/in_gp2x.o
+OBJS += platform/gp2x/emu.o blit.o in_evdev.o plat.o sndout_oss.o gp2x.o log_io.o
 
 # common
-OBJS += platform/common/emu.o platform/common/menu.o platform/common/config.o platform/common/fonts.o \
-		platform/common/readpng.o platform/common/input.o platform/common/mp3_helix.o
+OBJS += platform/common/main.o platform/common/emu.o platform/common/menu.o \
+	platform/common/config.o platform/common/fonts.o platform/common/readpng.o \
+	platform/common/input.o
+
+ifeq "$(fake_in_gp2x)" "1"
+DEFINES += IN_GP2X FAKE_IN_GP2X
+OBJS += platform/gp2x/in_gp2x.o
+endif
 
 # Pico
 OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \
-		pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
+	pico/videoport.o pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o \
+	pico/sms.o pico/debug.o
 # Pico - CD
 OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
-		pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
-		pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
+	pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
+	pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
 # Pico - Pico
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - sound
 OBJS += pico/sound/sound.o pico/sound/sn76496.o pico/sound/ym2612.o pico/sound/mix.o
 # Pico - carthw
 OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \
-		pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o
+	pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o
 # zlib
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 	zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o
@@ -56,31 +53,33 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 OBJS += unzip/unzip.o unzip/unzip_stream.o
 # CPU cores
 ifeq "$(use_musashi)" "1"
-DEFINC += -DEMU_M68K
+DEFINES += EMU_M68K
 OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kdasm.o
 endif
 ifeq "$(use_fame)" "1"
-DEFINC += -DEMU_F68K
+DEFINES += EMU_F68K
 OBJS += cpu/fame/famec.o
 endif
 # z80
 ifeq "$(use_mz80)" "1"
-DEFINC += -D_USE_MZ80
+DEFINES += _USE_MZ80
 OBJS += cpu/mz80/mz80.o
 else
-DEFINC += -D_USE_CZ80
+DEFINES += _USE_CZ80
 OBJS += cpu/cz80/cz80.o
 endif
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
 OBJS += pico/debugCPU.o
-OBJS += cpu/musashi/m68kdasm.o
 endif
 endif
-OBJS += cpu/musashi/m68kdasm.o
+
+CFLAGS += $(addprefix -D,$(DEFINES))
 
 vpath %.c = ../..
+
 DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
 	zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
 
@@ -95,7 +94,7 @@ tidy:
 
 PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 	@echo ">>>" $@
-	$(GCC) $(COPT) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
+	$(CC) $(CFLAGS) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
 mkdirs:
 	mkdir -p $(DIRS)
@@ -103,6 +102,11 @@ mkdirs:
 pico/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
 pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
 pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
+platform/common/menu.o : revision.h
+
+revision.h:
+	@echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp
+	@diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@
 
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
@@ -119,18 +123,13 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 
 .c.o:
 	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	$(CC) $(CFLAGS) -c $< -o $@
 .s.o:
 	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	$(CC) $(CFLAGS) -c $< -o $@
 
 
-pico/sound/ym2612.o : ../../pico/sound/ym2612.c
-	@echo ">>>" $@
-	$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@
-
 cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h
 	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -Wno-unused -c $< -o $@
-
+	$(CC) $(CFLAGS) -Wno-unused -c $< -o $@