mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
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
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@762 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -15,7 +15,10 @@
|
||||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#ifdef USE_WX
|
||||
#include <wx/aboutdlg.h>
|
||||
#endif
|
||||
|
||||
#include "Globals.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
@ -26,7 +29,9 @@
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_WX
|
||||
#include "GUI/ConfigDlg.h"
|
||||
#endif
|
||||
|
||||
#include "Render.h"
|
||||
#include "GLInit.h"
|
||||
@ -62,14 +67,17 @@ void GetDllInfo (PLUGIN_INFO* _PluginInfo)
|
||||
|
||||
void DllAbout(HWND _hParent)
|
||||
{
|
||||
#ifdef USE_WX
|
||||
wxAboutDialogInfo info;
|
||||
info.AddDeveloper(_T("zerofrog(@gmail.com)"));
|
||||
info.SetDescription(_T("Vertex/Pixel Shader 2.0 or higher, framebuffer objects, multiple render targets"));
|
||||
wxAboutBox(info);
|
||||
#endif
|
||||
}
|
||||
|
||||
void DllConfig(HWND _hParent)
|
||||
{
|
||||
#ifdef USE_WX
|
||||
#if defined(_WIN32)
|
||||
wxWindow win;
|
||||
win.SetHWND(_hParent);
|
||||
@ -148,6 +156,7 @@ void DllConfig(HWND _hParent)
|
||||
|
||||
//TODO
|
||||
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user