AnvilStats: Fixed Win64 compilation.

AnvilStats: Added cmake directive for larger executable stack.
This fixes runtime "stack overflow" errors caused by large stack-allocated arrays used for decompression.
This fixes runtime "stack overflow" errors caused by large stack-allocated arrays used for decompression.
cuberite
Unified Split

Showing with 24 additions and 1 deletion.

+1 −0 Tools/AnvilStats/.gitignore

+22 −0 Tools/AnvilStats/CMakeLists.txt

+1 −1 Tools/AnvilStats/Utils.cpp
diff --git a/Tools/AnvilStats/.gitignore b/Tools/AnvilStats/.gitignore
@@ -11,3 +11,4 @@ Profiling
 *.png
 world/
 *.html
+*.xls
diff --git a/Tools/AnvilStats/CMakeLists.txt b/Tools/AnvilStats/CMakeLists.txt
@@ -118,5 +118,27 @@ add_executable(AnvilStats
 	${SHARED_OSS_HDR}
 )

+
 target_link_libraries(AnvilStats zlib)

+
+
+
+
+# Under MSVC we need to enlarge the default stack size for the executable:
+if (MSVC)
+	get_target_property(TEMP AnvilStats LINK_FLAGS)
+	if (TEMP STREQUAL "TEMP-NOTFOUND")
+	  SET(TEMP "") # set to empty string
+		message("LINKER_FLAGS not found")
+	else ()
+	  SET(TEMP "${TEMP} ") # a space to cleanly separate from existing content
+		message("LINKER_FLAGS: ${LINKER_FLAGS}")
+	endif ()
+	# append our values
+	SET(TEMP "${TEMP}/STACK:16777216")
+	set_target_properties(AnvilStats PROPERTIES LINK_FLAGS ${TEMP})
+endif ()
+
+
+
diff --git a/Tools/AnvilStats/Utils.cpp b/Tools/AnvilStats/Utils.cpp
@@ -272,7 +272,7 @@ extern const char * GetEntityTypeString(eEntityType a_EntityType)
 int GetNumCores(void)
 {
 	// Get number of cores by querying the system process affinity mask (Windows-specific)
-	DWORD Affinity, ProcAffinity;
+	DWORD_PTR Affinity, ProcAffinity;
 	GetProcessAffinityMask(GetCurrentProcess(), &ProcAffinity, &Affinity);
 	int NumCores = 0;
 	while (Affinity > 0)
@@ @@ -11,3 +11,4 @@ Profiling @@
     *.png
     world/
     *.html
+    *.xls