fix non gui build

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3921 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator
2009-08-01 18:31:25 +00:00
parent 69c0613160
commit 1e9bb4ed9a
7 changed files with 33 additions and 18 deletions

View File

@ -184,7 +184,9 @@ void PPCDebugInterface::setPC(unsigned int address)
void PPCDebugInterface::showJitResults(unsigned int address)
{
#if !defined(HAVE_WX) && !HAVE_WX
Host_ShowJitResults(address);
#endif
}
void PPCDebugInterface::runToBreakpoint()

View File

@ -1,13 +1,14 @@
# -*- python -*-
Import('env')
files = [] #So it's declared outside the if
if env['HAVE_WX']:
files += [
'CodeView.cpp',
'DebuggerUIUtil.cpp',
'MemoryView.cpp',
]
if not env['HAVE_WX']:
Return()
files += [
'CodeView.cpp',
'DebuggerUIUtil.cpp',
'MemoryView.cpp',
]
acenv = env.Clone()
acenv.Append(CXXFLAGS = [ '-fPIC' ])

View File

@ -49,7 +49,6 @@
#include "BootManager.h"
void* g_pCodeWindow = NULL;
void* main_frame = NULL;
LogManager *logManager = NULL;
// OK, this thread boundary is DANGEROUS on linux
// wxPostEvent / wxAddPendingEvent is the solution.
@ -214,7 +213,6 @@ int main(int argc, char* argv[])
return(1);
}
std::string bootFile(args_info.inputs[0]);
logManager = (LogManager *)CPluginManager::GetInstance().GetGlobals()->logManager;
updateMainFrameEvent.Init();
cpu_info.Detect();

View File

@ -10,10 +10,16 @@ files = [
'cmdline.c',
]
libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
'common', 'z', 'debugger_ui_util'
]
if wxenv['HAVE_WX']:
libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
'common', 'z', 'debugger_ui_util'
]
else:
libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
'common', 'z'
]
if wxenv['HAVE_WX']:
files += [