piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Compiling with nowx=true now builds the entire project without WX, this isn't tested in Windows so it's always on via Common.h, You can test/fix it yourself that way. Also fixed Compiling again

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@762 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-10-04 07:57:28 +00:00
parent 3d475abf2b
commit 9a3ebd0c3b
22 changed files with 135 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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