Merge branch 'master' of https://github.com/BearishSun/BansheeEngine

Source/BansheeUtility/CMakeSources.cmake

@@ -22,7 +22,6 @@ set(BS_BANSHEEUTILITY_INC_PREREQUISITES
 set(BS_BANSHEEUTILITY_SRC_WIN32
 	"Source/Win32/BsWin32FileSystem.cpp"
 	"Source/Win32/BsWin32CrashHandler.cpp"
-	"Source/Win32/BsWin32Timer.cpp"
 	"Source/Win32/BsWin32PlatformUtility.cpp"
 	"Source/Win32/BsWin32Window.cpp"
 )
@@ -47,6 +46,7 @@ set(BS_BANSHEEUTILITY_SRC_GENERAL
 	"Source/BsDynLib.cpp"
 	"Source/BsDynLibManager.cpp"
 	"Source/BsMessageHandler.cpp"
+	"Source/BsTimer.cpp"
 	"Source/BsTime.cpp"
 	"Source/BsUtil.cpp"
 )
@@ -300,4 +300,4 @@ set(BS_BANSHEEUTILITY_SRC
 	${BS_BANSHEEUTILITY_SRC_STRING}
 	${BS_BANSHEEUTILITY_INC_REFLECTION}
 	${BS_BANSHEEUTILITY_INC_WIN32}
-)
+)

Source/CMakeLists.txt

@@ -53,13 +53,20 @@ if(MSVC)
 	set(CMAKE_CXX_FLAGS_OPTIMIZEDDEBUG "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /Zi /Gm /O2 /Oi /MD")
 	set(CMAKE_CXX_FLAGS_RELEASE "${BS_COMPILER_FLAGS_COMMON} /GL /Gy /O2 /Oi /MD /MP")
 	
-elseif(CLANG) # Note: CLANG not defined anywhere yet
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	# Note: Optionally add -ffunction-sections, -fdata-sections, but with linker option --gc-sections
 	set(BS_COMPILER_FLAGS_COMMON "-fpic -fno-exceptions -fno-strict-aliasing -fno-rtti -fno-ms-compatibility -fms-extensions")
 	
 	set(CMAKE_CXX_FLAGS_DEBUG "${BS_COMPILER_FLAGS_COMMON} -g -O0")
 	set(CMAKE_CXX_FLAGS_OPTIMIZEDDEBUG "${BS_COMPILER_FLAGS_COMMON} -gline-tables-only -O2")
 	set(CMAKE_CXX_FLAGS_RELEASE "${BS_COMPILER_FLAGS_COMMON} -g0 -O2")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	set(BS_COMPILER_FLAGS_COMMON "-fpic -fno-exceptions -fno-strict-aliasing -fno-rtti")
+	
+	set(CMAKE_CXX_FLAGS_DEBUG "${BS_COMPILER_FLAGS_COMMON} -g -O0")
+	set(CMAKE_CXX_FLAGS_OPTIMIZEDDEBUG "${BS_COMPILER_FLAGS_COMMON} -gline-tables-only -O2")
+	set(CMAKE_CXX_FLAGS_RELEASE "${BS_COMPILER_FLAGS_COMMON} -g0 -O2")
+
 else()
 # TODO_OTHER_COMPILERS_GO_HERE
 endif()
@@ -158,4 +165,4 @@ if(MSVC)
 	set_property(TARGET MBansheeEditor PROPERTY FOLDER Script)
 else()
 # TODO - Use Mono compiler to build the managed code as a pre-build step
-endif()
+endif()