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
spu: stop at 0 volume
[pcsx_rearmed.git]
/
plugins
/
gpulib
/
gpulib.mak
diff --git
a/plugins/gpulib/gpulib.mak
b/plugins/gpulib/gpulib.mak
index
c82607a
..
22da6f5
100644
(file)
--- a/
plugins/gpulib/gpulib.mak
+++ b/
plugins/gpulib/gpulib.mak
@@
-2,17
+2,14
@@
# always adding gpulib to deps in case cspace is needed
# users must include ../../config.mak
# always adding gpulib to deps in case cspace is needed
# users must include ../../config.mak
-LDFLAGS += -shared
+LDFLAGS += -shared
-Wl,--no-undefined
CFLAGS += $(PLUGIN_CFLAGS)
ifeq "$(ARCH)" "arm"
EXT =
else
CFLAGS += $(PLUGIN_CFLAGS)
ifeq "$(ARCH)" "arm"
EXT =
else
- LDLIBS_GPULIB += `sdl-config --libs`
+
#
LDLIBS_GPULIB += `sdl-config --libs`
EXT = .$(ARCH)
endif
EXT = .$(ARCH)
endif
-ifeq "$(PLATFORM)" "maemo"
- CFLAGS += -DMAEMO
-endif
ifdef DEBUG
CFLAGS += -O0
endif
ifdef DEBUG
CFLAGS += -O0
endif
@@
-25,17
+22,30
@@
endif
ifdef BIN_GPULIB
TARGETS += $(BIN_GPULIB)$(EXT)
endif
ifdef BIN_GPULIB
TARGETS += $(BIN_GPULIB)$(EXT)
endif
+CC_STANDLALONE = $(CC)
+CC_GPULIB = $(CC)
+
+WD = $(shell pwd)
+PLUGINDIR = $(shell basename $(WD))
all: ../../config.mak $(TARGETS)
ifdef BIN_STANDLALONE
all: ../../config.mak $(TARGETS)
ifdef BIN_STANDLALONE
+ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
+CC_STANDLALONE = $(CXX)
+endif
$(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
$(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
+ $(CC_STANDLALONE) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
+ ln -fs $(PLUGINDIR)/$@ ../
endif
ifdef BIN_GPULIB
endif
ifdef BIN_GPULIB
+ifneq ($(findstring .cpp,$(SRC_GPULIB)),)
+CC_GPULIB = $(CXX)
+endif
$(BIN_GPULIB)$(EXT): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
$(BIN_GPULIB)$(EXT): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
+ $(CC_GPULIB) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
+ ln -fs $(PLUGINDIR)/$@ ../
endif
$(GPULIB_A):
endif
$(GPULIB_A):