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: track output and psx sizes separately
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
5720bab
..
8b7d83c
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