From af940798d0caa56d28902ea5adc18994065413fa Mon Sep 17 00:00:00 2001
From: Florian <Florian@8062f311-0dae-4547-b526-b8ab9ac864a5>
Date: Wed, 21 Dec 2011 12:56:38 +0000
Subject: [PATCH] Changed sfml lib names on Linux. Switched back to default GCC
 compiler profile in Windows target.

git-svn-id: svn://localhost@596 8062f311-0dae-4547-b526-b8ab9ac864a5
---
 Extensions/VideoObject/VideoExtension.cbp    | 53 ++++++++++++--------
 Extensions/VideoObject/VideoExtension.depend |  6 +--
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/Extensions/VideoObject/VideoExtension.cbp b/Extensions/VideoObject/VideoExtension.cbp
index 669d50a877..c45ac85074 100644
--- a/Extensions/VideoObject/VideoExtension.cbp
+++ b/Extensions/VideoObject/VideoExtension.cbp
@@ -10,7 +10,7 @@
 				<Option output="..\..\Runtime\bin\debug\VideoObject.xgdw" prefix_auto="1" extension_auto="0" />
 				<Option object_output="obj\Debug\" />
 				<Option type="3" />
-				<Option compiler="gnu_gcc_compiler__tdmgcc452" />
+				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-Wall" />
@@ -41,7 +41,7 @@
 				<Option output="..\..\IDE\bin\debug\Extensions\VideoObject.xgdwe" prefix_auto="1" extension_auto="0" />
 				<Option object_output="obj\Debug Edittime\" />
 				<Option type="3" />
-				<Option compiler="gnu_gcc_compiler__tdmgcc452" />
+				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-Wall" />
@@ -112,7 +112,7 @@
 				<Option output="..\..\Runtime\bin\release\VideoObject.xgdw" prefix_auto="1" extension_auto="0" />
 				<Option object_output="obj\Release\" />
 				<Option type="3" />
-				<Option compiler="gnu_gcc_compiler__tdmgcc452" />
+				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -143,7 +143,7 @@
 				<Option output="..\..\IDE\bin\release\Extensions\VideoObject.xgdwe" prefix_auto="1" extension_auto="0" />
 				<Option object_output="obj\Release Edittime\" />
 				<Option type="3" />
-				<Option compiler="gnu_gcc_compiler__tdmgcc452" />
+				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -213,7 +213,7 @@
 				<Option output="..\..\Runtime\bin\dev\VideoObject.xgdw" prefix_auto="1" extension_auto="0" />
 				<Option object_output="obj\Dev\" />
 				<Option type="3" />
-				<Option compiler="gnu_gcc_compiler__tdmgcc452" />
+				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -244,7 +244,7 @@
 				<Option output="..\..\IDE\bin\dev\Extensions\VideoObject.xgdwe" prefix_auto="1" extension_auto="0" />
 				<Option object_output="obj\Dev Edittime\" />
 				<Option type="3" />
-				<Option compiler="gnu_gcc_compiler__tdmgcc452" />
+				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -335,10 +335,10 @@
 					<Add option="-ltheoradec" />
 					<Add option="-lvorbis" />
 					<Add option="-logg" />
-					<Add option="-lsfml2-audio" />
-					<Add option="-lsfml2-graphics" />
-					<Add option="-lsfml2-window" />
-					<Add option="-lsfml2-system" />
+					<Add option="-lsfml-audio" />
+					<Add option="-lsfml-graphics" />
+					<Add option="-lsfml-window" />
+					<Add option="-lsfml-system" />
 					<Add option="-lsndfile" />
 					<Add option="-lopenal" />
 					<Add option="-lfreetype" />
@@ -382,10 +382,10 @@
 					<Add option="-lvorbis" />
 					<Add option="-logg" />
 					<Add option="`wx-config --libs all`" />
-					<Add option="-lsfml2-audio" />
-					<Add option="-lsfml2-graphics" />
-					<Add option="-lsfml2-window" />
-					<Add option="-lsfml2-system" />
+					<Add option="-lsfml-audio" />
+					<Add option="-lsfml-graphics" />
+					<Add option="-lsfml-window" />
+					<Add option="-lsfml-system" />
 					<Add option="-lsndfile" />
 					<Add option="-lopenal" />
 					<Add option="-lfreetype" />
@@ -427,10 +427,10 @@
 					<Add option="-lvorbis" />
 					<Add option="-logg" />
 					<Add option="`wx-config --libs all`" />
-					<Add option="-lsfml2-audio" />
-					<Add option="-lsfml2-graphics" />
-					<Add option="-lsfml2-window" />
-					<Add option="-lsfml2-system" />
+					<Add option="-lsfml-audio" />
+					<Add option="-lsfml-graphics" />
+					<Add option="-lsfml-window" />
+					<Add option="-lsfml-system" />
 					<Add option="-lsndfile" />
 					<Add option="-lopenal" />
 					<Add option="-lfreetype" />
@@ -469,10 +469,10 @@
 					<Add option="-ltheoradec" />
 					<Add option="-lvorbis" />
 					<Add option="-logg" />
-					<Add option="-lsfml2-audio" />
-					<Add option="-lsfml2-graphics" />
-					<Add option="-lsfml2-window" />
-					<Add option="-lsfml2-system" />
+					<Add option="-lsfml-audio" />
+					<Add option="-lsfml-graphics" />
+					<Add option="-lsfml-window" />
+					<Add option="-lsfml-system" />
 					<Add option="-lsndfile" />
 					<Add option="-lopenal" />
 					<Add option="-lfreetype" />
@@ -805,6 +805,15 @@
 					<wxDialog wxs="wxsmith/VideoObjectEditor.wxs" src="VideoObjectEditor.cpp" hdr="VideoObjectEditor.h" fwddecl="0" i18n="1" name="VideoObjectEditor" language="CPP" />
 				</resources>
 			</wxsmith>
+			<DoxyBlocks>
+				<comment_style block="0" line="0" />
+				<doxyfile_project />
+				<doxyfile_build />
+				<doxyfile_warnings />
+				<doxyfile_output />
+				<doxyfile_dot />
+				<general />
+			</DoxyBlocks>
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/Extensions/VideoObject/VideoExtension.depend b/Extensions/VideoObject/VideoExtension.depend
index b3f79be12a..457445f829 100644
--- a/Extensions/VideoObject/VideoExtension.depend
+++ b/Extensions/VideoObject/VideoExtension.depend
@@ -15686,7 +15686,7 @@
 1309115557 d:\florian\programmation\gamedevelop2\gdl\gdl\rotatedrectangle.h
 	<SFML/System.hpp>
 
-1314788991 d:\florian\programmation\gamedevelop2\gdl\gdl\imagemanager.h
+1322924408 d:\florian\programmation\gamedevelop2\gdl\gdl\imagemanager.h
 	"GDL/Game.h"
 	<SFML/System.hpp>
 	<SFML/Graphics.hpp>
@@ -15988,11 +15988,11 @@
 	<map>
 	<boost/shared_ptr.hpp>
 
-1320500064 d:\florian\programmation\gamedevelop2\gdl\gdl\version.h
+1324229304 d:\florian\programmation\gamedevelop2\gdl\gdl\version.h
 
 1299112181 d:\florian\programmation\gamedevelop2\extlibs\boost\boost\version.hpp
 
-1307990278 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\lib\gcc_dll\mswd\wx\setup.h
+1307986678 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\lib\gcc_dll\mswd\wx\setup.h
 
 1312710621 d:\florian\programmation\gamedevelop2\gdl\gdl\lightweightcommontools.h
 	<sstream>