notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dfxvideo: rm some more ZN leftovers
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
de10e4c
..
2c2767a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,7
+14,9
@@
endif
ifndef DEBUG
CFLAGS += -O2 -DNDEBUG
endif
ifndef DEBUG
CFLAGS += -O2 -DNDEBUG
endif
-USE_OSS = 1
+CFLAGS += $(EXTRA_CFLAGS)
+
+USE_OSS ?= 1
#USE_ALSA = 1
#DRC_DBG = 1
#PCNT = 1
#USE_ALSA = 1
#DRC_DBG = 1
#PCNT = 1
@@
-31,13
+33,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
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
+ifeq "$(ARCH)" "arm"
+OBJS += libpcsxcore/gte_neon.o
+endif
# dynarec
ifndef NO_NEW_DRC
OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
OBJS += libpcsxcore/new_dynarec/pcsxmem.o
endif
OBJS += libpcsxcore/new_dynarec/emu_if.o
# dynarec
ifndef NO_NEW_DRC
OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
OBJS += libpcsxcore/new_dynarec/pcsxmem.o
endif
OBJS += libpcsxcore/new_dynarec/emu_if.o
-libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c
+libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
+ libpcsxcore/new_dynarec/pcsxmem_inline.c
ifdef DRC_DBG
libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -DDRC_DBG
ifdef DRC_DBG
libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -DDRC_DBG
@@
-46,6
+52,9
@@
endif
# spu
OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
plugins/dfsound/registers.o plugins/dfsound/spu.o
# spu
OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
plugins/dfsound/registers.o plugins/dfsound/spu.o
+plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
+ plugins/dfsound/xa.c
+plugins/dfsound/%.o: CFLAGS += -Wall
ifeq "$(USE_OSS)" "1"
plugins/dfsound/%.o: CFLAGS += -DUSEOSS
OBJS += plugins/dfsound/oss.o
ifeq "$(USE_OSS)" "1"
plugins/dfsound/%.o: CFLAGS += -DUSEOSS
OBJS += plugins/dfsound/oss.o
@@
-57,30
+66,47
@@
LDFLAGS += -lasound
endif
# gpu
endif
# gpu
-plugins/dfxvideo/%.o: CFLAGS += -Wall
+# note: code is not safe for strict-aliasing? (Castlevania problems)
+plugins/dfxvideo/%.o: CFLAGS += -Wall -fno-strict-aliasing
OBJS += plugins/dfxvideo/gpu.o
OBJS += plugins/dfxvideo/gpu.o
+plugins/dfxvideo/gpu.o: plugins/dfxvideo/fps.c plugins/dfxvideo/prim.c \
+ plugins/dfxvideo/gpu.c plugins/dfxvideo/soft.c
ifdef X11
LDFLAGS += -lX11 -lXv
OBJS += plugins/dfxvideo/draw.o
else
OBJS += plugins/dfxvideo/draw_fb.o
endif
ifdef X11
LDFLAGS += -lX11 -lXv
OBJS += plugins/dfxvideo/draw.o
else
OBJS += plugins/dfxvideo/draw_fb.o
endif
+
# cdrcimg
plugins/cdrcimg/%.o: CFLAGS += -Wall
OBJS += plugins/cdrcimg/cdrcimg.o
# cdrcimg
plugins/cdrcimg/%.o: CFLAGS += -Wall
OBJS += plugins/cdrcimg/cdrcimg.o
+# dfinput
+plugins/dfinput/%.o: CFLAGS += -Wall
+OBJS += plugins/dfinput/pad.o
+
# gui
# gui
-OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o
-OBJS += frontend/menu.o
+OBJS += frontend/main.o frontend/plugin.o
+ifeq "$(USE_GTK)" "1"
+OBJS += maemo/hildon.o maemo/main.o
+maemo/%.o: maemo/%.c
+maemo/%.o: CFLAGS += -Wall
+else
+OBJS += frontend/plugin_lib.o 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
ifeq "$(ARCH)" "arm"
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
ifeq "$(ARCH)" "arm"
-OBJS += frontend/arm_utils.o
OBJS += frontend/plat_omap.o
OBJS += frontend/plat_omap.o
+OBJS += frontend/pandora.o
else
OBJS += frontend/plat_dummy.o
endif
else
OBJS += frontend/plat_dummy.o
endif
+endif # !USE_GTK
+ifeq "$(ARCH)" "arm"
+OBJS += frontend/arm_utils.o
+endif
ifdef X11
frontend/%.o: CFLAGS += -DX11
OBJS += frontend/xkb.o
ifdef X11
frontend/%.o: CFLAGS += -DX11
OBJS += frontend/xkb.o
@@
-118,11
+144,11
@@
clean_plugins:
PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
-VER ?= $(shell git describe
--abbrev=0
master)
+VER ?= $(shell git describe master)
rel: pcsx $(PLUGINS) \
pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
rel: pcsx $(PLUGINS) \
pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
- pandora/picorestore pandora/readme.txt skin COPYING
+ pandora/picorestore pandora/readme.txt
pandora/
skin COPYING
rm -rf out
mkdir -p out/plugins
cp -r $^ out/
rm -rf out
mkdir -p out/plugins
cp -r $^ out/