Merge branch 'master' into chunksparsing/structs

2014-05-24 12:44:49 +01:00
parent 41692da30c 4f2db03851
commit 4ab8288116
78 changed files with 2341 additions and 1170 deletions
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -131,8 +131,8 @@ endmacro()
 macro(enable_profile)
 	# Declare the flags used for profiling builds:
 	if (MSVC)
-		set (CXX_PROFILING "")
-		set (LNK_PROFILING "/PROFILE")
+		set (CXX_PROFILING "/Zi")
+		set (LNK_PROFILING "/PROFILE /DEBUG")
 	else()
 		set (CXX_PROFILING "-pg")
 		set (LNK_PROFILING "-pg")