From 913f384fe44b3b985a3592542c4a5e6d1dafd03c Mon Sep 17 00:00:00 2001
From: gabest11 <gabest11@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 2 Mar 2011 08:44:16 +0000
Subject: [PATCH] GSdx: ... and codeblocks.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4383 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/GSdx/GSDeviceSDL.cpp                     | 10 +++++++---
 plugins/GSdx/GSDrawScanlineCodeGenerator.x64.cpp |  6 +++---
 plugins/GSdx/GSdx.gcc.cbp                        | 12 ++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/plugins/GSdx/GSDeviceSDL.cpp b/plugins/GSdx/GSDeviceSDL.cpp
index 9adf76e585..3db0dc7f06 100644
--- a/plugins/GSdx/GSDeviceSDL.cpp
+++ b/plugins/GSdx/GSDeviceSDL.cpp
@@ -50,16 +50,20 @@ GSDeviceSDL::~GSDeviceSDL()
 
 bool GSDeviceSDL::Create(GSWnd* wnd)
 {
-	m_window = (SDL_Window*)wnd->GetHandle();
+	void* handle = wnd->GetHandle();
 
-	if(m_window == wnd->GetDisplay())
+	if(handle == wnd->GetDisplay())
 	{
 		// HACK: no SDL window
 
-		m_window = SDL_CreateWindowFrom(wnd->GetHandle());
+		m_window = SDL_CreateWindowFrom(handle);
 
 		m_free_window = true;
 	}
+	else
+	{
+		m_window = (SDL_Window*)handle;
+	}
 
 	return GSDeviceSW::Create(wnd);
 }
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.x64.cpp b/plugins/GSdx/GSDrawScanlineCodeGenerator.x64.cpp
index d65d33c1c1..f045043f74 100644
--- a/plugins/GSdx/GSDrawScanlineCodeGenerator.x64.cpp
+++ b/plugins/GSdx/GSDrawScanlineCodeGenerator.x64.cpp
@@ -19,13 +19,13 @@
  *
  */
 
-#error TODO
-
 #include "stdafx.h"
 #include "GSDrawScanlineCodeGenerator.h"
 
 #if _M_SSE < 0x500 && (defined(_M_AMD64) || defined(_WIN64))
 
+#error TODO
+
 void GSDrawScanlineCodeGenerator::Generate()
 {
 }
@@ -120,4 +120,4 @@ void GSDrawScanlineCodeGenerator::ReadTexel(const Xmm& dst, const Xmm& addr, uin
 {
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/plugins/GSdx/GSdx.gcc.cbp b/plugins/GSdx/GSdx.gcc.cbp
index d2d8409c99..1f84ae6a9c 100644
--- a/plugins/GSdx/GSdx.gcc.cbp
+++ b/plugins/GSdx/GSdx.gcc.cbp
@@ -98,6 +98,10 @@
 		<Unit filename="GSDrawScanline.h" />
 		<Unit filename="GSDrawScanlineCodeGenerator.cpp" />
 		<Unit filename="GSDrawScanlineCodeGenerator.h" />
+		<Unit filename="GSDrawScanlineCodeGenerator.x64.avx.cpp" />
+		<Unit filename="GSDrawScanlineCodeGenerator.x64.cpp" />
+		<Unit filename="GSDrawScanlineCodeGenerator.x86.avx.cpp" />
+		<Unit filename="GSDrawScanlineCodeGenerator.x86.cpp" />
 		<Unit filename="GSDrawingContext.h" />
 		<Unit filename="GSDrawingEnvironment.h" />
 		<Unit filename="GSDump.cpp" />
@@ -122,6 +126,10 @@
 		<Unit filename="GSSetting.h" />
 		<Unit filename="GSSetupPrimCodeGenerator.cpp" />
 		<Unit filename="GSSetupPrimCodeGenerator.h" />
+		<Unit filename="GSSetupPrimCodeGenerator.x64.avx.cpp" />
+		<Unit filename="GSSetupPrimCodeGenerator.x64.cpp" />
+		<Unit filename="GSSetupPrimCodeGenerator.x86.avx.cpp" />
+		<Unit filename="GSSetupPrimCodeGenerator.x86.cpp" />
 		<Unit filename="GSState.cpp" />
 		<Unit filename="GSState.h" />
 		<Unit filename="GSTables.cpp" />
@@ -148,6 +156,10 @@
 		<Unit filename="GSVertexSW.h" />
 		<Unit filename="GSVertexTrace.cpp" />
 		<Unit filename="GSVertexTrace.h" />
+		<Unit filename="GSVertexTrace.x64.avx.cpp" />
+		<Unit filename="GSVertexTrace.x64.cpp" />
+		<Unit filename="GSVertexTrace.x86.avx.cpp" />
+		<Unit filename="GSVertexTrace.x86.cpp" />
 		<Unit filename="GSWnd.cpp" />
 		<Unit filename="GSWnd.h" />
 		<Unit filename="GSdx.cpp" />