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

Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
fires.gc 2008-10-04 17:26:12 +00:00
parent 59b115d197
commit c7ae1fd402
20 changed files with 102 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Source/Core/Common/Src/Common.h
View File

@ -24,16 +24,15 @@
#define CHECK_HEAP_INTEGRITY() #define CHECK_HEAP_INTEGRITY()
#ifdef _WIN32 #ifdef _WIN32
#define USE_WX // Always define in Windows since it isn't tested. #ifdef _DEBUG
#ifdef _DEBUG #include <crtdbg.h>
#include <crtdbg.h> #undef CHECK_HEAP_INTEGRITY
#undef CHECK_HEAP_INTEGRITY #define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");} #endif
#endif
#include "../../../PluginSpecs/CommonTypes.h" #include "../../../PluginSpecs/CommonTypes.h"
#else #else
#include "CommonTypes.h" #include "CommonTypes.h"
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -42,45 +41,45 @@
// Function Cross-Compatibility // Function Cross-Compatibility
#ifdef _WIN32 #ifdef _WIN32
#define strcasecmp _stricmp #define strcasecmp _stricmp
#define unlink _unlink #define unlink _unlink
#else #else
#define _stricmp strcasecmp #define _stricmp strcasecmp
#define _unlink unlink #define _unlink unlink
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#ifdef _WIN32 #ifdef _WIN32
#define fseek _fseeki64 #define fseek _fseeki64
#define ftell _ftelli64 #define ftell _ftelli64
#endif #endif
#define POSIX 0 #define POSIX 0
#define NOMINMAX #define NOMINMAX
#if _M_IX86 #if _M_IX86
#define Crash() {__asm int 3} #define Crash() {__asm int 3}
#else #else
#if _MSC_VER > 1000 #if _MSC_VER > 1000
extern "C" { extern "C" {
__declspec(dllimport) void __stdcall DebugBreak(void); __declspec(dllimport) void __stdcall DebugBreak(void);
} }
#define Crash() {DebugBreak();} #define Crash() {DebugBreak();}
#else #else
#error fixme #error fixme
#endif #endif
#endif #endif
#elif __GNUC__ #elif __GNUC__
#define POSIX 1 #define POSIX 1
#define MAX_PATH 260 #define MAX_PATH 260
#define stricmp strcasecmp #define stricmp strcasecmp
#define Crash() {asm ("int $3");} #define Crash() {asm ("int $3");}
#ifdef _LP64 #ifdef _LP64
#define _M_X64 1 #define _M_X64 1
#else #else
#define _M_IX86 1 #define _M_IX86 1
#endif #endif
#endif #endif
// Alignment // Alignment

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

