From 4dbea5974445716c4729aa4e24c695d73a5b5213 Mon Sep 17 00:00:00 2001
From: Anselme <anselme16@hotmail.fr>
Date: Tue, 8 Mar 2016 20:16:04 +0100
Subject: [PATCH] fixed sfml and bullet order issues

---
 template.cmake | 59 +++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/template.cmake b/template.cmake
index 4bd80ee..ce3d592 100644
--- a/template.cmake
+++ b/template.cmake
@@ -81,7 +81,36 @@ set(INCLUDE_PATHS ${INCLUDE_ROOT})
 #     LIST(APPEND INCLUDE_PATHS ${INCLUDE_ROOT}${EXTENSION} " ")
 # endforeach()
 
-# TODO: Complete SFML
+if(USE_RENDERER)
+        find_library(SPARROW_RENDERER_LIBRARY
+                NAMES
+                        SparrowRenderer
+                PATHS
+                        ${LIB_PATHS}
+        )
+
+        add_definitions(-DGLEW_STATIC)
+
+        set(USE_OPENGL True)
+
+        LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../sparrowrenderer/src)
+        LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY})
+endif()
+
+if(USE_INPUT)
+        find_library(SPARROW_INPUT_LIBRARY
+                NAMES
+                        SparrowInput
+                PATHS
+                        ${LIB_PATHS}
+        )
+
+        set(USE_SFML True)
+
+        LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../sparrowinput/src)
+        LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
+endif()
+
 if(USE_SFML)
 	find_library(SFML_LIBRARY_WINDOW
 		NAMES
@@ -110,8 +139,6 @@ if(USE_SFML)
 		PATHS
 			${LIB_PATHS}
 	)
-	
-
 
 	set(USE_OPENGL True)
 	
@@ -134,29 +161,7 @@ if(USE_SFML)
             )
         endif()
 
-        LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_AUDIO} ${SFML_DEPENDENCIES})
-endif()
-
-if(USE_RENDERER)
-	find_library(SPARROW_RENDERER_LIBRARY
-		NAMES
-			SparrowRenderer
-		PATHS
-			${LIB_PATHS}
-	)
-	LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../sparrowrenderer/src)
-	LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY})
-endif()
-	
-if(USE_INPUT)
-	find_library(SPARROW_INPUT_LIBRARY
-		NAMES
-			SparrowInput
-		PATHS
-			${LIB_PATHS}
-	)
-	LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../sparrowinput/src)
-	LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
+        LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_AUDIO} ${SFML_DEPENDENCIES}) # order is VERY important
 endif()
 	
 if(USE_BULLET)
@@ -180,7 +185,7 @@ if(USE_BULLET)
 		PATHS
 			${LIB_PATHS}
 	)
-	LIST(APPEND LIB_DEPENDENCIES_LIST ${BULLET_COLLISION_LIBRARY} ${BULLET_DYNAMICS_LIBRARY} ${LINEAR_MATH_LIBRARY})
+        LIST(APPEND LIB_DEPENDENCIES_LIST ${BULLET_DYNAMICS_LIBRARY} ${BULLET_COLLISION_LIBRARY} ${LINEAR_MATH_LIBRARY})
 	LIST(APPEND INCLUDE_PATHS "\n" ${INCLUDE_ROOT}/bullet)
 endif()