mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 05:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
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
commit c7ae1fd402
20 changed files with 102 additions and 139 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 += ['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',]
padenv = env.Clone()
padenv.Append(

22
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View file

@ -80,7 +80,7 @@ HRESULT SetDeviceForcesXY();
//////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets
// ¯¯¯¯¯¯¯¯¯
#ifdef USE_WX
#ifdef USE_WXWIDGETS
class wxDLLApp : public wxApp
{
bool OnInit()
@ -146,14 +146,14 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
_PluginInfo->Version = 0x0100;
_PluginInfo->Type = PLUGIN_TYPE_PAD;
#ifdef DEBUGFAST
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (DebugFast) by Falcon4ever");
#else
#ifndef _DEBUG
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION " by Falcon4ever");
#else
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (Debug) by Falcon4ever");
#endif
#ifdef DEBUGFAST
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (DebugFast) by Falcon4ever");
#else
#ifndef _DEBUG
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION " by Falcon4ever");
#else
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (Debug) by Falcon4ever");
#endif
#endif
}
@ -161,7 +161,7 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void DllAbout(HWND _hParent)
{
#ifdef USE_WX
#ifdef USE_WXWIDGETS
#ifdef _WIN32
wxWindow win;
win.SetHWND((WXHWND)_hParent);
@ -189,7 +189,7 @@ void DllAbout(HWND _hParent)
void DllConfig(HWND _hParent)
{
#ifdef USE_WX
#ifdef USE_WXWIDGETS
#ifdef _WIN32
if(SDL_Init(SDL_INIT_JOYSTICK ) < 0)
{

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

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