@ -27,20 +27,15 @@
#include "VolumeCreator.h" #include "VolumeCreator.h"
#include "Config.h" #include "Config.h"
#include "Core.h" #include "Core.h"
#ifdef USE_WX
#include "Frame.h" #include "Frame.h"
#include "CodeWindow.h" #include "CodeWindow.h"
#endif
static std::string s_DataBasePath_EUR = "Data_EUR"; 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";
#ifdef USE_WX
extern CFrame* main_frame; extern CFrame* main_frame;
extern CCodeWindow* g_pCodeWindow; extern CCodeWindow* g_pCodeWindow;
#endif
namespace BootManager namespace BootManager
{ {
@ -52,7 +47,6 @@ bool BootCore(const std::string& _rFilename)
{ {
SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
#ifdef USE_WX
if (g_pCodeWindow) if (g_pCodeWindow)
{ {
// StartUp.bUseDualCore = code_frame->UseDualCore(); // StartUp.bUseDualCore = code_frame->UseDualCore();
@ -63,16 +57,11 @@ bool BootCore(const std::string& _rFilename)
// StartUp.bUseDualCore = false; // StartUp.bUseDualCore = false;
// StartUp.bUseJIT = true; // StartUp.bUseJIT = true;
} }
#endif
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO; StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
StartUp.m_strFilename = _rFilename; StartUp.m_strFilename = _rFilename;
StartUp.bRunCompareClient = false; StartUp.bRunCompareClient = false;
StartUp.bRunCompareServer = false; StartUp.bRunCompareServer = false;
#ifdef USE_WX
StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
#else
StartUp.bEnableDebugging = false;
#endif
std::string BaseDataPath; std::string BaseDataPath;
#ifdef _WIN32 #ifdef _WIN32
StartUp.hInstance = wxGetInstance(); StartUp.hInstance = wxGetInstance();
@ -95,10 +84,8 @@ bool BootCore(const std::string& _rFilename)
ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle); ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers); ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
} }
#ifdef USE_WX
if(main_frame) if(main_frame)
StartUp.hMainWindow = main_frame->GetRenderHandle(); StartUp.hMainWindow = main_frame->GetRenderHandle();
#endif
// init the core // init the core
if (!Core::Init(StartUp)) if (!Core::Init(StartUp))
@ -107,11 +94,7 @@ bool BootCore(const std::string& _rFilename)
return(false); return(false);
} }
#ifdef USE_WX
Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN); Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);
#else
Core::SetState(Core::CORE_RUN);
#endif
return(true); return(true);
} }

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

@ -78,7 +78,7 @@ enum
ID_TOOLBAR = 500, ID_TOOLBAR = 500,
LIST_CTRL = 1000 LIST_CTRL = 1000
}; };
#ifdef USE_WX
#define wxUSE_XPM_IN_MSW 1 #define wxUSE_XPM_IN_MSW 1
#define USE_XPM_BITMAPS 1 #define USE_XPM_BITMAPS 1
@ -125,5 +125,5 @@ enum
), ),
extern const wxEventType wxEVT_HOST_COMMAND; extern const wxEventType wxEVT_HOST_COMMAND;
#endif
#endif #endif

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

@ -67,7 +67,6 @@ GameListItem::GameListItem(const std::string& _rFileName)
pBannerLoader->GetDescription(m_Description); pBannerLoader->GetDescription(m_Description);
if (pBannerLoader->GetBanner(g_ImageTemp)) if (pBannerLoader->GetBanner(g_ImageTemp))
{ {
#ifdef USE_WX
unsigned char* pImage = (unsigned char*)malloc(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT * 3); unsigned char* pImage = (unsigned char*)malloc(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT * 3);
for (size_t i = 0; i < DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT; i++) for (size_t i = 0; i < DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT; i++)
@ -78,7 +77,6 @@ GameListItem::GameListItem(const std::string& _rFileName)
} }
m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, pImage); m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, pImage);
#endif
} }
} }
else else

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

@ -36,9 +36,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;}
#ifdef USE_WX
const wxImage& GetImage() const {return m_Image;} const wxImage& GetImage() const {return m_Image;}
#endif
private: private:
std::string m_FileName; std::string m_FileName;
@ -52,9 +50,7 @@ private:
DiscIO::IVolume::ECountry m_Country; DiscIO::IVolume::ECountry m_Country;
#ifdef USE_WX
wxImage m_Image; wxImage m_Image;
#endif
bool m_Valid; bool m_Valid;

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

@ -1,7 +1,5 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h>
#ifndef _WIN32 #ifndef _WIN32
//#include <curses.h> //#include <curses.h>
#else #else

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

