From 49568c3d859db68ad16050fbbd657e83b5b04978 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 26 Feb 2011 03:05:31 +0000
Subject: [PATCH] GSdx: Correct the sdl library output name, and add sdl to the
 main codeblocks workspace.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4366 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp | 4 ++--
 pcsx2-codeblocks.workspace                  | 1 +
 plugins/GSdx/stdafx.h                       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp b/3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp
index 46886e0a2c..dfaf0ea1c5 100644
--- a/3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp
+++ b/3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="../../../deps/debug/libSDL-1.3" prefix_auto="1" extension_auto="1" />
+				<Option output="../../../deps/debug/libSDL-1.3.a" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="" />
 				<Option object_output="obj/Debug/" />
 				<Option type="2" />
@@ -19,7 +19,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="../../../deps/release/libSDL-1.3" prefix_auto="1" extension_auto="1" />
+				<Option output="../../../deps/release/libSDL-1.3.a" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="" />
 				<Option object_output="obj/Release/" />
 				<Option type="2" />
diff --git a/pcsx2-codeblocks.workspace b/pcsx2-codeblocks.workspace
index 47d0f79eb7..c5d3652b6f 100644
--- a/pcsx2-codeblocks.workspace
+++ b/pcsx2-codeblocks.workspace
@@ -29,5 +29,6 @@
 		</Project>
 		<Project filename="plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp" />
 		<Project filename="plugins/GSdx/GSdx.gcc.cbp" active="1" />
+		<Project filename="3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h
index 5a11fa6a2b..9695f5c58c 100644
--- a/plugins/GSdx/stdafx.h
+++ b/plugins/GSdx/stdafx.h
@@ -112,6 +112,7 @@ using namespace stdext;
 
     #ifdef __GNUC__
 
+        #include "assert.h"
         #define __forceinline __inline__ __attribute__((always_inline,unused))
         // #define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__))
         #define __assume(c) ((void)0)