X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=10614ec63aa119e1a6278583eea3dcf1e06b9417;hp=0dd79eea8be54413e40db1810428ea3d34960881;hb=d352cde27e89b1be21bf8f88c3ca79e0eb497165;hpb=b60f2812208aa36dc8b9e8e90f02b608dafd0c00

diff --git a/Makefile b/Makefile
index 0dd79eea..10614ec6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
 #CROSS_COMPILE=
+AS = $(CROSS_COMPILE)as
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 
-CFLAGS += -Wall -ggdb -Ifrontend
-LDFLAGS += -lz -lpthread -ldl
+CFLAGS += -ggdb -Ifrontend
+LDFLAGS += -lz -lpthread -ldl -lpng
 ifdef CROSS_COMPILE
-CFLAGS += -O2 -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
+CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
+ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 endif
+ifndef DEBUG
+CFLAGS += -O2 # -DNDEBUG
+endif
+#DRC_DBG = 1
+#PCNT = 1
 TARGET = pcsx
 
 all: $(TARGET)
@@ -18,6 +25,17 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore
 	libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o libpcsxcore/psxhle.o \
 	libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \
 	libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o
+# dynarec
+ifndef NO_NEW_DRC
+OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
+endif
+OBJS += libpcsxcore/new_dynarec/emu_if.o
+libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c
+ifdef DRC_DBG
+libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
+CFLAGS += -DDRC_DBG
+endif
+
 # spu
 OBJS += plugins/dfsound/adsr.o plugins/dfsound/dma.o plugins/dfsound/oss.o plugins/dfsound/reverb.o \
 	plugins/dfsound/xa.o plugins/dfsound/freeze.o plugins/dfsound/cfg.o plugins/dfsound/registers.o \
@@ -37,10 +55,23 @@ endif
 OBJS += gui/Config.o gui/Plugin.o
 
 OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o
-OBJS += frontend/linux/fbdev.o
+OBJS += frontend/menu.o
+OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
+OBJS += frontend/linux/plat.o frontend/linux/oshide.o
+OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o
+ifdef CROSS_COMPILE
+OBJS += frontend/arm_utils.o
+OBJS += frontend/plat_omap.o
+else
+OBJS += frontend/plat_dummy.o
+endif
+frontend/%.o: CFLAGS += -Wall -DIN_EVDEV
 
 $(TARGET): $(OBJS)
-	$(CC) -o $@ $^ $(LDFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
+
+spunull.so: plugins/spunull/spunull.c
+	$(CC) $(CFLAGS) -shared -fPIC -o $@ $^
 
 clean:
 	$(RM) $(TARGET) $(OBJS)