Merge branch 'develop' of https://github.com/runrev/livecode into develop

runrevmark · runrevmark · commit da905815dbbf · 2013-09-11T15:18:52.000+01:00
diff --git a/rules/Global.vsprops b/rules/Global.vsprops
@@ -9,7 +9,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(SolutionDir)engine\include&quot;;&quot;$(SolutionDir)libexternal\include&quot;;&quot;$(SolutionDir)libcore\include&quot;;&quot;$(SolutionDir)thirdparty\libjpeg\include&quot;;&quot;$(SolutionDir)thirdparty\libpng\include&quot;;&quot;$(SolutionDir)thirdparty\libgif\include&quot;;&quot;$(SolutionDir)thirdparty\libpcre\include&quot;;&quot;$(SolutionDir)thirdparty\libz\include&quot;;&quot;$(SolutionDir)thirdparty\libzip\include&quot;;&quot;$(SolutionDir)thirdparty\libpq\include&quot;;&quot;$(SolutionDir)thirdparty\libsqlite\include&quot;;&quot;$(SolutionDir)thirdparty\libmysql\include&quot;;&quot;$(SolutionDir)thirdparty\libxml\include&quot;;&quot;$(SolutionDir)libexternalv1\include&quot;;&quot;$(SolutionDir)thirdparty\libopenssl\include&quot;"
+		AdditionalIncludeDirectories="&quot;$(SolutionDir)engine\include&quot;;&quot;$(SolutionDir)libexternal\include&quot;;&quot;$(SolutionDir)libcore\include&quot;;&quot;$(SolutionDir)thirdparty\libjpeg\include&quot;;&quot;$(SolutionDir)thirdparty\libpng\include&quot;;&quot;$(SolutionDir)thirdparty\libgif\include&quot;;&quot;$(SolutionDir)thirdparty\libpcre\include&quot;;&quot;$(SolutionDir)thirdparty\libz\include&quot;;&quot;$(SolutionDir)thirdparty\libzip\include&quot;;&quot;$(SolutionDir)thirdparty\libpq\include&quot;;&quot;$(SolutionDir)thirdparty\libsqlite\include&quot;;&quot;$(SolutionDir)thirdparty\libmysql\include&quot;;&quot;$(SolutionDir)thirdparty\libxml\include&quot;;&quot;$(SolutionDir)thirdparty\libxslt\include&quot;;&quot;$(SolutionDir)libexternalv1\include&quot;;&quot;$(SolutionDir)thirdparty\libopenssl\include&quot;"
 		PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_DISABLE_PERFCRIT_LOCKS;_WINDOWS;WIN32;TARGET_PLATFORM_WINDOWS;__LITTLE_ENDIAN__"
 		ExceptionHandling="0"
 		BufferSecurityCheck="false"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`>`
`10`	`10`	`<Tool`
`11`	`11`	`Name="VCCLCompilerTool"`
`12`		- AdditionalIncludeDirectories=""$(SolutionDir)engine\include";"$(SolutionDir)libexternal\include";"$(SolutionDir)libcore\include";"$(SolutionDir)thirdparty\libjpeg\include";"$(SolutionDir)thirdparty\libpng\include";"$(SolutionDir)thirdparty\libgif\include";"$(SolutionDir)thirdparty\libpcre\include";"$(SolutionDir)thirdparty\libz\include";"$(SolutionDir)thirdparty\libzip\include";"$(SolutionDir)thirdparty\libpq\include";"$(SolutionDir)thirdparty\libsqlite\include";"$(SolutionDir)thirdparty\libmysql\include";"$(SolutionDir)thirdparty\libxml\include";"$(SolutionDir)libexternalv1\include";"$(SolutionDir)thirdparty\libopenssl\include""
	`12`	+ AdditionalIncludeDirectories=""$(SolutionDir)engine\include";"$(SolutionDir)libexternal\include";"$(SolutionDir)libcore\include";"$(SolutionDir)thirdparty\libjpeg\include";"$(SolutionDir)thirdparty\libpng\include";"$(SolutionDir)thirdparty\libgif\include";"$(SolutionDir)thirdparty\libpcre\include";"$(SolutionDir)thirdparty\libz\include";"$(SolutionDir)thirdparty\libzip\include";"$(SolutionDir)thirdparty\libpq\include";"$(SolutionDir)thirdparty\libsqlite\include";"$(SolutionDir)thirdparty\libmysql\include";"$(SolutionDir)thirdparty\libxml\include";"$(SolutionDir)thirdparty\libxslt\include";"$(SolutionDir)libexternalv1\include";"$(SolutionDir)thirdparty\libopenssl\include""
`13`	`13`	`PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_DISABLE_PERFCRIT_LOCKS;_WINDOWS;WIN32;TARGET_PLATFORM_WINDOWS;__LITTLE_ENDIAN__"`
`14`	`14`	`ExceptionHandling="0"`
`15`	`15`	`BufferSecurityCheck="false"`