piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed scons=parsing

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@591 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-09-20 22:06:22 +00:00
parent d9e4b55f15
commit 3e2419776f
12 changed files with 78 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/SConscript
View File

@ -25,5 +25,5 @@ files = [
]
env_common = env.Clone()
env_common.Append(CXXFLAGS = ' ' + ' '.join([ '-fPIC' ]))
env_common.Append(CXXFLAGS = [ '-fPIC' ])
env_common.StaticLibrary("common", files)

11
Source/Core/DebuggerWX/src/SConscript
View File

@ -17,15 +17,14 @@ files = ["LogWindow.cpp",
]
wxenv = env.Clone()
wxenv.Append(
CXXFLAGS = ' ' + ' '.join([
env['WXCPPFLAGS'],
CXXFLAGS = [
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP'
]),
LINKFLAGS = ' ' + ' '.join([
],
LINKFLAGS = [
'-L/usr/local/lib',
'-pthread',
env['WXLIBFLAGS'],
])
]
)
wxenv.StaticLibrary("debwx", files, LIBS = [ "common" ])

16
Source/Core/DolphinWX/Src/SConscript
View File

@ -23,18 +23,14 @@ libs = [
wxenv = env.Clone()
wxenv.Append(
CXXFLAGS = ' ' + ' '.join([
env['WXCPPFLAGS'],
CXXFLAGS = [
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP',
'`sdl-config --cflags`',
]),
LINKFLAGS = ' ' + ' '.join([
],
LINKFLAGS = [
'-L/usr/local/lib',
'-pthread',
env['WXLIBFLAGS'],
'`sdl-config --libs`'
])
]
)
if sys.platform == 'darwin':
@ -66,5 +62,5 @@ else:
exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
objects = [ wxenv.Object(srcFile) for srcFile in files ]
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ], LIBS = libs)
wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ], LIBS = libs)
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ], LIBS=wxenv['LIBS']+libs)
wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ], LIBS=wxenv['LIBS']+libs)

2
Source/Core/VideoCommon/Src/SConscript
View File

@ -13,5 +13,5 @@ files = [
]
env_common = env.Clone()
env_common.Append(CXXFLAGS = ' ' + ' '.join([ '-fPIC' ]))
env_common.Append(CXXFLAGS = [ '-fPIC' ])
env_common.StaticLibrary("videocommon", files)