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

fix nowx build 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3107 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator 2009-04-30 08:14:46 +00:00
parent 44516dc226
commit 93a205bd1a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -12,18 +12,22 @@ if not env['HAVE_AO']:
files = [ files = [
"Config.cpp", "Config.cpp",
"DSPConfigDlgLLE.cpp",
"Globals.cpp", "Globals.cpp",
"main.cpp", "main.cpp",
"Tools.cpp", "Tools.cpp",
"DSPHost.cpp", "DSPHost.cpp",
"Debugger/Debugger.cpp",
"Debugger/DSPRegisterView.cpp",
"Logging/AXTask.cpp", "Logging/AXTask.cpp",
"Logging/Logging.cpp", "Logging/Logging.cpp",
"Logging/ReadPBs.cpp", "Logging/ReadPBs.cpp",
] ]
if env['HAVE_WX']:
files += [
"DSPConfigDlgLLE.cpp",
"Debugger/Debugger.cpp",
"Debugger/DSPRegisterView.cpp",
]
lleenv = env.Clone() lleenv = env.Clone()
lleenv.Append( lleenv.Append(
CXXFLAGS = [ '-fPIC' ], CXXFLAGS = [ '-fPIC' ],

3
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -199,6 +199,7 @@ void DllConfig(HWND _hParent)
// Check if at least one resolution was found. If we don't and the resolution array is empty // Check if at least one resolution was found. If we don't and the resolution array is empty
// CreateGUIControls() will crash because the array is empty. // CreateGUIControls() will crash because the array is empty.
#if defined(HAVE_WX) && HAVE_WX
if (config_dialog->arrayStringFor_FullscreenCB.size() == 0) if (config_dialog->arrayStringFor_FullscreenCB.size() == 0)
{ {
config_dialog->AddFSReso("<No resolutions found>"); config_dialog->AddFSReso("<No resolutions found>");
@ -208,7 +209,7 @@ void DllConfig(HWND _hParent)
config_dialog->CreateGUIControls(); config_dialog->CreateGUIControls();
// Hm, why does this code show it modally? // Hm, why does this code show it modally?
config_dialog->ShowModal(); config_dialog->ShowModal();
#endif
} }
void Initialize(void *init) void Initialize(void *init)