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

Linux compile fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3519 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2009-06-21 09:35:31 +00:00
parent eef35f9537
commit e91ab24bce
7 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -56,6 +56,7 @@ include_paths = [
basedir + 'Source/Core/VideoCommon/Src', basedir + 'Source/Core/VideoCommon/Src',
basedir + 'Source/Core/InputCommon/Src', basedir + 'Source/Core/InputCommon/Src',
basedir + 'Source/Core/AudioCommon/Src', basedir + 'Source/Core/AudioCommon/Src',
basedir + 'Source/Core/DebuggerUICommon/Src',
basedir + 'Source/Core/DSPCore/Src', basedir + 'Source/Core/DSPCore/Src',
] ]
@ -70,6 +71,7 @@ dirs = [
'Source/Core/VideoCommon/Src', 'Source/Core/VideoCommon/Src',
'Source/Core/InputCommon/Src', 'Source/Core/InputCommon/Src',
'Source/Core/AudioCommon/Src', 'Source/Core/AudioCommon/Src',
'Source/Core/DebuggerUICommon/Src',
'Source/Core/DSPCore/Src', 'Source/Core/DSPCore/Src',
'Source/DSPTool/Src', 'Source/DSPTool/Src',
'Source/Plugins/Plugin_VideoOGL/Src', 'Source/Plugins/Plugin_VideoOGL/Src',

1
Source/Core/Common/Src/SConscript
View File

@ -29,6 +29,7 @@ files = [
"PluginPAD.cpp", "PluginPAD.cpp",
"SDCardUtil.cpp", "SDCardUtil.cpp",
"StringUtil.cpp", "StringUtil.cpp",
"SymbolDB.cpp",
"Thread.cpp", "Thread.cpp",
"Thunk.cpp", "Thunk.cpp",
"Timer.cpp", "Timer.cpp",

2
Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
View File

@ -18,7 +18,7 @@
#include "Common.h" #include "Common.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "Debugger_SymbolMap.h" #include "Debugger_SymbolMap.h"
#include "Debugger_Breakpoints.h" #include "Debugger_BreakPoints.h"
#include "../Core.h" #include "../Core.h"
#include "../HW/Memmap.h" #include "../HW/Memmap.h"
#include "../PowerPC/PowerPC.h" #include "../PowerPC/PowerPC.h"

3
Source/Core/DebuggerWX/Src/SConscript
View File

@ -29,7 +29,8 @@ wxenv.Append(
] ]
) )
libs = [ libs = [
'common' 'common',
'debugger_ui_util'
] ]
wxenv.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs) wxenv.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs)

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

@ -12,7 +12,7 @@ files = [
libs = [ libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
'common', 'z' 'common', 'z', 'debugger_ui_util'
] ]
if wxenv['HAVE_WX']: if wxenv['HAVE_WX']:

1
Source/Plugins/Plugin_DSP_LLE/Src/DSPDebugInterface.h
View File

@ -4,6 +4,7 @@
#include <string> #include <string>
#include "DebugInterface.h" #include "DebugInterface.h"
#include "Common.h"
class DSPDebugInterface : public DebugInterface class DSPDebugInterface : public DebugInterface
{ {

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

@ -12,6 +12,8 @@ if not env['HAVE_AO']:
files = [ files = [
"Config.cpp", "Config.cpp",
"DSPDebugInterface.cpp",
"DSPSymbols.cpp",
"Globals.cpp", "Globals.cpp",
"main.cpp", "main.cpp",
"Tools.cpp", "Tools.cpp",
@ -31,7 +33,7 @@ if env['HAVE_WX']:
lleenv = env.Clone() lleenv = env.Clone()
lleenv.Append( lleenv.Append(
CXXFLAGS = [ '-fPIC' ], CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'dspcore', 'audiocommon', 'common', ], LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util' ],
) )
lleenv.SharedLibrary(env['plugin_dir']+name, files) lleenv.SharedLibrary(env['plugin_dir']+name, files)