@ -6,19 +6,22 @@ import sys
files = [ files = [
'BootManager.cpp', 'BootManager.cpp',
'Config.cpp', 'Config.cpp',
'ConfigMain.cpp',
'FileSearch.cpp', 'FileSearch.cpp',
'FilesystemViewer.cpp',
'Frame.cpp',
'GameListCtrl.cpp',
'Globals.cpp', 'Globals.cpp',
'ISOFile.cpp', 'ISOFile.cpp',
'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp', 'MemoryCards/GCMemcard.cpp',
'PluginManager.cpp',
'stdafx.cpp', 'stdafx.cpp',
'cmdline.c', 'cmdline.c',
] ]
libs = [ libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z' 'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
] ]
if not env['nowx']:
files += ['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
libs += ['debwx', ]
wxenv = env.Clone() wxenv = env.Clone()
wxenv.Append( wxenv.Append(
@ -27,7 +30,7 @@ wxenv.Append(
'wxNEEDS_CHARPP', 'wxNEEDS_CHARPP',
], ],
LINKFLAGS = [ LINKFLAGS = [
'-lpthread', '-pthread',
], ],
LIBS = libs LIBS = libs
) )
@ -61,6 +64,5 @@ else:
exeNoGUI = '../../../../Binary/linux/DolphinNoGUI' exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
objects = [ wxenv.Object(srcFile) for srcFile in files ] objects = [ wxenv.Object(srcFile) for srcFile in files ]
if not env['nowx']: wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ]) wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])

2
Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
View File

@ -42,7 +42,7 @@
// Externals // Externals
extern float ratioFactor; // a global to get the ratio factor from MixAdd float ratioFactor; // a global to get the ratio factor from MixAdd
int gUpdFreq = 5; int gUpdFreq = 5;
u32 gLastBlock; u32 gLastBlock;

5
Source/Plugins/Plugin_DSP_HLE/Src/SConscript
View File

