From 9a8cf34f44f4ba08692a6d603f565b15278d1823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Bla=C5=BEevi=C4=87?= <krofnica996@gmail.com>
Date: Sun, 24 Nov 2013 10:17:18 +0100
Subject: [PATCH] Fix linking

---
 rpcs3/Emu/GS/GL/OpenGL.h                                 | 2 ++
 rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp                 | 2 +-
 rpcs3/Emu/SysCalls/lv2/SC_sys_spu.cpp                    | 4 ++--
 rpcs3/Gui/{AboutDialog.cpp => AboutDialog.h}             | 2 --
 rpcs3/Gui/{InstructionEditor.cpp => InstructionEditor.h} | 3 ---
 rpcs3/Gui/InterpreterDisAsm.cpp                          | 4 ++--
 rpcs3/Gui/MainFrame.cpp                                  | 2 +-
 rpcs3/Gui/{RegisterEditor.cpp => RegisterEditor.h}       | 3 ---
 8 files changed, 8 insertions(+), 14 deletions(-)
 rename rpcs3/Gui/{AboutDialog.cpp => AboutDialog.h} (99%)
 rename rpcs3/Gui/{InstructionEditor.cpp => InstructionEditor.h} (98%)
 rename rpcs3/Gui/{RegisterEditor.cpp => RegisterEditor.h} (98%)

diff --git a/rpcs3/Emu/GS/GL/OpenGL.h b/rpcs3/Emu/GS/GL/OpenGL.h
index 624d706315..67cfe0c6c5 100644
--- a/rpcs3/Emu/GS/GL/OpenGL.h
+++ b/rpcs3/Emu/GS/GL/OpenGL.h
@@ -2,7 +2,9 @@
 #include <GL/gl.h>
 #include "GL/glext.h"
 
+#ifdef _WIN32
 typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval);
+#endif
 
 #define OPENGL_PROC(p, n) extern p gl##n
 #define OPENGL_PROC2(p, n, tn) OPENGL_PROC(p, n)
diff --git a/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp b/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp
index 94c41b5742..9d9a209317 100644
--- a/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp
@@ -4,7 +4,7 @@
 #include "Loader/ELF.h"
 #include "Emu/Cell/RawSPUThread.h"
 
-SysCallBase sc_spu("sys_spu");
+static SysCallBase sc_spu("sys_spu");
 extern SysCallBase sys_event;
 
 static const u32 g_spu_group_thr_count = 255;
diff --git a/rpcs3/Emu/SysCalls/lv2/SC_sys_spu.cpp b/rpcs3/Emu/SysCalls/lv2/SC_sys_spu.cpp
index d93fd6f835..0f12143b20 100644
--- a/rpcs3/Emu/SysCalls/lv2/SC_sys_spu.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/SC_sys_spu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/SysCalls/SysCalls.h"
 
-SysCallBase sc_spu("sys_spu");
+static SysCallBase sc_spu("sys_spu");
 
 u32 _max_usable_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"));
 	return CELL_OK;
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Gui/AboutDialog.cpp b/rpcs3/Gui/AboutDialog.h
similarity index 99%
rename from rpcs3/Gui/AboutDialog.cpp
rename to rpcs3/Gui/AboutDialog.h
index 5a167d9bf7..b6da201468 100644
--- a/rpcs3/Gui/AboutDialog.cpp
+++ b/rpcs3/Gui/AboutDialog.h
@@ -1,5 +1,3 @@
-#include "stdafx.h"
-
 class AboutDialog
 	: public wxDialog
 {
diff --git a/rpcs3/Gui/InstructionEditor.cpp b/rpcs3/Gui/InstructionEditor.h
similarity index 98%
rename from rpcs3/Gui/InstructionEditor.cpp
rename to rpcs3/Gui/InstructionEditor.h
index bb0a1b65f1..5b9c508a87 100644
--- a/rpcs3/Gui/InstructionEditor.cpp
+++ b/rpcs3/Gui/InstructionEditor.h
@@ -1,6 +1,3 @@
-#include "stdafx.h"
-#include "Emu/CPU/CPUDisAsm.h"
-
 class InstructionEditorDialog
 	: public wxDialog
 {
diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp
index f268879ee1..f7b65e30ff 100644
--- a/rpcs3/Gui/InterpreterDisAsm.cpp
+++ b/rpcs3/Gui/InterpreterDisAsm.cpp
@@ -7,8 +7,8 @@
 #include "Emu/ARMv7/ARMv7DisAsm.h"
 #include "Emu/ARMv7/ARMv7Decoder.h"
 
-#include "InstructionEditor.cpp"
-#include "RegisterEditor.cpp"
+#include "InstructionEditor.h"
+#include "RegisterEditor.h"
 
 //static const int show_lines = 30;
 
diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp
index abffdb0557..ea0239c1c0 100644
--- a/rpcs3/Gui/MainFrame.cpp
+++ b/rpcs3/Gui/MainFrame.cpp
@@ -9,7 +9,7 @@
 #include "Emu/GS/sysutil_video.h"
 #include "Gui/VHDDManager.h"
 #include "Gui/VFSManager.h"
-#include "Gui/AboutDialog.cpp"
+#include "Gui/AboutDialog.h"
 #include <wx/dynlib.h>
 
 #include "scetool/scetool.cpp"
diff --git a/rpcs3/Gui/RegisterEditor.cpp b/rpcs3/Gui/RegisterEditor.h
similarity index 98%
rename from rpcs3/Gui/RegisterEditor.cpp
rename to rpcs3/Gui/RegisterEditor.h
index 50374a2087..56659ffbcb 100644
--- a/rpcs3/Gui/RegisterEditor.cpp
+++ b/rpcs3/Gui/RegisterEditor.h
@@ -1,6 +1,3 @@
-#include "stdafx.h"
-#include "Emu/CPU/CPUDisAsm.h"
-
 class RegisterEditorDialog : public wxDialog
 {
 	u64 pc;