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
drc: merge Ari64's patch: 02_xor_zero
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
de10e4c
..
63241e5
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
@@
-65,22
+67,36
@@
OBJS += plugins/dfxvideo/draw.o
else
OBJS += plugins/dfxvideo/draw_fb.o
endif
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,7
+134,7
@@
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 \