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

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

@ -15,13 +15,12 @@
// 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,11 +8,13 @@ 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',
@ -23,9 +25,8 @@ files = [
'VertexShader.cpp',
'VertexShaderManager.cpp',
'XFB.cpp',
'GUI/ConfigDlg.cpp',
]
if not env['nowx']:
files += ['GUI/ConfigDlg.cpp',]
compileFlags = [
'-fPIC',
]

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

@ -15,10 +15,7 @@
// 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
@ -29,9 +26,7 @@
#include <SDL.h>
#endif
#ifdef USE_WX
#include "GUI/ConfigDlg.h"
#endif
#include "Render.h"
#include "GLInit.h"
@ -67,17 +62,14 @@ 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);
@ -156,7 +148,6 @@ void DllConfig(HWND _hParent)
//TODO
#endif
#endif
}