linux port fixed; some cleanups

[libpicofe.git] / linux / Makefile

diff --git a/linux/Makefile b/linux/Makefile
index 9edc7ff..bd612d6 100644 (file)
--- a/linux/Makefile
+++ b/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 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/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