From b3194e596e9ef614e4fb59130247f30b9a566ff4 Mon Sep 17 00:00:00 2001
From: death2droid <death2droid@gmail.com>
Date: Wed, 9 Sep 2009 23:19:24 +0000
Subject: [PATCH] Fix win32 build and remove a warning from sln.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4243 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Src/Common.h               |  2 +-
 Source/Core/DolphinWX/Src/NetSockets.cpp      |  5 ++++-
 Source/Dolphin.sln                            | 16 ----------------
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp |  6 ------
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 9f5dda0528..cd66358003 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -84,7 +84,7 @@
 	#define HAVE_WX 1
 	#define HAVE_SFML 1
 	#define HAVE_OPENAL 1
-	#define HAVE_ALSA 1
+	#define HAVE_ALSA 0
 
 // it is VERY DANGEROUS to mix _SECURE_SCL=0 and _SECURE_SCL=1 compiled libraries.
 // You will get bizarre crash bugs whenever you use STL.
diff --git a/Source/Core/DolphinWX/Src/NetSockets.cpp b/Source/Core/DolphinWX/Src/NetSockets.cpp
index 421891f8e0..7079c72cb2 100644
--- a/Source/Core/DolphinWX/Src/NetSockets.cpp
+++ b/Source/Core/DolphinWX/Src/NetSockets.cpp
@@ -25,10 +25,13 @@
 void NetEvent::AppendText(const wxString text)
 {
 	// I have the feeling SendEvent may be a bit safer/better...
-	//SendEvent(ADD_TEXT, std::string(text.mb_str())); //Problem NETPLAY
+#if 0
+	SendEvent(ADD_TEXT, std::string(text.mb_str())); //NETPLAY: FIXME std::string(text.mb_str())
+#else
 	wxMutexGuiEnter();
 		m_netptr->AppendText(text);
 	wxMutexGuiLeave();
+#endif
 }
 
 void NetEvent::SendEvent(int EventType, const std::string text, int integer)
diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index 2cc5a87cea..202fce4744 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -121,13 +121,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Wiimote", "Plugins\P
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcproj", "{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadSimpleEvnt", "Plugins\Plugin_PadSimpleEvnt\Plugin_PadSimpleEvnt.vcproj", "{58E81545-241B-416E-8088-E62452EB25FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
-		{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
-		{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcproj", "{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_LLE", "Plugins\Plugin_DSP_LLE\Plugin_DSP_LLE.vcproj", "{3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}"
@@ -458,15 +451,6 @@ Global
 		{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|Win32.Build.0 = Release|Win32
 		{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.ActiveCfg = Release|x64
 		{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.Build.0 = Release|x64
-		{58E81545-241B-416E-8088-E62452EB25FA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{58E81545-241B-416E-8088-E62452EB25FA}.Debug|Win32.Build.0 = Debug|Win32
-		{58E81545-241B-416E-8088-E62452EB25FA}.Debug|x64.ActiveCfg = Debug|x64
-		{58E81545-241B-416E-8088-E62452EB25FA}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{58E81545-241B-416E-8088-E62452EB25FA}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{58E81545-241B-416E-8088-E62452EB25FA}.Release_JITIL|Win32.ActiveCfg = Release|Win32
-		{58E81545-241B-416E-8088-E62452EB25FA}.Release_JITIL|x64.ActiveCfg = Release|x64
-		{58E81545-241B-416E-8088-E62452EB25FA}.Release|Win32.ActiveCfg = Release|Win32
-		{58E81545-241B-416E-8088-E62452EB25FA}.Release|x64.ActiveCfg = Release|x64
 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Debug|Win32.Build.0 = Debug|Win32
 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 1c05a0354d..6e68583951 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -69,12 +69,6 @@
 #include <wx/image.h>
 #endif
 
-#ifdef _WIN32
-	#include "Win32Window.h" // warning: crapcode
-#else
-#endif
-
-
 // Declarations and definitions
 // ----------------------------
 CGcontext g_cgcontext;