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

diff --git a/linux/Makefile b/linux/Makefile
index bd612d6..b925450 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -12,16 +12,11 @@ CFLAGS += -O3 -Wall
 CFLAGS += -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
 CFLAGS += -fprofile-generate
 else
-CFLAGS = -ggdb -Wall
+CFLAGS = -ggdb -Wall -falign-functions=2
 endif
 DEFINES = _UNZIP_SUPPORT IO_STATS IN_EVDEV
 CFLAGS += -I../.. -I.
-
-# gtk
-CFLAGS  += `pkg-config --cflags gtk+-2.0`
-LDFLAGS += `pkg-config --libs gtk+-2.0`
-CFLAGS  += `pkg-config --cflags gthread-2.0`
-LDFLAGS += `pkg-config --libs gthread-2.0`
+LDFLAGS += -lX11 -lpthread
 
 # frontend
 OBJS += platform/gp2x/emu.o blit.o in_evdev.o plat.o sndout_oss.o gp2x.o log_io.o
@@ -38,7 +33,8 @@ 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 \
@@ -59,6 +55,7 @@ OBJS += unzip/unzip.o unzip/unzip_stream.o
 ifeq "$(use_musashi)" "1"
 DEFINES += EMU_M68K
 OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kdasm.o
 endif
 ifeq "$(use_fame)" "1"
 DEFINES += EMU_F68K
@@ -76,10 +73,8 @@ endif
 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))
 
@@ -107,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
@@ -129,10 +129,6 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 	$(CC) $(CFLAGS) -c $< -o $@
 
 
-#pico/sound/ym2612.o : ../../pico/sound/ym2612.c
-#	@echo ">>>" $@
-#	$(CC) $(CFLAGS) -c $< -o $@
-
 cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -Wno-unused -c $< -o $@