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

some scons fixes 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1425 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-07 17:09:40 +00:00
parent 3f4d2633dd
commit fcfb8ffdd5
7 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -28,7 +28,7 @@
#include "Config.h" #include "Config.h"
#include "ConfigMain.h" #include "ConfigMain.h"
#include "Core.h" #include "Core.h"
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
#include "Frame.h" #include "Frame.h"
#include "CodeWindow.h" #include "CodeWindow.h"
#endif #endif
@ -37,7 +37,7 @@ static std::string s_DataBasePath_EUR = "Data_EUR";
static std::string s_DataBasePath_USA = "Data_USA"; static std::string s_DataBasePath_USA = "Data_USA";
static std::string s_DataBasePath_JAP = "Data_JAP"; static std::string s_DataBasePath_JAP = "Data_JAP";
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
extern CFrame* main_frame; extern CFrame* main_frame;
extern CCodeWindow* g_pCodeWindow; extern CCodeWindow* g_pCodeWindow;
#endif #endif
@ -52,7 +52,7 @@ bool BootCore(const std::string& _rFilename)
{ {
SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
if (g_pCodeWindow) if (g_pCodeWindow)
{ {
// StartUp.bUseDualCore = code_frame->UseDualCore(); // StartUp.bUseDualCore = code_frame->UseDualCore();
@ -63,15 +63,15 @@ bool BootCore(const std::string& _rFilename)
// StartUp.bUseDualCore = false; // StartUp.bUseDualCore = false;
// StartUp.bUseJIT = true; // StartUp.bUseJIT = true;
} }
#endif //osx 64 #endif
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO; StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
StartUp.m_strFilename = _rFilename; StartUp.m_strFilename = _rFilename;
SConfig::GetInstance().m_LastFilename = StartUp.m_strFilename; SConfig::GetInstance().m_LastFilename = StartUp.m_strFilename;
StartUp.bRunCompareClient = false; StartUp.bRunCompareClient = false;
StartUp.bRunCompareServer = false; StartUp.bRunCompareServer = false;
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
#endif //osx 64 #endif
std::string BaseDataPath; std::string BaseDataPath;
#ifdef _WIN32 #ifdef _WIN32
StartUp.hInstance = wxGetInstance(); StartUp.hInstance = wxGetInstance();
@ -150,7 +150,7 @@ bool BootCore(const std::string& _rFilename)
// --------- // ---------
} }
// --------- // ---------
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
if(main_frame) if(main_frame)
StartUp.hMainWindow = main_frame->GetRenderHandle(); StartUp.hMainWindow = main_frame->GetRenderHandle();
#endif #endif
@ -161,7 +161,7 @@ bool BootCore(const std::string& _rFilename)
return(false); return(false);
} }
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN); Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);
#else #else
Core::SetState(Core::CORE_RUN); Core::SetState(Core::CORE_RUN);

5
Source/Core/DolphinWX/Src/Globals.h
View File

@ -18,6 +18,7 @@
#ifndef _GLOBALS_H #ifndef _GLOBALS_H
#define _GLOBALS_H #define _GLOBALS_H
#include "Common.h"
enum enum
{ {
IDM_LOADSTATE = 200, IDM_LOADSTATE = 200,
@ -87,7 +88,7 @@ enum
//#include <wx/wxprec.h> //#include <wx/wxprec.h>
//#ifndef WX_PRECOMP //#ifndef WX_PRECOMP
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
#include <wx/wx.h> #include <wx/wx.h>
//#endif //#endif
@ -127,5 +128,5 @@ enum
), ),
extern const wxEventType wxEVT_HOST_COMMAND; extern const wxEventType wxEVT_HOST_COMMAND;
#endif //apple 64bit #endif
#endif #endif

2
Source/Core/DolphinWX/Src/ISOFile.cpp
View File

@ -114,7 +114,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
// i am not sure if this is a leak or if wxImage will release the code // i am not sure if this is a leak or if wxImage will release the code
if (m_pImage) if (m_pImage)
{ {
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, m_pImage); m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, m_pImage);
#endif #endif
} }

4
Source/Core/DolphinWX/Src/ISOFile.h
View File

@ -37,7 +37,7 @@ public:
bool IsCompressed() const {return m_BlobCompressed;} bool IsCompressed() const {return m_BlobCompressed;}
u64 GetFileSize() const {return m_FileSize;} u64 GetFileSize() const {return m_FileSize;}
u64 GetVolumeSize() const {return m_VolumeSize;} u64 GetVolumeSize() const {return m_VolumeSize;}
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
const wxImage& GetImage() const {return m_Image;} const wxImage& GetImage() const {return m_Image;}
#endif #endif
@ -55,7 +55,7 @@ private:
DiscIO::IVolume::ECountry m_Country; DiscIO::IVolume::ECountry m_Country;
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
wxImage m_Image; wxImage m_Image;
#endif #endif
bool m_Valid; bool m_Valid;

2
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -80,7 +80,7 @@ void Host_SysMessage(const char *fmt, ...)
void Host_SetWiiMoteConnectionState(int _State) {} void Host_SetWiiMoteConnectionState(int _State) {}
// Include SDL header so it can hijack main(). // Include SDL header so it can hijack main().
#if !defined(OSX64) #if defined(USE_SDL) && USE_SDL
#include <SDL.h> #include <SDL.h>
#endif #endif
int main(int argc, char* argv[]) int main(int argc, char* argv[])

