kill helix build, it's no longer called anyway

[libpicofe.git] / linux / Makefile

diff --git a/linux/Makefile b/linux/Makefile
index 9a6d8f5..1fecdd7 100644 (file)
--- 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
@@ -37,12 +32,15 @@ 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
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o \
+       pico/videoport.o pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o \
+       pico/mode4.o pico/sms.o pico/misc.o pico/eeprom.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 - 32X
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o
 # Pico - Pico
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - sound
@@ -59,7 +57,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
+#OBJS += cpu/musashi/m68kdasm.o
 endif
 ifeq "$(use_fame)" "1"
 DEFINES += EMU_F68K
@@ -73,6 +71,8 @@ else
 DEFINES += _USE_CZ80
 OBJS += cpu/cz80/cz80.o
 endif
+# sh2
+OBJS += cpu/sh2mame/sh2pico.o
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
@@ -85,7 +85,7 @@ 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
+       pico/32x zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80 cpu/sh2mame
 
 all: mkdirs PicoDrive
 clean: tidy
@@ -94,23 +94,19 @@ tidy:
        $(RM) $(OBJS)
        rm -rf $(DIRS)
        @make -C ../../cpu/mz80/ clean
-       @make -C ../common/helix/ X86=1 clean
 
-PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
+PicoDrive : $(OBJS)
        @echo ">>>" $@
        $(CC) $(CFLAGS) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
 mkdirs:
-       mkdir -p $(DIRS)
+       @mkdir -p $(DIRS)
+
+include ../common/revision.mak
 
 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 $@
+pico/memory.o pico/cd/memory.o : ../../pico/pico_int.h ../../pico/memory.h
 
 ../../cpu/musashi/m68kops.c :
        @make -C ../../cpu/musashi
@@ -122,9 +118,6 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 ../../cpu/mz80/mz80.asm :
        @make -C ../../cpu/mz80/
 
-../common/helix/helix_mp3_x86.a:
-       @make -C ../common/helix/ X86=1 clean all
-
 .c.o:
        @echo ">>>" $<
        $(CC) $(CFLAGS) -c $< -o $@
@@ -133,10 +126,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 $@