fix: windows build & cleanup stuff

f0e · Nov 4, 2024 · 1df0223 · 1df0223
1 parent 555dc38
commit 1df0223
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,8 +9,6 @@ elseif(UNIX)
 endif()
 
 # Force static runtime on Windows
-set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)
-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 project(blur LANGUAGES CXX)

diff --git a/cmake/c_flag_overrides.cmake b/cmake/c_flag_overrides.cmake
diff --git a/cmake/cxx_flag_overrides.cmake b/cmake/cxx_flag_overrides.cmake
diff --git a/src/common/common_pch.h b/src/common/common_pch.h
@@ -18,21 +18,24 @@
 #include <regex>
 #include <unordered_set>
 
-#ifdef _WIN32
-#	include <conio.h>
-#	include <shobjidl.h>
-#	include <Windows.h>
-#elif defined(__APPLE__)
-#	include <mach-o/dyld.h>
-#endif
-
 // libs
 #include <fmt/format.h>
 #include <fmt/xchar.h>
 #include <nlohmann/json.hpp>
 
 #include <boost/process.hpp>
 #include <boost/asio.hpp>
+#ifdef _WIN32
+#	include <boost/process/v1/windows.hpp>
+#endif
+
+#ifdef _WIN32
+#	include <conio.h>
+#	include <shobjidl.h>
+#	include <Windows.h>
+#elif defined(__APPLE__)
+#	include <mach-o/dyld.h>
+#endif
 
 // blur
 #include "blur.h"

diff --git a/src/gui/console.cpp b/src/gui/console.cpp
@@ -1,13 +1,5 @@
 #include "console.h"
 
-#ifdef _WIN32
-#	include <windows.h>
-#elif defined(__APPLE__) || defined(__linux__)
-#	include <unistd.h>
-#	include <termios.h>
-#	include <sys/ioctl.h>
-#endif
-
 #ifdef _WIN32
 void console::cleanup() {
 	console::close();

diff --git a/src/gui/gui_pch.h b/src/gui/gui_pch.h
@@ -7,7 +7,7 @@
 #include "os/os.h"
 
 #include "os/skia/skia_helpers.h"
-#include "os/skia/skia_surface.h" 
+#include "os/skia/skia_surface.h"
 
 #include "include/core/SkTextBlob.h"
 #include "include/utils/SkTextUtils.h"