X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpulib%2Fgpulib.mak;h=6377274ec5f6110515294e23629b1a1e03a124b5;hp=c82607afd8a2869055c043814299d855e4ff70c4;hb=4ae83961a97c97cf6bf7e775cc08337b292b9853;hpb=4132e8ca13b6395f8a9ef7ec7d01cbdcc19c037d

diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index c82607af..6377274e 100644
--- a/plugins/gpulib/gpulib.mak
+++ b/plugins/gpulib/gpulib.mak
@@ -1,41 +1,51 @@
 # 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
 
-LDFLAGS += -shared
+LDFLAGS += -shared -Wl,--no-undefined
 CFLAGS += $(PLUGIN_CFLAGS)
 ifeq "$(ARCH)" "arm"
  EXT =
 else
- LDLIBS_GPULIB += `sdl-config --libs`
+ #LDLIBS_GPULIB += `sdl-config --libs`
  EXT = .$(ARCH)
 endif
-ifeq "$(PLATFORM)" "maemo"
- CFLAGS += -DMAEMO
-endif
 ifdef DEBUG
  CFLAGS += -O0
 endif
 
 GPULIB_A = ../gpulib/gpulib$(EXT).a
 
-ifdef BIN_STANDLALONE
-TARGETS += $(BIN_STANDLALONE)$(EXT)
+ifdef BIN_STANDALONE
+TARGETS += $(BIN_STANDALONE)
 endif
 ifdef BIN_GPULIB
-TARGETS += $(BIN_GPULIB)$(EXT)
+TARGETS += $(BIN_GPULIB)
 endif
+CC_STANDLALONE = $(CC)
+CC_GPULIB = $(CC)
+
+WD = $(shell pwd)
+PLUGINDIR = $(shell basename $(WD))
 
 all: ../../config.mak $(TARGETS)
 
-ifdef BIN_STANDLALONE
-$(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
+ifdef BIN_STANDALONE
+ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
+CC_STANDLALONE = $(CXX)
+endif
+$(BIN_STANDALONE): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
+	$(CC_STANDLALONE) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
+	ln -fs $(PLUGINDIR)/$@ ../
 endif
 
 ifdef BIN_GPULIB
-$(BIN_GPULIB)$(EXT): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
+ifneq ($(findstring .cpp,$(SRC_GPULIB)),)
+CC_GPULIB = $(CXX)
+endif
+$(BIN_GPULIB): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
+	$(CC_GPULIB) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
+	ln -fs $(PLUGINDIR)/$@ ../
 endif
 
 $(GPULIB_A):