fix some build issues and warnings

[pcsx_rearmed.git] / plugins / gpulib / gpulib.mak

diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index c82607a..48e73cb 100644 (file)
--- a/plugins/gpulib/gpulib.mak
+++ b/plugins/gpulib/gpulib.mak
@@ -7,12 +7,9 @@ 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
@@ -25,17 +22,25 @@ endif
 ifdef BIN_GPULIB
 TARGETS += $(BIN_GPULIB)$(EXT)
 endif
+CC_STANDLALONE = $(CC)
+CC_GPULIB = $(CC)
 
 all: ../../config.mak $(TARGETS)
 
 ifdef BIN_STANDLALONE
+ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
+CC_STANDLALONE = $(CXX)
+endif
 $(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
-       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
+       $(CC_STANDLALONE) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
 endif
 
 ifdef BIN_GPULIB
+ifneq ($(findstring .cpp,$(SRC_GPULIB)),)
+CC_GPULIB = $(CXX)
+endif
 $(BIN_GPULIB)$(EXT): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
-       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
+       $(CC_GPULIB) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
 endif
 
 $(GPULIB_A):