From: notaz <notasas@gmail.com>
Date: Wed, 21 Nov 2012 00:38:10 +0000 (+0200)
Subject: plugins: drop arch filename extensions
X-Git-Tag: r17~11
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=ddd99692bc3e1246c2ccb5e551512f35b4f7959a

plugins: drop arch filename extensions

they do more harm than good
---

diff --git a/configure b/configure
index 42ab9f5c..9668a278 100755
--- a/configure
+++ b/configure
@@ -449,15 +449,7 @@ echo "ARCH = $ARCH" >> $config_mak
 echo "PLATFORM = $platform" >> $config_mak
 echo "BUILTIN_GPU = $builtin_gpu" >> $config_mak
 echo "SOUND_DRIVERS = $sound_drivers" >> $config_mak
-if [ "$ARCH" = "arm" ]; then
-  echo "PLUGINS = $plugins" >> $config_mak
-else
-  echo -n "PLUGINS =" >> $config_mak
-  for p in $plugins; do
-    echo -n " ${p}.${ARCH}" >> $config_mak
-  done
-  echo >> $config_mak
-fi
+echo "PLUGINS = $plugins" >> $config_mak
 if [ "$have_armv6" = "yes" ]; then
   echo "HAVE_ARMV6 = 1" >> $config_mak
 fi
diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index 22da6f57..ad6a8ad9 100644
--- a/plugins/gpulib/gpulib.mak
+++ b/plugins/gpulib/gpulib.mak
@@ -17,10 +17,10 @@ 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)
@@ -34,7 +34,7 @@ ifdef BIN_STANDLALONE
 ifneq ($(findstring .cpp,$(SRC_STANDALONE)),)
 CC_STANDLALONE = $(CXX)
 endif
-$(BIN_STANDLALONE)$(EXT): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
+$(BIN_STANDLALONE): $(SRC) $(SRC_STANDALONE) $(GPULIB_A)
 	$(CC_STANDLALONE) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_STANDALONE)
 	ln -fs $(PLUGINDIR)/$@ ../
 endif
@@ -43,7 +43,7 @@ ifdef BIN_GPULIB
 ifneq ($(findstring .cpp,$(SRC_GPULIB)),)
 CC_GPULIB = $(CXX)
 endif
-$(BIN_GPULIB)$(EXT): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
+$(BIN_GPULIB): $(SRC) $(SRC_GPULIB) $(GPULIB_A)
 	$(CC_GPULIB) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_GPULIB)
 	ln -fs $(PLUGINDIR)/$@ ../
 endif
diff --git a/plugins/spunull/Makefile b/plugins/spunull/Makefile
index dcd25eac..fcfec80e 100644
--- a/plugins/spunull/Makefile
+++ b/plugins/spunull/Makefile
@@ -1,9 +1,6 @@
 include ../../config.mak
 
-ifneq "$(ARCH)" "arm"
- EXT = .$(ARCH)
-endif
-TARGET = spunull.so$(EXT)
+TARGET = spunull.so
 WD = $(shell pwd)
 PLUGINDIR = $(shell basename $(WD))