Fixed windows compile errors

goossens · Feb 14, 2025 · 435ede4 · 435ede4
1 parent 7d22881
commit 435ede4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/deps/lunasvg/CMakeLists.txt b/deps/lunasvg/CMakeLists.txt
@@ -12,6 +12,7 @@ file(GLOB LUNASVG_SOURCES
 	${lunasvg_SOURCE_DIR}/source/*.cpp)
 
 add_library(lunasvg STATIC ${LUNASVG_SOURCES})
+target_compile_definitions(lunasvg PUBLIC LUNASVG_BUILD_STATIC)
 target_include_directories(lunasvg PUBLIC ${lunasvg_SOURCE_DIR}/include)
 target_link_libraries(lunasvg PUBLIC plutovg)
 

diff --git a/deps/plutovg/CMakeLists.txt b/deps/plutovg/CMakeLists.txt
@@ -11,6 +11,7 @@ file(GLOB PLUTOVG_SOURCES
 	${plutovg_SOURCE_DIR}/source/*.c)
 
 add_library(plutovg STATIC ${PLUTOVG_SOURCES})
+target_compile_definitions(plutovg PUBLIC "PLUTOVG_BUILD_STATIC")
 target_include_directories(plutovg PUBLIC ${plutovg_SOURCE_DIR}/include)
 
 set_target_properties(plutovg PROPERTIES FOLDER "deps")
diff --git a/gfx/framework/OtFramework.cpp b/gfx/framework/OtFramework.cpp
@@ -16,7 +16,11 @@
 #include <vector>
 
 #if _WIN32
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#undef APIENTRY
 #include <windows.h>
+#include <shellapi.h>
 
 #else
 #include <stdlib.h>
@@ -237,7 +241,6 @@ void OtFramework::setAntiAliasing(int aa) {
 	// MacOS version is in OtMacos.mm as it requires Objective-C
 
 #else
-
 void OtFramework::openURL(const std::string& url) {
 #if _WIN32
 	WCHAR *temp = new WCHAR[url.size() + 1];
@@ -247,8 +250,9 @@ void OtFramework::openURL(const std::string& url) {
 
 #else
 #include <stdlib.h>
-	std::string op = std::string("xdg-open '").append(url).append("'");
-	return system(op.c_str()) == 0;
+
+	std::string command = std::string("xdg-open '").append(url).append("'");
+	system(command.c_str());
 #endif
 }