improve event handling (still has problems though)

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index 50b7b60..2716f8d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,17 @@
-CROSS_COMPILE=
+#CROSS_COMPILE=
+AS = $(CROSS_COMPILE)as

 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 

-CFLAGS += -Wall -ggdb -Ifrontend
+CFLAGS += -ggdb -Ifrontend

 LDFLAGS += -lz -lpthread -ldl
 LDFLAGS += -lz -lpthread -ldl

+ifdef CROSS_COMPILE
+CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
+endif
+ifndef DEBUG
+CFLAGS += -O2
+endif
+#DRC_DBG = 1

 TARGET = pcsx
 
 all: $(TARGET)
 TARGET = pcsx
 
 all: $(TARGET)


@@ -15,23 +23,43 @@ 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
        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 \
        plugins/dfsound/spu.o
 # gpu
 OBJS += plugins/dfxvideo/cfg.o plugins/dfxvideo/fps.o plugins/dfxvideo/key.o plugins/dfxvideo/prim.o \
 # 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 \
        plugins/dfsound/spu.o
 # gpu
 OBJS += plugins/dfxvideo/cfg.o plugins/dfxvideo/fps.o plugins/dfxvideo/key.o plugins/dfxvideo/prim.o \

-       plugins/dfxvideo/zn.o plugins/dfxvideo/draw.o plugins/dfxvideo/gpu.o plugins/dfxvideo/menu.o \
-       plugins/dfxvideo/soft.o
-LDFLAGS += -lz -lpthread -lX11 -lXv
+       plugins/dfxvideo/gpu.o plugins/dfxvideo/menu.o plugins/dfxvideo/soft.o plugins/dfxvideo/zn.o
+ifdef X11
+LDFLAGS += -lX11 -lXv
+OBJS += plugins/dfxvideo/draw.o
+else
+CFLAGS += -D_MACGL # disables X in dfxvideo
+OBJS += plugins/dfxvideo/draw_fb.o
+endif

 
 # gui
 OBJS += gui/Config.o gui/Plugin.o
 
 
 # gui
 OBJS += gui/Config.o gui/Plugin.o
 

-OBJS += frontend/main.o frontend/plugin.o
+OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o
+OBJS += frontend/linux/fbdev.o

 
 $(TARGET): $(OBJS)
 
 $(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)
 
 clean:
        $(RM) $(TARGET) $(OBJS)