Got rid of default Dolphin.ini

Default plugins are now in Paths.h
Important note for scons users, plugin names now match the one on windows!!!
make sure to remove the old ones!! and update your .ini!!



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1131 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_DSP_HLE/Src/SConscript

@@ -3,10 +3,7 @@
 Import('env')
 import sys
 
-if sys.platform == 'darwin':
-	output = '../../../../Binary/mac/Plugins/dsphle.so'
-else:
-	output = '../../../../Binary/linux/Plugins/dsphle.so'
+name = "Plugin_DSP_HLE.so"
 
 files = [
 	'DSPHandler.cpp',
@@ -36,4 +33,4 @@ dspenv.Append(
 	LIBS = [ 'common' ],
 	)
 if not env['osx64']:
-    dspenv.SharedLibrary(output, files)
+    dspenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)

Source/Plugins/Plugin_DSP_LLE/Src/SConscript

@@ -3,10 +3,7 @@
 Import('env')
 import sys
 
-if sys.platform == 'darwin':
-	output = "../../../../Binary/mac/Plugins/dsplle.so"
-else:
-	output = "../../../../Binary/linux/Plugins/dsplle.so"
+name = "Plugin_DSP_LLE.so"
 
 files = [
 	"AOSoundStream.cpp",
@@ -35,4 +32,4 @@ lleenv.Append(
 	LIBS = [ 'common' ],
 	)
 if not env['osx64']:
-    lleenv.SharedLibrary(output, files)
+    lleenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)

Source/Plugins/Plugin_DSP_NULL/Src/SConscript

@@ -3,10 +3,7 @@
 Import('env')
 import sys
 
-if sys.platform == 'darwin':
-	output = "../../../../Binary/mac/Plugins/dspnull.so"
-else:
-	output = "../../../../Binary/linux/Plugins/dspnull.so"
+name = "Plugin_DSP_NULL.so"
 
 files = [
         "DSPHandler.cpp",
@@ -35,4 +32,4 @@ else:
         LIBS = [ 'common' ],
 	)
 
-dspenv.SharedLibrary(output, files)
+dspenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)

Source/Plugins/Plugin_PadSimple/Src/SConscript

@@ -3,10 +3,7 @@
 Import('env')
 import sys
 
-if sys.platform == 'darwin':
-	output = "../../../../Binary/mac/Plugins/padsimple.so"
-else:
-	output = "../../../../Binary/linux/Plugins/padsimple.so"
+name = "Plugin_PadSimple.so"
 
 files = [
 	"PadSimple.cpp",
@@ -27,4 +24,4 @@ if padenv['osx64']:
 		LINKFLAGS = [ '-arch', 'x86_64' ],
 		)
 
-padenv.SharedLibrary(output, files)
+padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -6,6 +6,8 @@ import sys
 sys.path.append('../../../SconsTests')
 import utils
 
+name = "Plugin_VideoOGL.so"
+
 files = [
 	'BPStructs.cpp',
 	'Globals.cpp',
@@ -62,7 +64,6 @@ if gfxenv['osx64']:
 			]
 
 if sys.platform == 'darwin':
-	platform = 'mac'
 	# SDL is currently the only way to get video on Mac OS X.
 	if gfxenv['osx64']:
 		useSDL = False
@@ -78,7 +79,6 @@ if sys.platform == 'darwin':
 		for framework in [ 'OpenGL', 'Cg' ]
 		]
 else:
-	platform = 'linux'
 	# By default, GLX is used on Linux to setup OpenGL, but you can select SDL
 	# instead if you like, by changing the line below.
         tests = {'CheckPKG' : utils.CheckPKG}
@@ -111,7 +111,7 @@ gfxenv.Append(
 	)
 
 gfxenv.SharedLibrary(
-	'../../../../Binary/%s/Plugins/zeroogl.so' % platform,
+	'../../../../'+env['plugin_dir']+name,
 	files,
 	LIBS =  libs + gfxenv['LIBS']
 	)

Source/Plugins/Plugin_Wiimote_Test/Src/SConscript

@@ -3,10 +3,7 @@
 Import('env')
 import sys
 
-if sys.platform == 'darwin':
-	output = "../../../../Binary/mac/Plugins/Plugin_Wiimote.so"
-else:
-	output = "../../../../Binary/linux/Plugins/Plugin_Wiimote.so"
+name = "Plugin_Wiimote.so"
 
 files = [
 	"Wiimote.cpp",
@@ -26,4 +23,4 @@ else:
         LIBS = [ 'common' ],
         )
 
-padenv.SharedLibrary(output, files)
+padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)

Source/Plugins/Plugin_nJoy_SDL/Src/SConscript

@@ -3,10 +3,7 @@
 Import('env')
 import sys
 
-if sys.platform == 'darwin':
-	output = '../../../../Binary/mac/Plugins/Plugin_nJoy_SDL.so'
-else:
-	output = '../../../../Binary/linux/Plugins/Plugin_nJoy_SDL.so'
+name = "Plugin_nJoy_SDL.so"
 
 files = [
 	'nJoy.cpp',
@@ -20,4 +17,4 @@ padenv.Append(
 	LIBS = [ 'common' ],
 	)
 if not env['osx64']:
-    padenv.SharedLibrary(output, files)
+    padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)