piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -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

3
Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
View File

@ -15,12 +15,13 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#ifdef USE_WX
#include <wx/wx.h>
#include <wx/filepicker.h>
#include <wx/notebook.h>
#include <wx/dialog.h>
#include <wx/aboutdlg.h>
#endif
#include "Globals.h"

5
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -8,13 +8,11 @@ import utils
files = [
'BPStructs.cpp',
'DataReader.cpp',
'Globals.cpp',
'GLInit.cpp',
'main.cpp',
'memcpy_amd.cpp',
'OpcodeDecoding.cpp',
# 'OpcodeReaders.cpp', # outdated
'PixelShader.cpp',
'PixelShaderManager.cpp',
'rasterfont.cpp',
@ -25,8 +23,9 @@ files = [
'VertexShader.cpp',
'VertexShaderManager.cpp',
'XFB.cpp',
'GUI/ConfigDlg.cpp',
]
if not env['nowx']:
files.Append['GUI/ConfigDlg.cpp',]
compileFlags = [
'-fPIC',
]

9
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -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
}