ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix *BSD build. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7006 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-31 03:58:18 +00:00
parent 7a6c9df8ea
commit 424b8fd6b3
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,17 +7,10 @@ from SconsTests import utils
files = ['BootManager.cpp'] files = ['BootManager.cpp']
# 'plugin_videosoftware',
libs = [
'core', 'discio', 'plugin_videoogl',
'audiocommon', 'common', 'inputcommon', 'videocommon',
'GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z',
]
wxlibs = [ ]
ldflags = [ ] ldflags = [ ]
libs = [ ]
if not env['HAVE_WX']: if not env['HAVE_WX']:
files += ['MainNoGUI.cpp'] files += ['MainNoGUI.cpp']
else: else:
@ -56,7 +49,13 @@ else:
env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles) env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles)
wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx'] libs += ['debwx', 'debugger_ui_util', 'dolphinwx']
libs += ['core', 'discio', 'plugin_videoogl'] # 'plugin_videosoftware'
if env['HAVE_WX']:
libs += ['videouicommon']
libs += ['audiocommon', 'common', 'inputcommon', 'videocommon']
libs += ['GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z']
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ "stdafx.cpp" ] files += [ "stdafx.cpp" ]
@ -67,7 +66,7 @@ elif sys.platform == 'darwin':
exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin' exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
if env['HAVE_WX']: if env['HAVE_WX']:
wxlibs += env['wxconfiglibs'] libs += env['wxconfiglibs']
else: else:
libs += [ 'iconv' ] libs += [ 'iconv' ]
exe += 'NoGUI' exe += 'NoGUI'
@ -133,10 +132,6 @@ else:
env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys') env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
env.InstallAs(env['data_dir'] + '/user', '#Data/User') env.InstallAs(env['data_dir'] + '/user', '#Data/User')
libs = wxlibs + libs + env['LIBS']
linkflags = ldflags + env['LINKFLAGS'] linkflags = ldflags + env['LINKFLAGS']
if env['HAVE_WX']: env.Program(exe, files, LIBS = libs + env['LIBS'], LINKFLAGS = linkflags)
libs += ['videouicommon']
env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags)

5
Source/Core/VideoCommon/Src/Debugger.cpp
View File

@ -26,11 +26,6 @@
#include "VertexShaderGen.h" #include "VertexShaderGen.h"
#include "NativeVertexFormat.h" #include "NativeVertexFormat.h"
GFXDebuggerBase *g_pdebugger = NULL;
volatile bool GFXDebuggerPauseFlag = false;
volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE;
volatile int GFXDebuggerEventToPauseCount = 0;
//void UpdateFPSDisplay(const char *text); //void UpdateFPSDisplay(const char *text);
extern NativeVertexFormat *g_nativeVertexFmt; extern NativeVertexFormat *g_nativeVertexFmt;

4
Source/Core/VideoUICommon/Src/DebuggerPanel.cpp
View File

@ -41,6 +41,10 @@ BEGIN_EVENT_TABLE(GFXDebuggerPanel, wxPanel)
EVT_BUTTON(ID_CLEAR_PIXEL_SHADER_CACHE,GFXDebuggerPanel::OnClearPixelShaderCacheButton) EVT_BUTTON(ID_CLEAR_PIXEL_SHADER_CACHE,GFXDebuggerPanel::OnClearPixelShaderCacheButton)
END_EVENT_TABLE() END_EVENT_TABLE()
GFXDebuggerBase *g_pdebugger = NULL;
volatile bool GFXDebuggerPauseFlag = false;
volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE;
volatile int GFXDebuggerEventToPauseCount = 0;
GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoint &position, GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoint &position,
const wxSize& size, long style, const wxString &title) const wxSize& size, long style, const wxString &title)