From ca54db2db43dea0fa8a03f2742afbae9c33a664b Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sat, 10 May 2025 23:38:58 +0200 Subject: [PATCH] windows: Fix build on case sensitive filesystem --- common/common.cpp | 2 +- common/dialogs/panel_printer_list.cpp | 2 +- common/gal/cairo/cairo_print.cpp | 2 +- libs/kiplatform/CMakeLists.txt | 4 ++-- libs/kiplatform/os/windows/app.cpp | 2 +- libs/kiplatform/os/windows/environment.cpp | 6 +++--- libs/kiplatform/os/windows/sysinfo.cpp | 4 ++-- thirdparty/3dxware_sdk/src/navlib_stub.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/common.cpp b/common/common.cpp index c59ef8e68e..c7d9dad2bd 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -40,7 +40,7 @@ #include #ifdef _WIN32 -#include +#include #endif diff --git a/common/dialogs/panel_printer_list.cpp b/common/dialogs/panel_printer_list.cpp index 5c4f6d3408..555913e9ec 100644 --- a/common/dialogs/panel_printer_list.cpp +++ b/common/dialogs/panel_printer_list.cpp @@ -28,7 +28,7 @@ //#define CUPS_LIST_PRINTERS #ifdef __WXMSW__ - #include + #include #elif defined( CUPS_LIST_PRINTERS ) #include #endif diff --git a/common/gal/cairo/cairo_print.cpp b/common/gal/cairo/cairo_print.cpp index e2501c4b59..e5a598c9a2 100644 --- a/common/gal/cairo/cairo_print.cpp +++ b/common/gal/cairo/cairo_print.cpp @@ -35,7 +35,7 @@ using std::min; #ifdef __WXMSW__ #include -#include +#include #include #include #include diff --git a/libs/kiplatform/CMakeLists.txt b/libs/kiplatform/CMakeLists.txt index 29b4ce767d..a382d882e4 100644 --- a/libs/kiplatform/CMakeLists.txt +++ b/libs/kiplatform/CMakeLists.txt @@ -71,10 +71,10 @@ elseif( WIN32 ) ) set( PLATFORM_LIBS - "Shlwapi" + "shlwapi" "winhttp" "wintrust" - "Imm32" + "imm32" ) elseif( UNIX ) list( APPEND PLATFORM_SRCS diff --git a/libs/kiplatform/os/windows/app.cpp b/libs/kiplatform/os/windows/app.cpp index 279c0238d1..ac8af85d3f 100644 --- a/libs/kiplatform/os/windows/app.cpp +++ b/libs/kiplatform/os/windows/app.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/libs/kiplatform/os/windows/environment.cpp b/libs/kiplatform/os/windows/environment.cpp index 9925fe5d1a..fbaaa41ebe 100644 --- a/libs/kiplatform/os/windows/environment.cpp +++ b/libs/kiplatform/os/windows/environment.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #if defined( __MINGW32__ ) @@ -37,7 +37,7 @@ #endif #include -#include +#include #include #include @@ -416,4 +416,4 @@ wxString KIPLATFORM::ENV::GetAppUserModelId() // the other limitation is 127 characters but we arent trying to hit that limit yet return modelId; -} \ No newline at end of file +} diff --git a/libs/kiplatform/os/windows/sysinfo.cpp b/libs/kiplatform/os/windows/sysinfo.cpp index c9a5bb93f0..3b702de5f2 100644 --- a/libs/kiplatform/os/windows/sysinfo.cpp +++ b/libs/kiplatform/os/windows/sysinfo.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #define _WIN32_DCOM #include @@ -547,4 +547,4 @@ void SYSINFO::variantToString( const LPVARIANT aVar, std::string& aReturnString } } -} // namespace KIPLATFORM \ No newline at end of file +} // namespace KIPLATFORM diff --git a/thirdparty/3dxware_sdk/src/navlib_stub.c b/thirdparty/3dxware_sdk/src/navlib_stub.c index e24b1be456..5b76cf998f 100644 --- a/thirdparty/3dxware_sdk/src/navlib_stub.c +++ b/thirdparty/3dxware_sdk/src/navlib_stub.c @@ -32,7 +32,7 @@ #if _WIN32 /* windows */ -#include +#include #include #elif __APPLE__ #include