Forráskód Böngészése

Merge pull request #1200 from adambeer/minidumpfix

Fix for minidump support
Daniel Buckmaster 10 éve
szülő
commit
3ed6dfb374

+ 3 - 1
Engine/source/platformWin32/minidump/winStackWalker.h

@@ -28,6 +28,8 @@
 #include <windows.h>
 #include <dbghelp.h>
 
+#include "platform/types.h"
+
 class StackWalker
 {
 public:
@@ -99,4 +101,4 @@ private:
 void dGetStackTrace(char * traceBuffer, CONTEXT const & ContextRecord);
 
 #endif
-#endif
+#endif

+ 1 - 1
Tools/projectGenerator/templates/vc2010_lib_proj.tpl

@@ -135,7 +135,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>{foreach item=def from=$projIncludes}{$def};{/foreach}%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>{foreach item=def from=$projDefines}{$def};{/foreach}UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>{foreach item=def from=$projDefines}{$def};{/foreach}UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;TORQUE_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+ 2 - 2
Tools/projectGenerator/templates/vc2k8_lib_proj.tpl

@@ -206,7 +206,7 @@
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="{foreach item=def from=$projIncludes}{$def};{/foreach}"
-				PreprocessorDefinitions="{foreach item=def from=$projDefines}{$def};{/foreach}UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="{foreach item=def from=$projDefines}{$def};{/foreach}UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;TORQUE_RELEASE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="0"
 				StringPooling="true"
@@ -269,4 +269,4 @@
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>