piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -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

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

@ -21,14 +21,18 @@
#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"
@ -166,17 +170,20 @@ 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);
@ -187,6 +194,7 @@ void DllConfig(HWND _hParent)
#else
ConfigDialog frame(NULL);
frame.ShowModal();
#endif
#endif
SaveConfig();
}

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

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