Browse Source

windows: Fix build on case sensitive filesystem

pull/18/head
Michal Suchanek 5 months ago
committed by Mark Roszko
parent
commit
ca54db2db4
  1. 2
      common/common.cpp
  2. 2
      common/dialogs/panel_printer_list.cpp
  3. 2
      common/gal/cairo/cairo_print.cpp
  4. 4
      libs/kiplatform/CMakeLists.txt
  5. 2
      libs/kiplatform/os/windows/app.cpp
  6. 6
      libs/kiplatform/os/windows/environment.cpp
  7. 4
      libs/kiplatform/os/windows/sysinfo.cpp
  8. 2
      thirdparty/3dxware_sdk/src/navlib_stub.c

2
common/common.cpp

@ -40,7 +40,7 @@
#include <wx/regex.h> #include <wx/regex.h>
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h>
#include <windows.h>
#endif #endif

2
common/dialogs/panel_printer_list.cpp

@ -28,7 +28,7 @@
//#define CUPS_LIST_PRINTERS //#define CUPS_LIST_PRINTERS
#ifdef __WXMSW__ #ifdef __WXMSW__
#include <Windows.h>
#include <windows.h>
#elif defined( CUPS_LIST_PRINTERS ) #elif defined( CUPS_LIST_PRINTERS )
#include <cups/cups.h> #include <cups/cups.h>
#endif #endif

2
common/gal/cairo/cairo_print.cpp

@ -35,7 +35,7 @@ using std::min;
#ifdef __WXMSW__ #ifdef __WXMSW__
#include <windows.h> #include <windows.h>
#include <ObjIdl.h>
#include <objidl.h>
#include <gdiplus.h> #include <gdiplus.h>
#include <cairo-win32.h> #include <cairo-win32.h>
#include <wx/msw/enhmeta.h> #include <wx/msw/enhmeta.h>

4
libs/kiplatform/CMakeLists.txt

@ -71,10 +71,10 @@ elseif( WIN32 )
) )
set( PLATFORM_LIBS set( PLATFORM_LIBS
"Shlwapi"
"shlwapi"
"winhttp" "winhttp"
"wintrust" "wintrust"
"Imm32"
"imm32"
) )
elseif( UNIX ) elseif( UNIX )
list( APPEND PLATFORM_SRCS list( APPEND PLATFORM_SRCS

2
libs/kiplatform/os/windows/app.cpp

@ -27,7 +27,7 @@
#include <windows.h> #include <windows.h>
#include <strsafe.h> #include <strsafe.h>
#include <config.h> #include <config.h>
#include <VersionHelpers.h>
#include <versionhelpers.h>
#include <iostream> #include <iostream>
#include <cstdio> #include <cstdio>

6
libs/kiplatform/os/windows/environment.cpp

@ -27,7 +27,7 @@
#include <wx/app.h> #include <wx/app.h>
#include <wx/uri.h> #include <wx/uri.h>
#include <Windows.h>
#include <windows.h>
#include <shellapi.h> #include <shellapi.h>
#include <shlwapi.h> #include <shlwapi.h>
#if defined( __MINGW32__ ) #if defined( __MINGW32__ )
@ -37,7 +37,7 @@
#endif #endif
#include <winhttp.h> #include <winhttp.h>
#include <Softpub.h>
#include <softpub.h>
#include <wincrypt.h> #include <wincrypt.h>
#include <wintrust.h> #include <wintrust.h>
@ -416,4 +416,4 @@ wxString KIPLATFORM::ENV::GetAppUserModelId()
// the other limitation is 127 characters but we arent trying to hit that limit yet // the other limitation is 127 characters but we arent trying to hit that limit yet
return modelId; return modelId;
}
}

4
libs/kiplatform/os/windows/sysinfo.cpp

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <Wbemidl.h>
#include <wbemidl.h>
#include <cstdio> #include <cstdio>
#define _WIN32_DCOM #define _WIN32_DCOM
#include <comdef.h> #include <comdef.h>
@ -547,4 +547,4 @@ void SYSINFO::variantToString( const LPVARIANT aVar, std::string& aReturnString
} }
} }
} // namespace KIPLATFORM
} // namespace KIPLATFORM

2
thirdparty/3dxware_sdk/src/navlib_stub.c

@ -32,7 +32,7 @@
#if _WIN32 #if _WIN32
/* windows */ /* windows */
#include <Windows.h>
#include <windows.h>
#include <errno.h> #include <errno.h>
#elif __APPLE__ #elif __APPLE__
#include <dlfcn.h> #include <dlfcn.h>

Loading…
Cancel
Save