From ac6575cdd93d665efc374c1a14b391c6a5308972 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 29 Apr 2012 19:23:09 +0300
Subject: fix some build issues and warnings

---
 plugins/gpulib/Makefile   | 15 ++++++++-------
 plugins/gpulib/gpulib.mak | 17 +++++++++++------
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gpulib/Makefile b/plugins/gpulib/Makefile
index 43f0d2b..2739e5c 100644
--- a/plugins/gpulib/Makefile
+++ b/plugins/gpulib/Makefile
@@ -8,18 +8,19 @@ include ../../config.mak
 OBJS += gpu.o
 
 ifeq "$(ARCH)" "arm"
-ifeq "$(HAVE_NEON)" "1"
-OBJS += cspace_neon.o
-else
-OBJS += cspace.o
-endif
 OBJS += vout_pl.o
 EXT = a
 else
-CFLAGS += `sdl-config --cflags`
-OBJS += vout_sdl.o
+#CFLAGS += `sdl-config --cflags`
+#OBJS += vout_sdl.o
+OBJS += vout_pl.o
 EXT = $(ARCH).a
 endif
+ifeq "$(HAVE_NEON)" "1"
+OBJS += cspace_neon.o
+else
+OBJS += cspace.o
+endif
 CFLAGS += $(PLUGIN_CFLAGS)
 
 TARGET = gpulib.$(EXT)
diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index c82607a..48e73cb 100644
--- 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):
-- 
cgit v1.2.3