# HG changeset patch
# User unc0rr
# Date 1370290806 -14400
# Node ID 5ce3cfe45476940438f45b91d967858bb8ea619e
# Parent  5cf87143b188767ea4eaa337b3c38454877341db# Parent  3f5e0280db4d28e480a015e0f54dc931902e249c
Merge default to 0.9.19

diff -r 3f5e0280db4d -r 5ce3cfe45476 CMakeLists.txt
--- a/CMakeLists.txt	Tue Jun 04 00:15:03 2013 +0400
+++ b/CMakeLists.txt	Tue Jun 04 00:20:06 2013 +0400
@@ -84,7 +84,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 19)
-set(HEDGEWARS_PROTO_VER 44)
+set(HEDGEWARS_PROTO_VER 45)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 message(STATUS "Building ${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION} (${HEDGEWARS_HASH})")
@@ -255,10 +255,10 @@
 #parse additional parameters
 if(FPFLAGS OR GHFLAGS)
     if(${allow_parse_args})
-        message(${WARNING} "FPFLAGS and GHFLAGS are available only when using CMake >= 2.8")
-    else()
         separate_arguments(fpflags_parsed UNIX_COMMAND ${FPFLAGS})
         separate_arguments(ghflags_parsed UNIX_COMMAND ${GHFLAGS})
+    else()
+        message(${WARNING} "FPFLAGS and GHFLAGS are available only when using CMake >= 2.8")
     endif()
 endif()
 
diff -r 3f5e0280db4d -r 5ce3cfe45476 hedgewars/GL.h
--- a/hedgewars/GL.h	Tue Jun 04 00:15:03 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#pragma once
-
-#include <GL/gl.h>
diff -r 3f5e0280db4d -r 5ce3cfe45476 hedgewars/Math.h
--- a/hedgewars/Math.h	Tue Jun 04 00:15:03 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#pragma once
-
diff -r 3f5e0280db4d -r 5ce3cfe45476 hedgewars/SysUtils.h
diff -r 3f5e0280db4d -r 5ce3cfe45476 hedgewars/Types.h
diff -r 3f5e0280db4d -r 5ce3cfe45476 share/hedgewars/Data/Locale/missions_en.txt
--- a/share/hedgewars/Data/Locale/missions_en.txt	Tue Jun 04 00:15:03 2013 +0400
+++ b/share/hedgewars/Data/Locale/missions_en.txt	Tue Jun 04 00:20:06 2013 +0400
@@ -49,5 +49,5 @@
 User_Mission_-_RCPlane_Challenge.name=Challenge: RC Plane
 User_Mission_-_RCPlane_Challenge.desc="Feeling pretty confident, eh, flyboy?"
 
-portal.name= Mission: Portal training mission
+portal.name=Mission: Portal Mind Challenge
 portal.desc="Use the portal to move fast and far, use it to kill, use it with caution!"
diff -r 3f5e0280db4d -r 5ce3cfe45476 share/hedgewars/Data/Locale/missions_fr.txt
--- a/share/hedgewars/Data/Locale/missions_fr.txt	Tue Jun 04 00:15:03 2013 +0400
+++ b/share/hedgewars/Data/Locale/missions_fr.txt	Tue Jun 04 00:20:06 2013 +0400
@@ -45,3 +45,6 @@
 
 User_Mission_-_RCPlane_Challenge.name=Challenge: Avion télécommandé
 User_Mission_-_RCPlane_Challenge.desc="Plutôt confiant, hein, aviateur ?"
+
+portal.name=Portal Casse Tête
+portal.desc="Utilisez le fusil à portail pour voyager loin et rapidemment ou pour tuer ! Utiliser avec prudence !"
diff -r 3f5e0280db4d -r 5ce3cfe45476 tools/build_windows.bat
--- a/tools/build_windows.bat	Tue Jun 04 00:15:03 2013 +0400
+++ b/tools/build_windows.bat	Tue Jun 04 00:20:06 2013 +0400
@@ -40,7 +40,8 @@
 
 echo Running cmake...
 set ERRORLEVEL=
-cmake . -G "MinGW Makefiles" -DPNG_LIBRARY="%CD%\misc\winutils\bin\libpng13.dll" -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" -DCMAKE_PREFIX_PATH="%CD%\misc\winutils\" ::prefix should be last
+cmake . -G "MinGW Makefiles" -DPNG_LIBRARY="%CD%\misc\winutils\bin\libpng13.dll" -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" -DCMAKE_PREFIX_PATH="%CD%\misc\winutils\\"
+:: prefix should be last
 
 if %ERRORLEVEL% NEQ 0 goto exitpoint