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

2
Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
View File

@ -42,7 +42,7 @@
// Externals
float ratioFactor; // a global to get the ratio factor from MixAdd
extern float ratioFactor; // a global to get the ratio factor from MixAdd
int gUpdFreq = 5;
u32 gLastBlock;

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

@ -16,9 +16,6 @@ files = [
'Globals.cpp',
'PCHW/AOSoundStream.cpp',
'PCHW/Mixer.cpp',
'Debugger/Debugger.cpp',
'Debugger/PBView.cpp',
'Logging/Logging.cpp',
'UCodes/UCode_AX.cpp',
'UCodes/UCode_CARD.cpp',
'UCodes/UCode_InitAudioSystem.cpp',
@ -27,6 +24,8 @@ files = [
'UCodes/UCodes.cpp',
'UCodes/UCode_Zelda.cpp',
]
if not env['nowx']:
files.Append['Debugger/Debugger.cpp', 'Debugger/PBView.cpp', 'Logging/Logging.cpp',]
dspenv = env.Clone()
dspenv.Append(

13
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -27,14 +27,17 @@
#include "UCode_AXStructs.h"
#include "UCode_AX.h"
#ifdef USE_WX
#include "../Debugger/Debugger.h"
// ---------------------------------------------------------------------------------------
#endif
float ratioFactor;
// Externals
// -----------
extern float ratioFactor;
extern u32 gLastBlock;
#ifdef USE_WX
extern CDebugger* m_frame;
// -----------
#endif
CUCode_AX::CUCode_AX(CMailHandler& _rMailHandler, bool wii)
: IUCode(_rMailHandler)
@ -140,10 +143,12 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
#endif
// write logging data to debugger
#ifdef USE_WX
if(m_frame)
{
CUCode_AX::Logging(_pBuffer, _iSize, 0);
}
#endif
for (int i = 0; i < numberOfPBs; i++)

30
Source/Plugins/Plugin_DSP_HLE/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/
// =======================================================================================
// Includes
// ------------------
#include "Globals.h"
#include "ChunkFile.h"
#include "resource.h"
@ -36,14 +33,12 @@
#include "DSPHandler.h"
#include "Config.h"
#ifdef USE_WX
#include "Debugger/Debugger.h" // for the CDebugger class
#include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
// ===================
#endif
// =======================================================================================
// DSP struct
// -------------------
DSPInitialize g_dspInitialize;
u8* g_pMemory;
@ -68,12 +63,9 @@ struct DSPState
};
DSPState g_dspState;
// ====================
//////////////////////////////////////////////////////////////////////////////////////////
#ifdef USE_WX
// wxWidgets - Some kind of stuff wx needs
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
class wxDLLApp : public wxApp
{
bool OnInit()
@ -84,8 +76,7 @@ class wxDLLApp : public wxApp
IMPLEMENT_APP_NO_MAIN(wxDLLApp)
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
///////////////////
#endif
#ifdef _WIN32
HINSTANCE g_hInstance = NULL;
@ -126,9 +117,7 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
#endif
// =======================================================================================
// Open and close console
// -------------------
void OpenConsole()
{
#if defined (_WIN32)
@ -145,22 +134,21 @@ void CloseConsole()
FreeConsole();
#endif
}
// ===================
// =======================================================================================
// Create debugging window - We could use use wxWindow win; new CDebugger(win) like nJoy but I don't
// know why it would be better. - There's a lockup problem with ShowModal(), but Show() doesn't work
// because then DLL_PROCESS_DETACH is called immediately after DLL_PROCESS_ATTACH.
// -------------------
#ifdef USE_WX
CDebugger* m_frame;
#endif
void DllDebugger(HWND _hParent)
{
#ifdef USE_WX
m_frame = new CDebugger(NULL);
m_frame->ShowModal();
#endif
}
// ===================
void GetDllInfo(PLUGIN_INFO* _PluginInfo)
{

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)

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
}

4
Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp
View File

@ -1,4 +1,6 @@
#ifdef USE_WX
#include <wx/aboutdlg.h>
#endif
#include "Common.h"
#include "StringUtil.h"
@ -143,11 +145,13 @@ extern "C" void GetDllInfo (PLUGIN_INFO* _PluginInfo)
extern "C" void DllAbout(HWND _hParent)
{
#ifdef USE_WX
wxAboutDialogInfo info;
info.SetName(_T("Wiimote test plugin"));
info.AddDeveloper(_T("masken (masken3@gmail.com)"));
info.SetDescription(_T("Wiimote test plugin"));
wxAboutBox(info);
#endif
}
extern "C" void DllConfig(HWND _hParent)

4
Source/Plugins/Plugin_nJoy_SDL/Src/SConscript
View File

@ -10,9 +10,9 @@ else:
files = [
'nJoy.cpp',
'GUI/AboutBox.cpp',
'GUI/ConfigBox.cpp',
]
if not env['nowx']:
files.Append['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',]
padenv = env.Clone()
padenv.Append(

6
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -80,7 +80,7 @@ HRESULT SetDeviceForcesXY();
//////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#ifdef USE_WXWIDGETS
#ifdef USE_WX
class wxDLLApp : public wxApp
{
bool OnInit()
@ -161,7 +161,7 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
void DllAbout(HWND _hParent)
{
#ifdef USE_WXWIDGETS
#ifdef USE_WX
#ifdef _WIN32
wxWindow win;
win.SetHWND((WXHWND)_hParent);
@ -189,7 +189,7 @@ void DllAbout(HWND _hParent)
void DllConfig(HWND _hParent)
{
#ifdef USE_WXWIDGETS
#ifdef USE_WX
#ifdef _WIN32
if(SDL_Init(SDL_INIT_JOYSTICK ) < 0)
{

3
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
View File

@ -62,9 +62,10 @@
#endif
#ifdef __linux__
#include <linux/input.h>
#include <fcntl.h>
#endif
#ifdef USE_WXWIDGETS
#ifdef USE_WX
#include "GUI/AboutBox.h"
#include "GUI/ConfigBox.h"
#else