@ -16,6 +16,9 @@ files = [
'Globals.cpp', 'Globals.cpp',
'PCHW/AOSoundStream.cpp', 'PCHW/AOSoundStream.cpp',
'PCHW/Mixer.cpp', 'PCHW/Mixer.cpp',
'Debugger/Debugger.cpp',
'Debugger/PBView.cpp',
'Logging/Logging.cpp',
'UCodes/UCode_AX.cpp', 'UCodes/UCode_AX.cpp',
'UCodes/UCode_CARD.cpp', 'UCodes/UCode_CARD.cpp',
'UCodes/UCode_InitAudioSystem.cpp', 'UCodes/UCode_InitAudioSystem.cpp',
@ -24,8 +27,6 @@ files = [
'UCodes/UCodes.cpp', 'UCodes/UCodes.cpp',
'UCodes/UCode_Zelda.cpp', 'UCodes/UCode_Zelda.cpp',
] ]
if not env['nowx']:
files += ['Debugger/Debugger.cpp', 'Debugger/PBView.cpp', 'Logging/Logging.cpp',]
dspenv = env.Clone() dspenv = env.Clone()
dspenv.Append( dspenv.Append(

13
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -27,17 +27,14 @@
#include "UCode_AXStructs.h" #include "UCode_AXStructs.h"
#include "UCode_AX.h" #include "UCode_AX.h"
#ifdef USE_WX
#include "../Debugger/Debugger.h" #include "../Debugger/Debugger.h"
#endif // ---------------------------------------------------------------------------------------
float ratioFactor;
// Externals // Externals
// -----------
extern float ratioFactor;
extern u32 gLastBlock; extern u32 gLastBlock;
#ifdef USE_WX
extern CDebugger* m_frame; extern CDebugger* m_frame;
#endif // -----------
CUCode_AX::CUCode_AX(CMailHandler& _rMailHandler, bool wii) CUCode_AX::CUCode_AX(CMailHandler& _rMailHandler, bool wii)
: IUCode(_rMailHandler) : IUCode(_rMailHandler)
@ -143,12 +140,10 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
#endif #endif
// write logging data to debugger // write logging data to debugger
#ifdef USE_WX
if(m_frame) if(m_frame)
{ {
CUCode_AX::Logging(_pBuffer, _iSize, 0); CUCode_AX::Logging(_pBuffer, _iSize, 0);
} }
#endif
for (int i = 0; i < numberOfPBs; i++) for (int i = 0; i < numberOfPBs; i++)

30
Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
View File

@ -15,7 +15,10 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
// =======================================================================================
// Includes // Includes
// ------------------
#include "Globals.h" #include "Globals.h"
#include "ChunkFile.h" #include "ChunkFile.h"
#include "resource.h" #include "resource.h"
@ -33,12 +36,14 @@
#include "DSPHandler.h" #include "DSPHandler.h"
#include "Config.h" #include "Config.h"
#ifdef USE_WX
#include "Debugger/Debugger.h" // for the CDebugger class #include "Debugger/Debugger.h" // for the CDebugger class
#include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd #include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
#endif // ===================
// =======================================================================================
// DSP struct // DSP struct
// -------------------
DSPInitialize g_dspInitialize; DSPInitialize g_dspInitialize;
u8* g_pMemory; u8* g_pMemory;
@ -63,9 +68,12 @@ struct DSPState
}; };
DSPState g_dspState; DSPState g_dspState;
// ====================
#ifdef USE_WX
//////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets - Some kind of stuff wx needs // wxWidgets - Some kind of stuff wx needs
// ｯｯｯｯｯｯｯｯｯ
class wxDLLApp : public wxApp class wxDLLApp : public wxApp
{ {
bool OnInit() bool OnInit()
@ -76,7 +84,8 @@ class wxDLLApp : public wxApp
IMPLEMENT_APP_NO_MAIN(wxDLLApp) IMPLEMENT_APP_NO_MAIN(wxDLLApp)
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst); WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
#endif ///////////////////
#ifdef _WIN32 #ifdef _WIN32
HINSTANCE g_hInstance = NULL; HINSTANCE g_hInstance = NULL;
@ -117,7 +126,9 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
#endif #endif
// =======================================================================================
// Open and close console // Open and close console
// -------------------
void OpenConsole() void OpenConsole()
{ {
#if defined (_WIN32) #if defined (_WIN32)
@ -134,21 +145,22 @@ void CloseConsole()
FreeConsole(); FreeConsole();
#endif #endif
} }
// ===================
// =======================================================================================
// Create debugging window - We could use use wxWindow win; new CDebugger(win) like nJoy but I don't // Create debugging window - We could use use wxWindow win; new CDebugger(win) like nJoy but I don't
// know why it would be better. - There's a lockup problem with ShowModal(), but Show() doesn't work // know why it would be better. - There's a lockup problem with ShowModal(), but Show() doesn't work
// because then DLL_PROCESS_DETACH is called immediately after DLL_PROCESS_ATTACH. // because then DLL_PROCESS_DETACH is called immediately after DLL_PROCESS_ATTACH.
#ifdef USE_WX // -------------------
CDebugger* m_frame; CDebugger* m_frame;
#endif
void DllDebugger(HWND _hParent) void DllDebugger(HWND _hParent)
{ {
#ifdef USE_WX
m_frame = new CDebugger(NULL); m_frame = new CDebugger(NULL);
m_frame->ShowModal(); m_frame->ShowModal();
#endif
} }
// ===================
void GetDllInfo(PLUGIN_INFO* _PluginInfo) void GetDllInfo(PLUGIN_INFO* _PluginInfo)
{ {

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

@ -21,18 +21,14 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#ifdef USE_WX
#include <wx/aboutdlg.h> #include <wx/aboutdlg.h>
#endif
#include "Common.h" #include "Common.h"
#include "pluginspecs_pad.h" #include "pluginspecs_pad.h"
#include "PadSimple.h" #include "PadSimple.h"
#include "IniFile.h" #include "IniFile.h"
#ifdef USE_WX
#include "GUI/ConfigDlg.h" #include "GUI/ConfigDlg.h"
#endif
#ifdef XINPUT_ENABLE #ifdef XINPUT_ENABLE
#include "XInput.h" #include "XInput.h"
@ -170,20 +166,17 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
void DllAbout(HWND _hParent) void DllAbout(HWND _hParent)
{ {
#ifdef USE_WX
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(_T("ector")); info.AddDeveloper(_T("ector"));
info.AddDeveloper(_T("F|RES")); info.AddDeveloper(_T("F|RES"));
info.SetDescription(_T("Simple keyboard and XInput plugin for dolphin")); info.SetDescription(_T("Simple keyboard and XInput plugin for dolphin"));
wxAboutBox(info); wxAboutBox(info);
#endif
} }
void DllConfig(HWND _hParent) void DllConfig(HWND _hParent)
{ {
LoadConfig(); LoadConfig();
#ifdef USE_WX
#ifdef _WIN32 #ifdef _WIN32
wxWindow win; wxWindow win;
win.SetHWND(_hParent); win.SetHWND(_hParent);
@ -194,7 +187,6 @@ void DllConfig(HWND _hParent)
#else #else
ConfigDialog frame(NULL); ConfigDialog frame(NULL);
frame.ShowModal(); frame.ShowModal();
#endif
#endif #endif
SaveConfig(); SaveConfig();
} }

7
Source/Plugins/Plugin_PadSimple/Src/SConscript
View File

@ -10,9 +10,10 @@ else:
files = [ files = [
"PadSimple.cpp", "PadSimple.cpp",
"XInputBase.cpp",
"GUI/ConfigDlg.cpp",
] ]
if not env['nowx']:
files += ["GUI/ConfigDlg.cpp", "XInputBase.cpp",]
padenv = env.Clone() padenv = env.Clone()
padenv.Append(LIBS = [ 'common', 'X11' ]) padenv.Append(LIBS = [ 'common' ])
padenv.SharedLibrary(output, files) padenv.SharedLibrary(output, files)

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

@ -15,13 +15,12 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#ifdef USE_WX
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/filepicker.h> #include <wx/filepicker.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/aboutdlg.h> #include <wx/aboutdlg.h>
#endif
#include "Globals.h" #include "Globals.h"

5
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -8,11 +8,13 @@ import utils
files = [ files = [
'BPStructs.cpp', 'BPStructs.cpp',
'DataReader.cpp',
'Globals.cpp', 'Globals.cpp',
'GLInit.cpp', 'GLInit.cpp',
'main.cpp', 'main.cpp',
'memcpy_amd.cpp', 'memcpy_amd.cpp',
'OpcodeDecoding.cpp', 'OpcodeDecoding.cpp',
# 'OpcodeReaders.cpp', # outdated
'PixelShader.cpp', 'PixelShader.cpp',
'PixelShaderManager.cpp', 'PixelShaderManager.cpp',
'rasterfont.cpp', 'rasterfont.cpp',
@ -23,9 +25,8 @@ files = [
'VertexShader.cpp', 'VertexShader.cpp',
'VertexShaderManager.cpp', 'VertexShaderManager.cpp',
'XFB.cpp', 'XFB.cpp',
'GUI/ConfigDlg.cpp',
] ]
if not env['nowx']:
files += ['GUI/ConfigDlg.cpp',]
compileFlags = [ compileFlags = [
'-fPIC', '-fPIC',
] ]

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

@ -15,10 +15,7 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#ifdef USE_WX
#include <wx/aboutdlg.h> #include <wx/aboutdlg.h>
#endif
#include "Globals.h" #include "Globals.h"
#ifdef _WIN32 #ifdef _WIN32
@ -29,9 +26,7 @@
#include <SDL.h> #include <SDL.h>
#endif #endif
#ifdef USE_WX
#include "GUI/ConfigDlg.h" #include "GUI/ConfigDlg.h"
#endif
#include "Render.h" #include "Render.h"
#include "GLInit.h" #include "GLInit.h"
@ -67,17 +62,14 @@ void GetDllInfo (PLUGIN_INFO* _PluginInfo)
void DllAbout(HWND _hParent) void DllAbout(HWND _hParent)
{ {
#ifdef USE_WX
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(_T("zerofrog(@gmail.com)")); info.AddDeveloper(_T("zerofrog(@gmail.com)"));
info.SetDescription(_T("Vertex/Pixel Shader 2.0 or higher, framebuffer objects, multiple render targets")); info.SetDescription(_T("Vertex/Pixel Shader 2.0 or higher, framebuffer objects, multiple render targets"));
wxAboutBox(info); wxAboutBox(info);
#endif
} }
void DllConfig(HWND _hParent) void DllConfig(HWND _hParent)
{ {
#ifdef USE_WX
#if defined(_WIN32) #if defined(_WIN32)
wxWindow win; wxWindow win;
win.SetHWND(_hParent); win.SetHWND(_hParent);
@ -156,7 +148,6 @@ void DllConfig(HWND _hParent)
//TODO //TODO
#endif
#endif #endif
} }

4
Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp
View File

@ -1,6 +1,4 @@
#ifdef USE_WX
#include <wx/aboutdlg.h> #include <wx/aboutdlg.h>
#endif
#include "Common.h" #include "Common.h"
#include "StringUtil.h" #include "StringUtil.h"
@ -145,13 +143,11 @@ extern "C" void GetDllInfo (PLUGIN_INFO* _PluginInfo)
extern "C" void DllAbout(HWND _hParent) extern "C" void DllAbout(HWND _hParent)
{ {
#ifdef USE_WX
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.SetName(_T("Wiimote test plugin")); info.SetName(_T("Wiimote test plugin"));
info.AddDeveloper(_T("masken (masken3@gmail.com)")); info.AddDeveloper(_T("masken (masken3@gmail.com)"));
info.SetDescription(_T("Wiimote test plugin")); info.SetDescription(_T("Wiimote test plugin"));
wxAboutBox(info); wxAboutBox(info);
#endif
} }
extern "C" void DllConfig(HWND _hParent) extern "C" void DllConfig(HWND _hParent)

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

@ -10,9 +10,9 @@ else:
files = [ files = [
'nJoy.cpp', 'nJoy.cpp',
'GUI/AboutBox.cpp',
'GUI/ConfigBox.cpp',
] ]
if not env['nowx']:
files += ['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',]
padenv = env.Clone() padenv = env.Clone()
padenv.Append( padenv.Append(

6
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -80,7 +80,7 @@ HRESULT SetDeviceForcesXY();
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets // wxWidgets
// ¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯
#ifdef USE_WX #ifdef USE_WXWIDGETS
class wxDLLApp : public wxApp class wxDLLApp : public wxApp
{ {
bool OnInit() bool OnInit()
@ -161,7 +161,7 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void DllAbout(HWND _hParent) void DllAbout(HWND _hParent)
{ {
#ifdef USE_WX #ifdef USE_WXWIDGETS
#ifdef _WIN32 #ifdef _WIN32
wxWindow win; wxWindow win;
win.SetHWND((WXHWND)_hParent); win.SetHWND((WXHWND)_hParent);
@ -189,7 +189,7 @@ void DllAbout(HWND _hParent)
void DllConfig(HWND _hParent) void DllConfig(HWND _hParent)
{ {
#ifdef USE_WX #ifdef USE_WXWIDGETS
#ifdef _WIN32 #ifdef _WIN32
if(SDL_Init(SDL_INIT_JOYSTICK ) < 0) if(SDL_Init(SDL_INIT_JOYSTICK ) < 0)
{ {

3
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
View File

@ -62,10 +62,9 @@
#endif #endif
#ifdef __linux__ #ifdef __linux__
#include <linux/input.h> #include <linux/input.h>
#include <fcntl.h>
#endif #endif
#ifdef USE_WX #ifdef USE_WXWIDGETS
#include "GUI/AboutBox.h" #include "GUI/AboutBox.h"
#include "GUI/ConfigBox.h" #include "GUI/ConfigBox.h"
#else #else