No more Binary in svn + scons clean up

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1158 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-11-13 08:12:48 +00:00
parent a3abeed4f2
commit 2c74f66070
12 changed files with 43 additions and 30 deletions

View File

@ -56,13 +56,13 @@ else:
)
if sys.platform == 'darwin':
exeGUI = '../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin'
exeNoGUI = '../../../../Binary/mac/DolphinNoGUI'
exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
icon = 'Dolphin'
version = 'svn'
wxenv.Plist(
'../../../../Binary/mac/Dolphin.app/Contents/Info.plist',
env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
Value(dict(
CFAppleHelpAnchor = 'index',
CFBundleExecutable = 'Dolphin',
@ -80,8 +80,8 @@ if sys.platform == 'darwin':
))
)
else:
exeGUI = '../../../../Binary/linux/Dolphin'
exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
exeGUI = env['binary_dir'] + 'Dolphin'
exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
objects = [ wxenv.Object(srcFile) for srcFile in files ]
if not wxenv['osx64']:

Binary file not shown.

View File

@ -3,7 +3,7 @@
Import('env')
import sys
name = "Plugin_DSP_HLE.so"
name = "Plugin_DSP_HLE"
files = [
'DSPHandler.cpp',
@ -32,5 +32,5 @@ dspenv.Append(
CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'common' ],
)
if not env['osx64']:
dspenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
dspenv.SharedLibrary(env['plugin_dir']+name, files)

View File

@ -3,7 +3,7 @@
Import('env')
import sys
name = "Plugin_DSP_LLE.so"
name = "Plugin_DSP_LLE"
files = [
"AOSoundStream.cpp",
@ -31,5 +31,5 @@ lleenv.Append(
CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'common' ],
)
if not env['osx64']:
lleenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
lleenv.SharedLibrary(env['plugin_dir']+name, files)

View File

@ -3,7 +3,7 @@
Import('env')
import sys
name = "Plugin_DSP_NULL.so"
name = "Plugin_DSP_NULL"
files = [
"DSPHandler.cpp",
@ -32,4 +32,4 @@ else:
LIBS = [ 'common' ],
)
dspenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
dspenv.SharedLibrary(env['plugin_dir']+name, files)

View File

@ -3,7 +3,7 @@
Import('env')
import sys
name = "Plugin_PadSimple.so"
name = "Plugin_PadSimple"
files = [
"PadSimple.cpp",
@ -24,4 +24,4 @@ if padenv['osx64']:
LINKFLAGS = [ '-arch', 'x86_64' ],
)
padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
padenv.SharedLibrary(env['plugin_dir']+name, files)

View File

@ -3,10 +3,10 @@
Import('env')
# can we import path in one place?
import sys
sys.path.append('../../../SconsTests')
sys.path.append(env['base_dir']+'SconsTests')
import utils
name = "Plugin_VideoOGL.so"
name = "Plugin_VideoOGL"
files = [
'BPStructs.cpp',
@ -111,7 +111,7 @@ gfxenv.Append(
)
gfxenv.SharedLibrary(
'../../../../'+env['plugin_dir']+name,
env['plugin_dir']+name,
files,
LIBS = libs + gfxenv['LIBS']
)

View File

@ -3,7 +3,7 @@
Import('env')
import sys
name = "Plugin_Wiimote.so"
name = "Plugin_Wiimote"
files = [
"Wiimote.cpp",
@ -23,4 +23,4 @@ else:
LIBS = [ 'common' ],
)
padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
padenv.SharedLibrary(env['plugin_dir']+name, files)

View File

@ -3,7 +3,7 @@
Import('env')
import sys
name = "Plugin_nJoy_SDL.so"
name = "Plugin_nJoy_SDL"
files = [
'nJoy.cpp',
@ -17,4 +17,4 @@ padenv.Append(
LIBS = [ 'common' ],
)
if not env['osx64']:
padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
padenv.SharedLibrary(env['plugin_dir']+name, files)