foerr: Fix Windows build

MSVC doesn't know what an uint is. Add missing includes for consts.hpp where it is typedefed. Don't use designated initializers, as apparently this feature is C++20 and MSVC really doesn't like it. Initialize some random bool variable which causes a runtime error on Windows. Signed-off-by: h67ma <[email protected]>
h67ma · Nov 27, 2023 · 30f5540 · 30f5540
1 parent 80e2b84
commit 30f5540
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/deps/sfml/CMakeLists.txt b/deps/sfml/CMakeLists.txt
@@ -19,4 +19,12 @@ set(SFML_BUILD_TEST_SUITE OFF)
 message(STATUS "Fetching SFML...")
 FetchContent_MakeAvailable(sfml)
 
+if(WIN32)
+	# /EHsc is to somehow mitigate warning C4530 (being treated as an error)
+	target_compile_options(sfml-audio PRIVATE /EHsc)
+	target_compile_options(sfml-graphics PRIVATE /EHsc)
+	target_compile_options(sfml-system PRIVATE /EHsc)
+	target_compile_options(sfml-window PRIVATE /EHsc)
+endif()
+
 # TODO copy openal.dll from sfml-src/extlibs/bin/{x64/x86} to root dir or somehow add it to PATH
diff --git a/src/campaigns/room.cpp b/src/campaigns/room.cpp
@@ -10,6 +10,7 @@
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/Graphics/RenderTexture.hpp>
 
+#include "../consts.hpp"
 #include "../hud/log.hpp"
 #include "../objects/back_obj.hpp"
 #include "../settings/settings_manager.hpp"
@@ -354,7 +355,7 @@ void Room::setupBackHoleObjects(ResourceManager& resMgr, const ObjectManager& ob
 		}
 
 		// both backObjMain and backObjHole are expected to have textures, don't check if they are nullptr
-		this->backHoleObjectsMain.push_back({ .spriteRes = backObjMain, .blend = blend });
+		this->backHoleObjectsMain.push_back({ backObjMain, blend });
 		this->backHoleObjectsHoles.push_back(backObjHole);
 	}
 }

diff --git a/src/campaigns/room_cell.hpp b/src/campaigns/room_cell.hpp
@@ -10,6 +10,7 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Transformable.hpp>
 
+#include "../consts.hpp"
 #include "../materials/material_manager.hpp"
 #include "../resources/resource_manager.hpp"
 #include "../resources/sprite_resource.hpp"

diff --git a/src/hud/log.hpp b/src/hud/log.hpp
@@ -15,6 +15,7 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/System/Clock.hpp>
 
+#include "../consts.hpp"
 #include "../hud/hud.hpp"
 #include "../settings/settings_manager.hpp"
 #include "../util/util.hpp"

diff --git a/src/hud/sliders/slider_handle.hpp b/src/hud/sliders/slider_handle.hpp
@@ -9,6 +9,7 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Transformable.hpp>
 
+#include "../../consts.hpp"
 #include "../configurable_gui_component.hpp"
 
 constexpr float SLIDER_HANDLE_HEIGHT = 15;

diff --git a/src/hud/text_label.hpp b/src/hud/text_label.hpp
@@ -9,6 +9,7 @@
 #include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/Text.hpp>
 
+#include "../consts.hpp"
 #include "configurable_gui_component.hpp"
 
 /**

diff --git a/src/materials/material_manager.cpp b/src/materials/material_manager.cpp
@@ -72,7 +72,7 @@ bool MaterialManager::loadMap(const nlohmann::json& root, std::unordered_map<cha
 			maskTexturePath = pathCombine(PATH_TEXT_CELLS, maskTexturePath + ".png");
 		}
 
-		bool matIsRight;
+		bool matIsRight = false;
 		if (matType == MAT_LADDER || matType == MAT_STAIRS)
 		{
 			if (!parseJsonKey<bool>(matNode.value(), std::string(PATH_MATERIALS), FOERR_JSON_KEY_IS_RIGHT, matIsRight))
@@ -93,14 +93,14 @@ bool MaterialManager::loadMap(const nlohmann::json& root, std::unordered_map<cha
 		color.loadFromColorString(colorString);
 		color.a = LIQUID_OPACITY;
 
-		theMap.emplace(matSymbol, material { .type = matType,
-											 .texturePath = texturePath,
-											 .textureDelimPath = textureDelimPath,
-											 .maskTexturePath = maskTexturePath,
-											 .isRight = matIsRight,
-											 .offsetLeft = offsetLeft,
-											 .delimOffset = delimOffset,
-											 .color = color });
+		theMap.emplace(matSymbol, material { matType,
+											 texturePath,
+											 textureDelimPath,
+											 maskTexturePath,
+											 matIsRight,
+											 offsetLeft,
+											 delimOffset,
+											 color });
 	}
 
 	return true;

diff --git a/src/util/util.hpp b/src/util/util.hpp
@@ -9,6 +9,8 @@
 
 #include <SFML/System/Vector2.hpp>
 
+#include "../consts.hpp"
+
 #define STR(thing) #thing
 #define STR_EXP(thing) STR(thing) // "the double expansion trick"