Linux: Woops, SConscripts were broken, fixed. I think I broke using wx..maybe. Too tired to fix right now, must sleep
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@763 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
9a3ebd0c3b
commit
580193658a
|
@ -182,7 +182,7 @@ if not env['nowx']:
|
|||
print 'gui build requires wxwidgets >= 2.8'
|
||||
Exit(1)
|
||||
if not env['nowx']:
|
||||
dirs.Append['Source/Core/DebuggerWX/Src',]
|
||||
dirs += ['Source/Core/DebuggerWX/Src',]
|
||||
|
||||
# After all configuration tests are done
|
||||
env = conf.Finish()
|
||||
|
@ -190,7 +190,7 @@ env = conf.Finish()
|
|||
#wx windows flags
|
||||
if not env['nowx']:
|
||||
wxconfig.ParseWXConfig(env)
|
||||
compileFlags.append('-DUSE_WX')
|
||||
compileFlags += ['-DUSE_WX',]
|
||||
|
||||
#get sdl stuff
|
||||
env.ParseConfig('sdl-config --cflags --libs')
|
||||
|
|
|
@ -17,8 +17,8 @@ libs = [
|
|||
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
|
||||
]
|
||||
if not env['nowx']:
|
||||
files.Append['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
|
||||
libs.Append['debwx', ]
|
||||
files += ['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
|
||||
libs += ['debwx', ]
|
||||
|
||||
wxenv = env.Clone()
|
||||
wxenv.Append(
|
||||
|
|
|
@ -25,7 +25,7 @@ files = [
|
|||
'UCodes/UCode_Zelda.cpp',
|
||||
]
|
||||
if not env['nowx']:
|
||||
files.Append['Debugger/Debugger.cpp', 'Debugger/PBView.cpp', 'Logging/Logging.cpp',]
|
||||
files += ['Debugger/Debugger.cpp', 'Debugger/PBView.cpp', 'Logging/Logging.cpp',]
|
||||
|
||||
dspenv = env.Clone()
|
||||
dspenv.Append(
|
||||
|
|
|
@ -12,7 +12,7 @@ files = [
|
|||
"PadSimple.cpp",
|
||||
]
|
||||
if not env['nowx']:
|
||||
files.Append["GUI/ConfigDlg.cpp", "XInputBase.cpp",]
|
||||
files += ["GUI/ConfigDlg.cpp", "XInputBase.cpp",]
|
||||
padenv = env.Clone()
|
||||
padenv.Append(LIBS = [ 'common', 'X11' ])
|
||||
padenv.SharedLibrary(output, files)
|
||||
|
|
|
@ -25,7 +25,7 @@ files = [
|
|||
'XFB.cpp',
|
||||
]
|
||||
if not env['nowx']:
|
||||
files.Append['GUI/ConfigDlg.cpp',]
|
||||
files += ['GUI/ConfigDlg.cpp',]
|
||||
compileFlags = [
|
||||
'-fPIC',
|
||||
]
|
||||
|
|
|
@ -12,7 +12,7 @@ files = [
|
|||
'nJoy.cpp',
|
||||
]
|
||||
if not env['nowx']:
|
||||
files.Append['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',]
|
||||
files += ['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',]
|
||||
|
||||
padenv = env.Clone()
|
||||
padenv.Append(
|
||||
|
|
Loading…
Reference in New Issue