X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpulib%2Fgpulib.mak;h=ad6a8ad97aed120a73cad439a7bb69d46af5c839;hp=3a7f7cd715853a8034b90ea75138f1b0fee1282c;hb=ee9afdbd4d9e0aee75dd9e17878c76f1c7236d04;hpb=966c128ddcf8b31154d8d2afe62088b3b8f58b4a

diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index 3a7f7cd7..ad6a8ad9 100644
--- a/plugins/gpulib/gpulib.mak
+++ b/plugins/gpulib/gpulib.mak
@@ -1,26 +1,14 @@
 # depends on ARCH definition
 # 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"
- ARM_CORTEXA8 ?= 1
- ifeq "$(ARM_CORTEXA8)" "1"
-  CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon \
-    -fPIC -mfloat-abi=softfp
-  ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
- else
-  CFLAGS += -mcpu=arm926ej-s -mtune=arm926ej-s
-  ASFLAGS += -mcpu=arm926ej-s -mfloat-abi=softfp
- endif
  EXT =
 else
- CFLAGS += -m32
- LDFLAGS += -m32
- LDLIBS_GPULIB += `sdl-config --libs`
- EXT = .x86
-endif
-ifdef MAEMO
- CFLAGS += -DMAEMO
+ #LDLIBS_GPULIB += `sdl-config --libs`
+ EXT = .$(ARCH)
 endif
 ifdef DEBUG
  CFLAGS += -O0
@@ -29,22 +17,35 @@ endif
 GPULIB_A = ../gpulib/gpulib$(EXT).a
 
 ifdef BIN_STANDLALONE
-TARGETS += $(BIN_STANDLALONE)$(EXT)
+TARGETS += $(BIN_STANDLALONE)
 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: $(TARGETS)
+all: ../../config.mak $(TARGETS)
 
 ifdef BIN_STANDLALONE
-$(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
+ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
+CC_STANDLALONE = $(CXX)
+endif
+$(BIN_STANDLALONE): $(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):
@@ -52,3 +53,7 @@ $(GPULIB_A):
 
 clean:
 	$(RM) $(TARGETS)
+
+../../config.mak:
+	@echo "Please run ./configure before running make!"
+	@exit 1