wxGui: Get Linux compiling again.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1716 96395faa-99c1-11dd-bbfe-3dabce05a288

pcsx2/CDVD/CDVD.h

@@ -16,6 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+
 #pragma once
 
 
@@ -175,23 +176,6 @@ extern void cdvdNewDiskCB();
 extern u8 cdvdRead(u8 key);
 extern void cdvdWrite(u8 key, u8 rt);
 
-// ----------------------------------------------------------------------------
-//  Multiple interface system for CDVD
-//  used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
-//  ---------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-//  Multiple interface system for CDVD
-//  used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
-//  ---------------------------------------------------------------------------
-
-enum CDVD_SourceType
-{
-	CDVDsrc_Iso = 0,	// use built in ISO api
-	CDVDsrc_Plugin,		// use external plugin
-	CDVDsrc_NoDisc,		// use built in CDVDnull
-};
-
 extern void CDVDsys_ChangeSource( CDVD_SourceType type );
 extern CDVD_API* CDVD;		// currently active CDVD access mode api (either Iso, NoDisc, or Plugin)
 

pcsx2/CDVD/CDVDaccess.h

@@ -23,7 +23,7 @@ extern void DoCDVDclose();
 extern s32  DoCDVDreadSector(u8* buffer, u32 lsn, int mode);
 extern s32  DoCDVDreadTrack(u32 lsn, int mode);
 extern s32  DoCDVDgetBuffer(u8* buffer);
-extern s32  DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
+//extern s32  DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
 extern void DoCDVDnewDiskCB(void (*callback)());
 extern s32  DoCDVDdetectDiskType();
 extern void DoCDVDresetDiskTypeCache();

pcsx2/Linux/pcsx2.cbp

@@ -117,11 +117,8 @@
 		<Unit filename="../CDVD/CDVD_internal.h" />
 		<Unit filename="../CDVD/CDVDaccess.cpp" />
 		<Unit filename="../CDVD/CDVDaccess.h" />
-		<Unit filename="../CDVD/CDVDiso.h" />
 		<Unit filename="../CDVD/CDVDisoReader.cpp" />
 		<Unit filename="../CDVD/CDVDisoReader.h" />
-		<Unit filename="../CDVD/CDVDisodrv.h" />
-		<Unit filename="../CDVD/CDVDlib.h" />
 		<Unit filename="../CDVD/CdRom.cpp" />
 		<Unit filename="../CDVD/CdRom.h" />
 		<Unit filename="../CDVD/IsoFScdvd.h" />
@@ -216,7 +213,7 @@
 		<Unit filename="../PathUtils.cpp" />
 		<Unit filename="../Paths.h" />
 		<Unit filename="../Pcsx2Config.cpp" />
-		<Unit filename="../Plugins.cpp" />
+		<Unit filename="../PluginManager.cpp" />
 		<Unit filename="../Plugins.h" />
 		<Unit filename="../PrecompiledHeader.h" />
 		<Unit filename="../R3000A.cpp" />
@@ -235,7 +232,6 @@
 		<Unit filename="../SamplProf.h" />
 		<Unit filename="../SaveState.cpp" />
 		<Unit filename="../SaveState.h" />
-		<Unit filename="../Saveslots.cpp" />
 		<Unit filename="../Sif.cpp" />
 		<Unit filename="../Sif.h" />
 		<Unit filename="../Sifcmd.h" />
@@ -302,6 +298,7 @@
 		<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
 		<Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
 		<Unit filename="../gui/Panels/VideoPanel.cpp" />
+		<Unit filename="../gui/Plugins.cpp" />
 		<Unit filename="../gui/Resources/AppIcon.h" />
 		<Unit filename="../gui/Resources/BackgroundLogo.h" />
 		<Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
@@ -312,6 +309,7 @@
 		<Unit filename="../gui/Resources/ConfigIcon_Video.h" />
 		<Unit filename="../gui/Resources/EmbeddedImage.h" />
 		<Unit filename="../gui/Resources/ps2_silver.h" />
+		<Unit filename="../gui/Saveslots.cpp" />
 		<Unit filename="../gui/i18n.cpp" />
 		<Unit filename="../gui/i18n.h" />
 		<Unit filename="../gui/main.cpp" />

pcsx2/System.h

@@ -23,8 +23,18 @@
 #include "Utilities/Threading.h"		// to use threading stuff, include the Threading namespace in your file.
 #include "Misc.h"
 
+// ----------------------------------------------------------------------------
+//  Multiple interface system for CDVD
+//  used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
+//  ---------------------------------------------------------------------------
+enum CDVD_SourceType
+{
+	CDVDsrc_Iso = 0,	// use built in ISO api
+	CDVDsrc_Plugin,		// use external plugin
+	CDVDsrc_NoDisc,		// use built in CDVDnull
+};
+
 class CoreEmuThread;
-enum CDVD_SourceType;
 
 extern bool SysInit();
 extern void SysDetect();				// Detects cpu type and fills cpuInfo structs.

pcsx2/ps2/CoreEmuThread.cpp

@@ -75,6 +75,8 @@ void CoreEmuThread::CpuInitializeMess()
 // of SEH, and so these functions can be inlined.
 #ifdef _WIN32
 #	define __unique_stackframe __noinline
+#else
+#	define __unique_stackframe
 #endif
 
 // On Win32 this function invokes SEH, which requires it be in a function all by itself