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: massive cleanup
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
724fdbc
..
2602abb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-42,13
+42,12
@@
OBJS += plugins/dfsound/adsr.o plugins/dfsound/dma.o plugins/dfsound/oss.o plugi
plugins/dfsound/xa.o plugins/dfsound/freeze.o plugins/dfsound/cfg.o plugins/dfsound/registers.o \
plugins/dfsound/spu.o
# gpu
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/gpu.o plugins/dfxvideo/menu.o plugins/dfxvideo/soft.o plugins/dfxvideo/zn
.o
+plugins/dfxvideo/%.o: CFLAGS += -Wall
+
OBJS += plugins/dfxvideo/gpu
.o
ifdef X11
LDFLAGS += -lX11 -lXv
OBJS += plugins/dfxvideo/draw.o
else
ifdef X11
LDFLAGS += -lX11 -lXv
OBJS += plugins/dfxvideo/draw.o
else
-plugins/dfxvideo/%.o: CFLAGS += -D_MACGL # disables X in dfxvideo
OBJS += plugins/dfxvideo/draw_fb.o
endif
# cdrcimg
OBJS += plugins/dfxvideo/draw_fb.o
endif
# cdrcimg
@@
-88,6
+87,9
@@
$(TARGET): $(OBJS)
spunull.so: plugins/spunull/spunull.c
$(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^
spunull.so: plugins/spunull/spunull.c
$(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^
+plugins/gpu-gles/gpuGLES.so:
+ make -C plugins/gpu-gles/
+
clean:
$(RM) $(TARGET) $(OBJS)
clean:
$(RM) $(TARGET) $(OBJS)
@@
-97,7
+99,8
@@
PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
VER ?= $(shell git describe --abbrev=0 master)
VER ?= $(shell git describe --abbrev=0 master)
-rel: pcsx spunull.so pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
+rel: pcsx spunull.so plugins/gpu-gles/gpuGLES.so \
+ pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
pandora/picorestore pandora/readme.txt skin COPYING
rm -rf out
mkdir -p out/plugins
pandora/picorestore pandora/readme.txt skin COPYING
rm -rf out
mkdir -p out/plugins