Merge branch 'develop' into modnark

Blocks3D.vcproj

@@ -49,7 +49,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
@@ -82,6 +86,10 @@
 				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
 				SubSystem="2"
 				StackReserveSize="16777216"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -743,10 +751,6 @@
 				RelativePath=".\src\include\ToolEnum.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\versioning.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\VS2005CompatShim.h"
 				>