16
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
View File

@ -23,7 +23,7 @@
#include "PadSimple.h" #include "PadSimple.h"
#include "IniFile.h" #include "IniFile.h"
#if !defined(OSX64) #if defined(HAVE_WX) && HAVE_WX
#include "GUI/ConfigDlg.h" #include "GUI/ConfigDlg.h"
#endif #endif
@ -32,8 +32,10 @@
#include "DirectInputBase.h" #include "DirectInputBase.h"
DInput dinput; DInput dinput;
//#elif defined(USE_SDL) && USE_SDL
//#include <SDL.h>
#else #elif defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -166,7 +168,7 @@ void DllConfig(HWND _hParent)
ConfigDialog frame(&win); ConfigDialog frame(&win);
frame.ShowModal(); frame.ShowModal();
win.SetHWND(0); win.SetHWND(0);
#elif !defined(OSX64) #elif defined(HAVE_WX) && HAVE_WX
ConfigDialog frame(NULL); ConfigDialog frame(NULL);
frame.ShowModal(); frame.ShowModal();
#endif #endif
@ -183,7 +185,7 @@ void PAD_Initialize(SPADInitialize _PADInitialize)
g_PADInitialize = _PADInitialize; g_PADInitialize = _PADInitialize;
#ifdef _WIN32 #ifdef _WIN32
dinput.Init((HWND)g_PADInitialize.hWnd); dinput.Init((HWND)g_PADInitialize.hWnd);
#else #elif defined(HAVE_X11) && HAVE_X11
GXdsp = (Display*)g_PADInitialize.hWnd; GXdsp = (Display*)g_PADInitialize.hWnd;
XkbSetDetectableAutoRepeat(GXdsp, True, NULL); XkbSetDetectableAutoRepeat(GXdsp, True, NULL);
#endif #endif
@ -351,7 +353,7 @@ bool XInput_Read(int XPadPlayer, SPADStatus* _pPADStatus)
} }
#endif #endif
#if defined(__linux__) #if defined(HAVE_X11) && HAVE_X11
// The graphics plugin in the PCSX2 design leaves a lot of the window processing to the pad plugin, weirdly enough. // The graphics plugin in the PCSX2 design leaves a lot of the window processing to the pad plugin, weirdly enough.
void X11_Read(int _numPAD, SPADStatus* _pPADStatus) void X11_Read(int _numPAD, SPADStatus* _pPADStatus)
{ {
@ -504,7 +506,7 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
_pPADStatus->err = PAD_ERR_NONE; _pPADStatus->err = PAD_ERR_NONE;
if (pad[_numPAD].bEnableXPad) XInput_Read(pad[_numPAD].XPadPlayer, _pPADStatus); if (pad[_numPAD].bEnableXPad) XInput_Read(pad[_numPAD].XPadPlayer, _pPADStatus);
DInput_Read(_numPAD, _pPADStatus); DInput_Read(_numPAD, _pPADStatus);
#elif defined(__linux__) #elif defined(HAVE_X11) && HAVE_X11
_pPADStatus->err = PAD_ERR_NONE; _pPADStatus->err = PAD_ERR_NONE;
X11_Read(_numPAD, _pPADStatus); X11_Read(_numPAD, _pPADStatus);
#endif #endif
@ -645,7 +647,7 @@ void LoadConfig()
{ {
file.Get(SectionName, controlNames[x], &pad[i].keyForControl[x], file.Get(SectionName, controlNames[x], &pad[i].keyForControl[x],
(i==0)?defaultKeyForControl[x]:0); (i==0)?defaultKeyForControl[x]:0);
#ifndef _WIN32 #if defined(HAVE_X11) && HAVE_X11
// In linux we have a problem assigning the upper case of the // In linux we have a problem assigning the upper case of the
// keys because they're not being recognized // keys because they're not being recognized
pad[i].keyForControl[x] = tolower(pad[i].keyForControl[x]); pad[i].keyForControl[x] = tolower(pad[i].keyForControl[x]);

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

@ -48,7 +48,7 @@
#include "TextureConverter.h" #include "TextureConverter.h"
#include "VideoState.h" #include "VideoState.h"
#if HAVE_WX || defined __WXMSW__ #if defined(HAVE_WX) && HAVE_WX
#include "Debugger/Debugger.h" // for the CDebugger class #include "Debugger/Debugger.h" // for the CDebugger class
#endif #endif
SVideoInitialize g_VideoInitialize; SVideoInitialize g_VideoInitialize;
@ -60,7 +60,7 @@ SVideoInitialize g_VideoInitialize;
for the purpose of the game. At that point there is no need to use the same dll instance for the purpose of the game. At that point there is no need to use the same dll instance
as the one that is rendering the game. However, that could be done. */ as the one that is rendering the game. However, that could be done. */
#if HAVE_WX || defined __WXMSW__ #if defined(HAVE_WX) && HAVE_WX
CDebugger* m_frame; CDebugger* m_frame;
void DllDebugger(HWND _hParent, bool Show) void DllDebugger(HWND _hParent, bool Show)
{ {