dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-21 20:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

It builds with VS 2017 now

Browse source
This commit is contained in:
Daniel Gibson 2018-09-02 00:55:08 +02:00
parent 0e94dc21a3
commit 02417dcecf
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -176,6 +176,7 @@ elseif(MSVC)
add_compile_options(/wd4714) # 'function' marked as __forceinline not inlined add_compile_options(/wd4714) # 'function' marked as __forceinline not inlined
add_compile_options(/wd4996) # 'function': was declared deprecated add_compile_options(/wd4996) # 'function': was declared deprecated
add_compile_options(/wd4068) # unknown pragma 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 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_DEBUG "-D_DEBUG /Od /Zi /MDd")
set(CMAKE_C_FLAGS_RELEASE "/Ox /Oy /MD") set(CMAKE_C_FLAGS_RELEASE "/Ox /Oy /MD")

4
framework/File.h
View file

@ -35,7 +35,11 @@ If you have questions concerning this license or the applicable additional terms
//#include "framework/Unzip.h" //#include "framework/Unzip.h"
// DG: instead of getting ZPOS64_T from some zlib header (via Unzip.h) // DG: instead of getting ZPOS64_T from some zlib header (via Unzip.h)
// just define it here // just define it here
#ifdef _WIN32
typedef unsigned __int64 ZPOS64_T;
#else
typedef uint64_t ZPOS64_T; typedef uint64_t ZPOS64_T;
#endif
/* /*
============================================================== ==============================================================

2
sys/Stub_SDL_endian.h
View file

@ -73,6 +73,8 @@ typedef uint64_t Uint64;
#endif #endif
#endif /* SDL_FORCE_INLINE not defined */ #endif /* SDL_FORCE_INLINE not defined */
#define SDL_static_cast(type, val) (type)(val)
#if defined(__GNUC__) && defined(__i386__) && \ #if defined(__GNUC__) && defined(__i386__) && \
!(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
SDL_FORCE_INLINE Uint16 SDL_FORCE_INLINE Uint16