From 93a205bd1a8f4a338fce1951198e96b017d334a4 Mon Sep 17 00:00:00 2001 From: tmator Date: Thu, 30 Apr 2009 08:14:46 +0000 Subject: [PATCH] fix nowx build git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3107 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_DSP_LLE/Src/SConscript | 10 +++++++--- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript index 0691bf89fc..c019c40f32 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript @@ -12,18 +12,22 @@ if not env['HAVE_AO']: files = [ "Config.cpp", - "DSPConfigDlgLLE.cpp", "Globals.cpp", "main.cpp", "Tools.cpp", "DSPHost.cpp", - "Debugger/Debugger.cpp", - "Debugger/DSPRegisterView.cpp", "Logging/AXTask.cpp", "Logging/Logging.cpp", "Logging/ReadPBs.cpp", ] +if env['HAVE_WX']: + files += [ + "DSPConfigDlgLLE.cpp", + "Debugger/Debugger.cpp", + "Debugger/DSPRegisterView.cpp", + ] + lleenv = env.Clone() lleenv.Append( CXXFLAGS = [ '-fPIC' ], diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 0f3bfb5ef2..1745eeb5b6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -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 // CreateGUIControls() will crash because the array is empty. +#if defined(HAVE_WX) && HAVE_WX if (config_dialog->arrayStringFor_FullscreenCB.size() == 0) { config_dialog->AddFSReso(""); @@ -208,7 +209,7 @@ void DllConfig(HWND _hParent) config_dialog->CreateGUIControls(); // Hm, why does this code show it modally? config_dialog->ShowModal(); - +#endif } void Initialize(void *init)