diff --git a/CMakeLists.txt b/CMakeLists.txt index c15455c..9125f4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,6 +176,7 @@ elseif(MSVC) add_compile_options(/wd4714) # 'function' marked as __forceinline not inlined add_compile_options(/wd4996) # 'function': was declared deprecated add_compile_options(/wd4068) # unknown pragma + add_compile_options(/wd4458) # declaration of 'bla' hides class member add_definitions(-D_ALLOW_KEYWORD_MACROS) # because of the "#define private public" and "#define protected public" in TypeInfo.cpp set(CMAKE_C_FLAGS_DEBUG "-D_DEBUG /Od /Zi /MDd") set(CMAKE_C_FLAGS_RELEASE "/Ox /Oy /MD") diff --git a/framework/File.h b/framework/File.h index fd55e50..4454b1f 100644 --- a/framework/File.h +++ b/framework/File.h @@ -35,7 +35,11 @@ If you have questions concerning this license or the applicable additional terms //#include "framework/Unzip.h" // DG: instead of getting ZPOS64_T from some zlib header (via Unzip.h) // just define it here +#ifdef _WIN32 +typedef unsigned __int64 ZPOS64_T; +#else typedef uint64_t ZPOS64_T; +#endif /* ============================================================== diff --git a/sys/Stub_SDL_endian.h b/sys/Stub_SDL_endian.h index a268481..0a1743a 100644 --- a/sys/Stub_SDL_endian.h +++ b/sys/Stub_SDL_endian.h @@ -73,6 +73,8 @@ typedef uint64_t Uint64; #endif #endif /* SDL_FORCE_INLINE not defined */ +#define SDL_static_cast(type, val) (type)(val) + #if defined(__GNUC__) && defined(__i386__) && \ !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) SDL_FORCE_INLINE Uint16