From dd48940319ff34728b99344c49f0d99b9b527f94 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Fri, 27 Feb 2009 00:24:05 +0000
Subject: [PATCH] Linux: Missed a plugin or two. Now it should compile.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@617 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 fetch.sh                       | 16 ------
 plugins/USBnull/Linux/Makefile |  2 +-
 plugins/build.sh               |  9 +---
 plugins/fetch.sh               | 94 ----------------------------------
 4 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 fetch.sh
 delete mode 100644 plugins/fetch.sh

diff --git a/fetch.sh b/fetch.sh
deleted file mode 100644
index d14488c68f..0000000000
--- a/fetch.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Convenience script for obtaining plugins,
-# Use at your own risk. Assumes that it is being run in the plugins directory.
-
-#Running this script should do the following:
-#1) Check to see if the 6 needed plugin folders exist in the current directory.
-#2) If they aren't. create a temp directory, download the plugins to it from
-#    the official pcsx2 svn, move them into the plugin directory, and then delete
-#    the temp directory.
-
-#3) Check for copies of certain plugins in the current directory, and copy them to
-#     the right place if they exist, assuming that they are modified copies of those plugins.
-
-cd plugins
-sh fetch.sh
-cd ..
\ No newline at end of file
diff --git a/plugins/USBnull/Linux/Makefile b/plugins/USBnull/Linux/Makefile
index f8ac680595..1a5798ffcd 100644
--- a/plugins/USBnull/Linux/Makefile
+++ b/plugins/USBnull/Linux/Makefile
@@ -1,7 +1,7 @@
 
 PLUGIN = libUSBnull.so
 CFG = cfgUSBnull
-CFLAGS+= -fPIC -Wall -I. -I.. -O3 -fomit-frame-pointer -fno-strict-aliasing
+CFLAGS+= -fPIC -Wall -I. -I.. -I../../../common/include -O3 -fomit-frame-pointer -fno-strict-aliasing
 OBJS = ../USB.o
 OBJS+= Config.o Linux.o 
 CFGOBJS = conf.o interface.o support.o
diff --git a/plugins/build.sh b/plugins/build.sh
index d849a648db..f51c1264a3 100644
--- a/plugins/build.sh
+++ b/plugins/build.sh
@@ -12,18 +12,11 @@ exit 1
 fi
 }
 
-#buildplugin gs $@
-#buildplugin cdvd $@
-#buildplugin dev9 $@
-#buildplugin fw $@
-#buildplugin pad $@
-#buildplugin spu2 $@
-#buildplugin usb $@
-
 buildplugin CDVDnull $@
 buildplugin dev9null $@
 buildplugin FWnull $@
 buildplugin USBnull $@
+buildplugin SPU2null $@
 
 buildplugin zerogs $@
 buildplugin zeropad $@
diff --git a/plugins/fetch.sh b/plugins/fetch.sh
deleted file mode 100644
index 28cd554add..0000000000
--- a/plugins/fetch.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-# Convenience script for obtaining plugins,
-# Use at your own risk. Assumes that it is being run in the plugins directory.
-
-#Running this script should do the following:
-#1) Check to see if the 6 needed plugin folders exist in the current directory.
-#2) If they aren't. create a temp directory, download the plugins to it from
-#    the official pcsx2 svn, move them into the plugin directory, and then delete
-#    the temp directory.
-
-#3) Check for copies of certain plugins in the current directory, and copy them to
-#     the right place if they exist, assuming that they are modified copies of those plugins.
-
-curdir=`pwd`
-PLUGINDIRS="gs cdvd dev9 fw pad spu2 usb"
-
-if [ -d "gs" ] & [ -d "cdvd" ] & [ -d "dev9" ] & [ -d "fw" ] & [ -d "pad" ] &  [ -d "spu2" ] & [ -d "usb" ]
-then
-echo "Plugin directories already present."
-else
-echo "Checking plugins out from official Pcsx2 svn..."
-mkdir "temp"
-
-if [ -d "temp" ]
-then
-cd "temp"
-svn checkout http://pcsx2.googlecode.com/svn/trunk/plugins ./ -r 405
-
-echo "Copying..."
-for i in $PLUGINDIRS; do
-		mv $i ../
-        done
-cd ..
-rm -rf ./temp/
-fi
-fi
-
-# Copy the common directory in each individual subfolder so that 
-# you can compile the plugins both individually *and* from the 
-# normal subdirectories.
-for i in $PLUGINDIRS; do
-		rm -rf $i/common
-		cp -r common/ $i/
-        done
-	
-if [ -d zerogs ]
-then
-echo "Importing local copy of zerogs..."
-rm -rf ./gs/zerogs
-cp -r zerogs ./gs/
-fi
-
-if [ -d zerospu2 ]
-then
-echo "Importing local copy of zerospu2..."
-rm -rf ./spu2/zerospu2
-cp -r zerospu2 ./spu2/
-fi
-
-if [ -d zeropad ]
-then
-echo "Importing local copy of zeropad..."
-rm -rf ./pad/zeropad
-cp -r zeropad ./pad/
-fi
-
-if [ -d CDVDiso ]
-then
-echo "Importing local copy of CDVDiso.."
-rm -rf ./cdvd/CDVDiso
-cp -r CDVDiso ./cdvd/
-fi
-
-if [ -d CDVDlinuz ]
-then
-echo "Importing local copy of CDVDlinuz.."
-rm -rf ./cdvd/CDVDlinuz
-cp -r CDVDlinuz ./cdvd/
-fi
-
-if [ -d CDVDisoEFP ]
-then
-echo "Importing local copy of CDVDisoEFP.."
-rm -rf ./cdvd/CDVDisoEFP
-cp -r CDVDisoEFP ./cdvd/
-fi
-
-if [ -d PeopsSPU2 ]
-then
-echo "Importing local copy of PeopsSPU2.."
-rm -rf ./spu2/PeopsSPU2
-cp -r PeopsSPU2 ./spu2/
-fi
-