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
frontend/pollux: wiz: move tables to upper memory to free some RAM
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
5720bab
..
61bec8b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,7
+3,7
@@
# default stuff goes here, so that config can override
TARGET = pcsx
CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
# default stuff goes here, so that config can override
TARGET = pcsx
CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
-LDLIBS += -lpthread -l
dl -lpng -lz -l
m
+LDLIBS += -lpthread -lm
ifndef DEBUG
CFLAGS += -O2 -DNDEBUG
endif
ifndef DEBUG
CFLAGS += -O2 -DNDEBUG
endif
@@
-26,6
+26,7
@@
endif
-include Makefile.local
CC_LINK = $(CC)
-include Makefile.local
CC_LINK = $(CC)
+LDLIBS += $(MAIN_LDLIBS)
# core
OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \
# core
OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \
@@
-64,26
+65,32
@@
endif
# spu
OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
# spu
OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
- plugins/dfsound/registers.o plugins/dfsound/spu.o
+ plugins/dfsound/registers.o plugins/dfsound/spu.o \
+ plugins/dfsound/out.o plugins/dfsound/nullsnd.o
plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
plugins/dfsound/xa.c
ifeq "$(ARCH)" "arm"
OBJS += plugins/dfsound/arm_utils.o
endif
plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
plugins/dfsound/xa.c
ifeq "$(ARCH)" "arm"
OBJS += plugins/dfsound/arm_utils.o
endif
-if
eq "$(SOUND_DRIVER)" "oss"
-plugins/dfsound/
%.o: CFLAGS += -DUSE
OSS
+if
neq ($(findstring oss,$(SOUND_DRIVERS)),)
+plugins/dfsound/
out.o: CFLAGS += -DHAVE_
OSS
OBJS += plugins/dfsound/oss.o
endif
OBJS += plugins/dfsound/oss.o
endif
-if
eq "$(SOUND_DRIVER)" "alsa"
-plugins/dfsound/
%.o: CFLAGS += -DUSE
ALSA
+if
neq ($(findstring alsa,$(SOUND_DRIVERS)),)
+plugins/dfsound/
out.o: CFLAGS += -DHAVE_
ALSA
OBJS += plugins/dfsound/alsa.o
LDLIBS += -lasound
endif
OBJS += plugins/dfsound/alsa.o
LDLIBS += -lasound
endif
-ifeq "$(SOUND_DRIVER)" "sdl"
+ifneq ($(findstring sdl,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_SDL
OBJS += plugins/dfsound/sdl.o
endif
OBJS += plugins/dfsound/sdl.o
endif
-ifeq "$(SOUND_DRIVER)" "none"
-OBJS += plugins/dfsound/nullsnd.o
+ifneq ($(findstring pulseaudio,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_PULSE
+OBJS += plugins/dfsound/pulseaudio.o
+endif
+ifneq ($(findstring libretro,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_LIBRETRO
endif
# builtin gpu
endif
# builtin gpu
@@
-110,7
+117,7
@@
OBJS += plugins/gpu_unai/gpulib_if.o
ifeq "$(ARCH)" "arm"
OBJS += plugins/gpu_unai/gpu_arm.o
endif
ifeq "$(ARCH)" "arm"
OBJS += plugins/gpu_unai/gpu_arm.o
endif
-plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED
+plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED
-O3
CC_LINK = $(CXX)
endif
CC_LINK = $(CXX)
endif
@@
-138,6
+145,7
@@
endif
ifeq "$(PLATFORM)" "caanoo"
OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o
OBJS += frontend/gp2x/in_gp2x.o frontend/warm/warm.o
ifeq "$(PLATFORM)" "caanoo"
OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o
OBJS += frontend/gp2x/in_gp2x.o frontend/warm/warm.o
+libpcsxcore/new_dynarec/pcsxmem.o: CFLAGS += -DCUSTOM_MEMMAPS
USE_FRONTEND = 1
endif
ifeq "$(PLATFORM)" "maemo"
USE_FRONTEND = 1
endif
ifeq "$(PLATFORM)" "maemo"
@@
-234,9
+242,6
@@
rel: pcsx $(PLUGINS) \
sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml
rm out/pcsx.pxml.templ
mv out/*.so out/plugins/
sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml
rm out/pcsx.pxml.templ
mv out/*.so out/plugins/
- mv out/plugins/gpu_unai.so out/plugins/gpuPCSX4ALL.so
- mv out/plugins/gpu_gles.so out/plugins/gpuGLES.so
- mv out/plugins/gpu_peops.so out/plugins/gpuPEOPS.so
$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i frontend/pandora/pcsx.png -c
endif
$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i frontend/pandora/pcsx.png -c
endif
@@
-256,8
+261,6
@@
rel: pcsx $(PLUGINS) \
rm -rf out
mkdir -p out/pcsx_rearmed/plugins
cp -r $^ out/pcsx_rearmed/
rm -rf out
mkdir -p out/pcsx_rearmed/plugins
cp -r $^ out/pcsx_rearmed/
- mv out/pcsx_rearmed/gpu_unai.so out/pcsx_rearmed/gpuPCSX4ALL.so
- mv out/pcsx_rearmed/gpu_gles.so out/pcsx_rearmed/gpuGLES.so
mv out/pcsx_rearmed/*.so out/pcsx_rearmed/plugins/
mv out/pcsx_rearmed/caanoo.gpe out/pcsx_rearmed/pcsx.gpe
mv out/pcsx_rearmed/pcsx_rearmed.ini out/
mv out/pcsx_rearmed/*.so out/pcsx_rearmed/plugins/
mv out/pcsx_rearmed/caanoo.gpe out/pcsx_rearmed/pcsx.gpe
mv out/pcsx_rearmed/pcsx_rearmed.ini out/