Linux: Fix compilation errors and warnings. There's still a lot of new warnings in x86Emitter due to __forceinline being disabled in debug builds, but the proper fix for those will come later.

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

common/build/Utilities/Utilities.cbp

@@ -102,6 +102,7 @@
 		<Unit filename="../../src/Utilities/StringHelpers.cpp" />
 		<Unit filename="../../src/Utilities/ThreadTools.cpp" />
 		<Unit filename="../../src/Utilities/vssprintf.cpp" />
+		<Unit filename="../../src/Utilities/wxGuiTools.cpp" />
 		<Unit filename="../../src/Utilities/x86/MemcpyFast.S" />
 		<Extensions>
 			<envvars />

common/include/Utilities/General.h

@@ -39,10 +39,7 @@ namespace HostSys
 
 	extern void MemProtect( void* baseaddr, size_t size, PageProtectionMode mode, bool allowExecution=false );
 
-	static __forceinline void Munmap( void* base, u32 size )
-	{
-		Munmap( (uptr)base, size );
-	}
+	extern void Munmap( void* base, u32 size );
 }
 
 

common/src/Utilities/AlignedMalloc.cpp

@@ -18,7 +18,6 @@
 
 #include "PrecompiledHeader.h"
 
-
 struct AlignedMallocHeader
 {
 	u32 size;		// size of the allocated buffer (minus alignment and header)
@@ -73,7 +72,7 @@ __forceinline void pcsx2_aligned_free(void* pmem)
 
 // Special unaligned memset used when all other optimized memsets fail (it's called from
 // memzero_obj and stuff).
-void _memset16_unaligned( void* dest, u16 data, size_t size )
+__forceinline void _memset16_unaligned( void* dest, u16 data, size_t size )
 {
 	jASSUME( (size & 0x1) == 0 );
 
@@ -81,3 +80,8 @@ void _memset16_unaligned( void* dest, u16 data, size_t size )
 	for(int i=size; i; --i, ++dst )
 		*dst = data;
 }
+
+__forceinline void HostSys::Munmap( void* base, u32 size )
+{
+	Munmap( (uptr)base, size );
+}

pcsx2/GS.h

@@ -88,6 +88,8 @@ struct GIFTAG
 	u32 FLG : 2;
 	u32 NREG : 4;
 	u32 REGS[2];
+
+	GIFTAG() {}
 };
 
 struct GIFPath

pcsx2/IPU/IPU.cpp

@@ -46,6 +46,8 @@ using namespace std;			// for min / max
 #	define IPU_FORCEINLINE __forceinline
 #endif
 
+static tIPU_DMA g_nDMATransfer;
+
 // FIXME - g_nIPU0Data and Pointer are not saved in the savestate, which breaks savestates for some
 // FMVs at random (if they get saved during the half frame of a 30fps rate).  The fix is complicated
 // since coroutine is such a pita.  (air)

pcsx2/IPU/IPU.h

@@ -171,8 +171,6 @@ union tIPU_DMA
 	u32 _u32;
 };
 
