diff options
| author | fires.gc <fires.gc@gmail.com> | 2008-10-04 17:26:12 +0000 |
|---|---|---|
| committer | fires.gc <fires.gc@gmail.com> | 2008-10-04 17:26:12 +0000 |
| commit | c7ae1fd402c645d15d404a950ebc3167ffb09fe8 (patch) | |
| tree | 2d2fdc2b6489e006620c91d9d40267c9b648c314 /Source/Plugins/Plugin_PadSimple | |
| parent | 59b115d19702af75385aa6b658e59749baddcf8a (diff) | |
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
Diffstat (limited to 'Source/Plugins/Plugin_PadSimple')
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 8 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/SConscript | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index 0362dce52b..e2d126e12c 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -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); @@ -195,7 +188,6 @@ void DllConfig(HWND _hParent) ConfigDialog frame(NULL); frame.ShowModal(); #endif -#endif SaveConfig(); } diff --git a/Source/Plugins/Plugin_PadSimple/Src/SConscript b/Source/Plugins/Plugin_PadSimple/Src/SConscript index a35379f2c3..d00657d917 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/SConscript +++ b/Source/Plugins/Plugin_PadSimple/Src/SConscript @@ -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) |