piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
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.

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
parent 59b115d197
commit c7ae1fd402
20 changed files with 102 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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