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

more nowx fixes

Browse Source 
disabled njoy test build


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-14 23:52:01 +00:00
parent 7790afb1f3
commit 7f8cc4ec62
16 changed files with 107 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ Import('env')
import sys
name = "Plugin_nJoy_SDL"
padenv = env.Clone()
if not env['HAVE_SDL']:
print name + " must have SDL to be build"
@ -11,11 +12,13 @@ if not env['HAVE_SDL']:
files = [
'nJoy.cpp',
'GUI/AboutBox.cpp',
'GUI/ConfigBox.cpp',
]
if padenv['HAVE_WX']:
files += [
'GUI/AboutBox.cpp',
'GUI/ConfigBox.cpp',
]
padenv = env.Clone()
padenv.Append(
CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'common' ],

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

@ -71,12 +71,17 @@ HRESULT SetDeviceForcesXY();
#endif
#elif defined(__linux__)
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
int fd;
char device_file_name[64];
struct ff_effect effect;
bool CanRumble = false;
#endif
#if defined(HAVE_WX) && HAVE_WX
//////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@ -90,7 +95,7 @@ class wxDLLApp : public wxApp
IMPLEMENT_APP_NO_MAIN(wxDLLApp)
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
#endif
//////////////////////////////////////////////////////////////////////////////////////////
// DllMain
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@ -176,9 +181,10 @@ void DllConfig(HWND _hParent)
}
LoadConfig(); // load settings
#if defined(HAVE_WX) && HAVE_WX
ConfigBox frame(NULL);
frame.ShowModal();
#endif
#endif
}

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

@ -32,6 +32,7 @@
// Set this if you want to use the rumble 'hack' for controller one
//#define USE_RUMBLE_DINPUT_HACK
#include "Common.h"
#ifdef _WIN32
#define _CRT_SECURE_NO_WARNINGS
#define DIRECTINPUT_VERSION 0x0800
@ -61,8 +62,10 @@
#include <linux/input.h>
#endif
#if defined(HAVE_WX) && HAVE_WX
#include "GUI/AboutBox.h"
#include "GUI/ConfigBox.h"
#endif
#include "Common.h"
#include "pluginspecs_pad.h"