diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-09-20 17:31:54 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-09-20 17:31:54 +0000 |
| commit | 720efb825d8c91eb5f2b5f6aa24e8f4daeedb4db (patch) | |
| tree | ab96e70a7da4a79be15e2a835fb1da78b001bdd3 /Source/Core/DebuggerWX/src/SConscript | |
| parent | 66011849cd5f66c53b7e046bfbffe41711c835d3 (diff) | |
Linux: I made Sconscript call wx-config inside of the main SConstruct, added a nowx argument, Made the filesystemviewer use the correct struct and fixed a silly scissor error that was made
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@589 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/src/SConscript')
| -rw-r--r-- | Source/Core/DebuggerWX/src/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DebuggerWX/src/SConscript b/Source/Core/DebuggerWX/src/SConscript index 5532bf23b7..522e36bbf4 100644 --- a/Source/Core/DebuggerWX/src/SConscript +++ b/Source/Core/DebuggerWX/src/SConscript @@ -18,14 +18,14 @@ files = ["LogWindow.cpp", wxenv = env.Clone() wxenv.Append( CXXFLAGS = ' ' + ' '.join([ - '`wx-config --cppflags`', + env['WXCPPFLAGS'], '-DUSE_XPM_BITMAPS', '-DwxNEEDS_CHARPP' ]), LINKFLAGS = ' ' + ' '.join([ '-L/usr/local/lib', '-pthread', - '`wx-config --libs --debug`' + env['WXLIBFLAGS'], ]) ) wxenv.StaticLibrary("debwx", files, LIBS = [ "common" ]) |