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
libretro.c: Change indents from tabs to spaces
[pcsx_rearmed.git]
/
plugins
/
gpulib
/
gpulib.mak
diff --git
a/plugins/gpulib/gpulib.mak
b/plugins/gpulib/gpulib.mak
index
48e73cb
..
6377274
100644
(file)
--- a/
plugins/gpulib/gpulib.mak
+++ b/
plugins/gpulib/gpulib.mak
@@
-1,8
+1,8
@@
# depends on ARCH definition
# depends on ARCH definition
-# always adding gpulib to deps
in case cspace is needed
+# always adding gpulib to deps
(XXX might be no longer needed)
# users must include ../../config.mak
# users must include ../../config.mak
-LDFLAGS += -shared
+LDFLAGS += -shared
-Wl,--no-undefined
CFLAGS += $(PLUGIN_CFLAGS)
ifeq "$(ARCH)" "arm"
EXT =
CFLAGS += $(PLUGIN_CFLAGS)
ifeq "$(ARCH)" "arm"
EXT =
@@
-16,31
+16,36
@@
endif
GPULIB_A = ../gpulib/gpulib$(EXT).a
GPULIB_A = ../gpulib/gpulib$(EXT).a
-ifdef BIN_STAND
L
ALONE
-TARGETS += $(BIN_STAND
LALONE)$(EXT
)
+ifdef BIN_STANDALONE
+TARGETS += $(BIN_STAND
ALONE
)
endif
ifdef BIN_GPULIB
endif
ifdef BIN_GPULIB
-TARGETS += $(BIN_GPULIB)
$(EXT)
+TARGETS += $(BIN_GPULIB)
endif
CC_STANDLALONE = $(CC)
CC_GPULIB = $(CC)
endif
CC_STANDLALONE = $(CC)
CC_GPULIB = $(CC)
+WD = $(shell pwd)
+PLUGINDIR = $(shell basename $(WD))
+
all: ../../config.mak $(TARGETS)
all: ../../config.mak $(TARGETS)
-ifdef BIN_STAND
L
ALONE
+ifdef BIN_STANDALONE
ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
CC_STANDLALONE = $(CXX)
endif
ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
CC_STANDLALONE = $(CXX)
endif
-$(BIN_STAND
LALONE)$(EXT
): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
+$(BIN_STAND
ALONE
): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
$(CC_STANDLALONE) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
$(CC_STANDLALONE) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
+ ln -fs $(PLUGINDIR)/$@ ../
endif
ifdef BIN_GPULIB
ifneq ($(findstring .cpp,$(SRC_GPULIB)),)
CC_GPULIB = $(CXX)
endif
endif
ifdef BIN_GPULIB
ifneq ($(findstring .cpp,$(SRC_GPULIB)),)
CC_GPULIB = $(CXX)
endif
-$(BIN_GPULIB)
$(EXT)
: $(SRC) $(SRC_GPULIB) $(GPULIB_A)
+$(BIN_GPULIB): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
$(CC_GPULIB) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
$(CC_GPULIB) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
+ ln -fs $(PLUGINDIR)/$@ ../
endif
$(GPULIB_A):
endif
$(GPULIB_A):