X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flinux%2FMakefile;h=4aa44d8b70eaedd9a20ce34221f2198ecc8bd6f5;hb=c8d1e9b66255c00a3bef7ca27ae019e3523d7a4b;hp=acd930704f850830f0036bb18e3cb728db5bf242;hpb=19e1d027450209006a772aba60b665d8dfea307a;p=picodrive.git diff --git a/platform/linux/Makefile b/platform/linux/Makefile index acd9307..4aa44d8 100644 --- a/platform/linux/Makefile +++ b/platform/linux/Makefile @@ -14,7 +14,7 @@ CFLAGS += -fprofile-generate else CFLAGS = -ggdb -Wall endif -DEFINES = __GP2X__ _UNZIP_SUPPORT IO_STATS IN_EVDEV +DEFINES = _UNZIP_SUPPORT IO_STATS IN_EVDEV CFLAGS += -I../.. -I. # gtk @@ -24,12 +24,12 @@ CFLAGS += `pkg-config --cflags gthread-2.0` LDFLAGS += `pkg-config --libs gthread-2.0` # frontend -OBJS += platform/gp2x/main.o platform/gp2x/emu.o platform/gp2x/plat.o usbjoy.o blit.o \ - in_evdev.o plat.o sndout_oss.o gp2x.o 940ctl_ym2612.o log_io.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 @@ -38,18 +38,18 @@ 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/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 @@ -59,6 +59,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 +77,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 +106,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