summaryrefslogtreecommitdiff
path: root/Source/Core/DebuggerWX
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2008-08-26 22:28:42 +0000
committerMaarten ter Huurne <maarten@treewalker.org>2008-08-26 22:28:42 +0000
commit59974dfb5bfd2488eb31caf8df4a34565fb7c4e0 (patch)
tree5594fa0a91cebdb4de7c2b7b366e2cdf973d97ce /Source/Core/DebuggerWX
parent0ebba1bde0adcc1f6a08832d54a3faaadaddae50 (diff)
Only use "-fPIC" for compiling objects that will be part of dynamic libs. Make SConscripts inherit the compile flags from the top level instead of overriding them.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX')
-rw-r--r--Source/Core/DebuggerWX/src/SConscript18
1 files changed, 14 insertions, 4 deletions
diff --git a/Source/Core/DebuggerWX/src/SConscript b/Source/Core/DebuggerWX/src/SConscript
index 139afb0a93..27935d8cc4 100644
--- a/Source/Core/DebuggerWX/src/SConscript
+++ b/Source/Core/DebuggerWX/src/SConscript
@@ -15,7 +15,17 @@ files = ["LogWindow.cpp",
"RegisterView.cpp",
"JitWindow.cpp",
]
-wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP",
- LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs --debug`")
-
-wxenv.StaticLibrary("debwx", files, LIBS = ["common"])
+wxenv = env.Copy()
+wxenv.Append(
+ CXXFLAGS = ' ' + ' '.join([
+ '`wx-config --cppflags`',
+ '-DUSE_XPM_BITMAPS',
+ '-DwxNEEDS_CHARPP'
+ ]),
+ LINKFLAGS = ' ' + ' '.join([
+ '-L/usr/local/lib',
+ '-pthread',
+ '`wx-config --libs --debug`'
+ ])
+ )
+wxenv.StaticLibrary("debwx", files, LIBS = [ "common" ])