X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpulib%2Fgpulib.mak;h=48e73cb6e0d2c2808315006a5ab178d5b659ebc3;hp=cec6f5a68be4548d66ed16b09466e226f70e16b5;hb=ac6575cdd93d665efc374c1a14b391c6a5308972;hpb=62d7fa9555924ab8e152b546711d27add640b102

diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index cec6f5a6..48e73cb6 100644
--- a/plugins/gpulib/gpulib.mak
+++ b/plugins/gpulib/gpulib.mak
@@ -1,32 +1,20 @@
 # depends on ARCH definition
-# always adding gpulib to LDLIBS in case cspace is needed
+# always adding gpulib to deps in case cspace is needed
+# users must include ../../config.mak
 
 LDFLAGS += -shared
+CFLAGS += $(PLUGIN_CFLAGS)
 ifeq "$(ARCH)" "arm"
- ARM_CORTEXA8 ?= 1
- ifeq "$(ARM_CORTEXA8)" "1"
-  CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -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
 endif
 
 GPULIB_A = ../gpulib/gpulib$(EXT).a
-LDLIBS += $(GPULIB_A)
 
 ifdef BIN_STANDLALONE
 TARGETS += $(BIN_STANDLALONE)$(EXT)
@@ -34,17 +22,25 @@ endif
 ifdef BIN_GPULIB
 TARGETS += $(BIN_GPULIB)$(EXT)
 endif
+CC_STANDLALONE = $(CC)
+CC_GPULIB = $(CC)
 
-all: $(GPULIB_A) $(TARGETS)
+all: ../../config.mak $(TARGETS)
 
 ifdef BIN_STANDLALONE
-$(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE)
-	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(LDLIBS_STANDALONE)
+ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
+CC_STANDLALONE = $(CXX)
+endif
+$(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
+	$(CC_STANDLALONE) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
 endif
 
 ifdef BIN_GPULIB
-$(BIN_GPULIB)$(EXT): $(SRC) $(SRC_GPULIB)
-	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(LDLIBS_GPULIB)
+ifneq ($(findstring .cpp,$(SRC_GPULIB)),)
+CC_GPULIB = $(CXX)
+endif
+$(BIN_GPULIB)$(EXT): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
+	$(CC_GPULIB) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
 endif
 
 $(GPULIB_A):
@@ -52,3 +48,7 @@ $(GPULIB_A):
 
 clean:
 	$(RM) $(TARGETS)
+
+../../config.mak:
+	@echo "Please run ./configure before running make!"
+	@exit 1