archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #25 from FGRE/master

Browse source 
Fix linking
This commit is contained in:
DHrpcs3 2013-11-25 09:57:22 -08:00
commit a852baee5b
8 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/GS/GL/OpenGL.h
View file

@ -2,7 +2,9 @@
#include <GL/gl.h> #include <GL/gl.h>
#include "GL/glext.h" #include "GL/glext.h"
#ifdef _WIN32
typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval); typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval);
#endif
#define OPENGL_PROC(p, n) extern p gl##n #define OPENGL_PROC(p, n) extern p gl##n
#define OPENGL_PROC2(p, n, tn) OPENGL_PROC(p, n) #define OPENGL_PROC2(p, n, tn) OPENGL_PROC(p, n)

2
rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp
View file

@ -4,7 +4,7 @@
#include "Loader/ELF.h" #include "Loader/ELF.h"
#include "Emu/Cell/RawSPUThread.h" #include "Emu/Cell/RawSPUThread.h"
SysCallBase sc_spu("sys_spu"); static SysCallBase sc_spu("sys_spu");
extern SysCallBase sys_event; extern SysCallBase sys_event;
static const u32 g_spu_group_thr_count = 255; static const u32 g_spu_group_thr_count = 255;

4
rpcs3/Emu/SysCalls/lv2/SC_sys_spu.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SysCalls.h"
SysCallBase sc_spu("sys_spu"); static SysCallBase sc_spu("sys_spu");
u32 _max_usable_spu = 0; u32 _max_usable_spu = 0;
u32 _max_raw_spu = 0; u32 _max_raw_spu = 0;
@ -18,4 +18,4 @@ int sys_raw_spu_create(u32 id_addr, u32 attr_addr)
{ {
Memory.Write32(id_addr, Emu.GetIdManager().GetNewID("raw_spu")); Memory.Write32(id_addr, Emu.GetIdManager().GetNewID("raw_spu"));
return CELL_OK; return CELL_OK;
} }

2
rpcs3/Gui/AboutDialog.cpp → rpcs3/Gui/AboutDialog.h
View file

@ -1,5 +1,3 @@
#include "stdafx.h"
class AboutDialog class AboutDialog
: public wxDialog : public wxDialog
{ {

3
rpcs3/Gui/InstructionEditor.cpp → rpcs3/Gui/InstructionEditor.h
View file

@ -1,6 +1,3 @@
#include "stdafx.h"
#include "Emu/CPU/CPUDisAsm.h"
class InstructionEditorDialog class InstructionEditorDialog
: public wxDialog : public wxDialog
{ {

4
rpcs3/Gui/InterpreterDisAsm.cpp
View file

@ -7,8 +7,8 @@
#include "Emu/ARMv7/ARMv7DisAsm.h" #include "Emu/ARMv7/ARMv7DisAsm.h"
#include "Emu/ARMv7/ARMv7Decoder.h" #include "Emu/ARMv7/ARMv7Decoder.h"
#include "InstructionEditor.cpp" #include "InstructionEditor.h"
#include "RegisterEditor.cpp" #include "RegisterEditor.h"
//static const int show_lines = 30; //static const int show_lines = 30;

2
rpcs3/Gui/MainFrame.cpp
View file

@ -9,7 +9,7 @@
#include "Emu/GS/sysutil_video.h" #include "Emu/GS/sysutil_video.h"
#include "Gui/VHDDManager.h" #include "Gui/VHDDManager.h"
#include "Gui/VFSManager.h" #include "Gui/VFSManager.h"
#include "Gui/AboutDialog.cpp" #include "Gui/AboutDialog.h"
#include <wx/dynlib.h> #include <wx/dynlib.h>
#include "scetool/scetool.cpp" #include "scetool/scetool.cpp"

3
rpcs3/Gui/RegisterEditor.cpp → rpcs3/Gui/RegisterEditor.h
View file

@ -1,6 +1,3 @@
#include "stdafx.h"
#include "Emu/CPU/CPUDisAsm.h"
class RegisterEditorDialog : public wxDialog class RegisterEditorDialog : public wxDialog
{ {
u64 pc; u64 pc;