-static tIPU_DMA g_nDMATransfer;
-
 enum SCE_IPU
 {
 	SCE_IPU_BCLR = 0x0

pcsx2/Linux/LnxKeyCodes.cpp

@@ -1,5 +1,6 @@
 
 #include "../PrecompiledHeader.h"
+#include "ConsoleLogger.h"
 
 //#include <wx/gtk/win_gtk.h>
 #include <gdk/gdkkeysyms.h>

pcsx2/Linux/pcsx2.cbp

@@ -113,7 +113,6 @@
 		<Unit filename="../../common/include/PS2Edefs.h" />
 		<Unit filename="../../common/include/PS2Etypes.h" />
 		<Unit filename="../../common/include/Pcsx2Api.h" />
-		<Unit filename="../../common/include/Pcsx2Config.h" />
 		<Unit filename="../../common/include/Pcsx2Defs.h" />
 		<Unit filename="../../common/include/Pcsx2Types.h" />
 		<Unit filename="../../common/include/PluginCallbacks.h" />
@@ -284,7 +283,7 @@
 		<Unit filename="../gui/Dialogs/ModalPopups.h" />
 		<Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" />
 		<Unit filename="../gui/FrameForGS.cpp" />
-		<Unit filename="../gui/HostGui.cpp" />
+		<Unit filename="../gui/GlobalCommands.cpp" />
 		<Unit filename="../gui/IniInterface.cpp" />
 		<Unit filename="../gui/IniInterface.h" />
 		<Unit filename="../gui/MainFrame.cpp" />
@@ -369,7 +368,6 @@
 			<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
 		</Unit>
 		<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" />

pcsx2/MTGS.cpp

@@ -63,7 +63,8 @@ using namespace std;
 // this is not emulated!
 PCSX2_ALIGNED16( static GIFPath s_path[3] );
 
-GIFPath::GIFPath()
+GIFPath::GIFPath() :
+	tag()
 {
 	memzero_obj( *this );
 }

pcsx2/gui/App.h

@@ -24,13 +24,15 @@
 class IniInterface;
 class MainEmuFrame;
 class GSFrame;
+class ConsoleLogFrame;
+class PipeRedirectionBase;
 
 #include "Utilities/HashMap.h"
 #include "Utilities/wxGuiTools.h"
 
 #include "AppConfig.h"
 #include "System.h"
-#include "ConsoleLogger.h"
+//#include "ConsoleLogger.h"
 
 #include "ps2/CoreEmuThread.h"
 
@@ -217,7 +219,7 @@ class AcceleratorDictionary : public HashTools::HashMap<int, const GlobalCommand
 protected:
 
 public:
-	typedef HashMap<int, const GlobalCommandDescriptor*> _parent;
+	typedef HashTools::HashMap<int, const GlobalCommandDescriptor*> _parent;
 	using _parent::operator[];
 
 	AcceleratorDictionary();
@@ -386,37 +388,12 @@ public:
 #endif
 
 	// ----------------------------------------------------------------------------
-	//        Console / Program Logging Helpers
+	//   Console / Program Logging Helpers
 	// ----------------------------------------------------------------------------
-	ConsoleLogFrame* GetProgramLog()
-	{
-		return m_ProgramLogBox;
-	}
-
-	void CloseProgramLog()
-	{
-		if( m_ProgramLogBox == NULL ) return;
-
-		m_ProgramLogBox->Close();
-
-		// disable future console log messages from being sent to the window.
-		m_ProgramLogBox = NULL;
-	}
-
-	void ProgramLog_CountMsg()
-	{
-		if ((wxTheApp == NULL) || ( m_ProgramLogBox == NULL )) return;
-		m_ProgramLogBox->CountMessage();
-	}
-
-	void ProgramLog_PostEvent( wxEvent& evt )
-	{
-		if ((wxTheApp == NULL) || ( m_ProgramLogBox == NULL )) return;
-		m_ProgramLogBox->GetEventHandler()->AddPendingEvent( evt );
-	}
-
-	//ConsoleLogFrame* GetConsoleFrame() const { return m_ProgramLogBox; }
-	//void SetConsoleFrame( ConsoleLogFrame& frame ) { m_ProgramLogBox = &frame; }
+	ConsoleLogFrame* GetProgramLog();
+	void CloseProgramLog();
+	void ProgramLog_CountMsg();
+	void ProgramLog_PostEvent( wxEvent& evt );
 
 protected:
 	void InitDefaultGlobalAccelerators();

pcsx2/gui/AppMain.cpp

@@ -18,6 +18,7 @@
 #include "MainFrame.h"
 #include "Plugins.h"
 #include "SaveState.h"
+#include "ConsoleLogger.h"
 
 #include "Dialogs/ModalPopups.h"
 #include "Dialogs/ConfigurationDialog.h"

pcsx2/gui/ConsoleLogger.cpp

@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 #include "App.h"
 #include "MainFrame.h"
+#include "ConsoleLogger.h"
 #include "Utilities/Console.h"
 #include "DebugTools/Debug.h"
 
@@ -551,6 +552,32 @@ void ConsoleLogFrame::DoMessage()
 	}
 }
 
+ConsoleLogFrame* Pcsx2App::GetProgramLog()
+{
+	return m_ProgramLogBox;
+}
+
+void Pcsx2App::CloseProgramLog()
+{
+	if( m_ProgramLogBox == NULL ) return;
+
+	m_ProgramLogBox->Close();
+
+	// disable future console log messages from being sent to the window.
+	m_ProgramLogBox = NULL;
+}
+
+void Pcsx2App::ProgramLog_CountMsg()
+{
+	if ((wxTheApp == NULL) || ( m_ProgramLogBox == NULL )) return;
+	m_ProgramLogBox->CountMessage();
+}
+
+void Pcsx2App::ProgramLog_PostEvent( wxEvent& evt )
+{
+	if ((wxTheApp == NULL) || ( m_ProgramLogBox == NULL )) return;
+	m_ProgramLogBox->GetEventHandler()->AddPendingEvent( evt );
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////
 //

pcsx2/gui/ConsoleLogger.h

@@ -15,6 +15,7 @@
 
 #pragma once
 
+#include "App.h"
 
 BEGIN_DECLARE_EVENT_TYPES()
 	DECLARE_EVENT_TYPE(wxEVT_DockConsole, -1)
@@ -22,8 +23,6 @@ END_DECLARE_EVENT_TYPES()
 
 static const bool EnableThreadedLoggingTest = false; //true;
 
-using namespace Threading;
-
 class LogWriteEvent;
 
 // --------------------------------------------------------------------------------------
@@ -67,7 +66,7 @@ protected:
 //  of the console logger.
 // --------------------------------------------------------------------------------------
 
-class ConsoleTestThread : public PersistentThread
+class ConsoleTestThread : public Threading::PersistentThread
 {
 protected:
 	volatile bool m_done;

pcsx2/gui/GlobalCommands.cpp

@@ -244,7 +244,7 @@ static const GlobalCommandDescriptor CommandDeclarations[] =
 };
 
 AcceleratorDictionary::AcceleratorDictionary() :
-	HashMap( 0, 0xffffffff )
+	_parent( 0, 0xffffffff )
 {
 }
 

pcsx2/gui/MainFrame.cpp

@@ -15,6 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "MainFrame.h"
+#include "ConsoleLogger.h"
 
 #include "Resources/EmbeddedImage.h"
 #include "Resources/AppIcon16.h"

plugins/GSnull/GifTransfer.h

@@ -132,6 +132,8 @@ struct GIFTAG
 	u32 flg : 2;
 	u32 nreg : 4;
 	u32 regs[2];
+
+	GIFTAG() {}
 };
 
 struct GIFPath