diff --git a/Windows_Libs/Dev/Input/Input.vcxproj b/Windows_Libs/Dev/Input/Input.vcxproj index eaeadb4..3188e2b 100644 --- a/Windows_Libs/Dev/Input/Input.vcxproj +++ b/Windows_Libs/Dev/Input/Input.vcxproj @@ -43,7 +43,7 @@ StaticLibrary true - v145 + v110 Unicode @@ -123,6 +123,8 @@ stdafx.h true MultiThreadedDebug + Default + true diff --git a/Windows_Libs/Dev/Profile/Profile.vcxproj b/Windows_Libs/Dev/Profile/Profile.vcxproj index 775ca23..ec99799 100644 --- a/Windows_Libs/Dev/Profile/Profile.vcxproj +++ b/Windows_Libs/Dev/Profile/Profile.vcxproj @@ -43,7 +43,7 @@ StaticLibrary true - v145 + v110 Unicode @@ -123,6 +123,8 @@ true stdafx.h MultiThreadedDebug + Default + true diff --git a/Windows_Libs/Dev/Render/Render.vcxproj b/Windows_Libs/Dev/Render/Render.vcxproj index 69081ab..d6a3346 100644 --- a/Windows_Libs/Dev/Render/Render.vcxproj +++ b/Windows_Libs/Dev/Render/Render.vcxproj @@ -43,7 +43,7 @@ StaticLibrary true - v145 + v110 Unicode @@ -124,6 +124,8 @@ stdafx.h MultiThreadedDebug libpng\;zlib\;%(AdditionalIncludeDirectories) + Default + true diff --git a/Windows_Libs/Dev/Render/RendererCore.cpp b/Windows_Libs/Dev/Render/RendererCore.cpp index 4b2a78d..37bd2ae 100644 --- a/Windows_Libs/Dev/Render/RendererCore.cpp +++ b/Windows_Libs/Dev/Render/RendererCore.cpp @@ -704,7 +704,7 @@ void Renderer::UpdateGamma(unsigned short) {} Renderer::Context &Renderer::getContext() { - return *static_cast(TlsGetValue(Renderer::tlsIdx)); + return *reinterpret_cast(TlsGetValue(Renderer::tlsIdx)); } void Renderer::CaptureThumbnail(ImageFileBuffer *pngOut) diff --git a/Windows_Libs/Dev/Render/libpng/pnglibconf.h b/Windows_Libs/Dev/Render/libpng/pnglibconf.h index 45345bb..d616b57 100644 --- a/Windows_Libs/Dev/Render/libpng/pnglibconf.h +++ b/Windows_Libs/Dev/Render/libpng/pnglibconf.h @@ -27,7 +27,7 @@ #define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED #define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_COLORSPACE_SUPPORTED -#define PNG_CONSOLE_IO_SUPPORTED +//#define PNG_CONSOLE_IO_SUPPORTED #define PNG_CONVERT_tIME_SUPPORTED #define PNG_EASY_ACCESS_SUPPORTED /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ diff --git a/Windows_Libs/Dev/Render/zlib/zconf.h b/Windows_Libs/Dev/Render/zlib/zconf.h index 828ca61..40c02e7 100644 --- a/Windows_Libs/Dev/Render/zlib/zconf.h +++ b/Windows_Libs/Dev/Render/zlib/zconf.h @@ -8,6 +8,8 @@ #ifndef ZCONF_H #define ZCONF_H +#define NO_snprintf + /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. diff --git a/Windows_Libs/Dev/Storage/Storage.vcxproj b/Windows_Libs/Dev/Storage/Storage.vcxproj index aacabbe..6f3032a 100644 --- a/Windows_Libs/Dev/Storage/Storage.vcxproj +++ b/Windows_Libs/Dev/Storage/Storage.vcxproj @@ -42,7 +42,7 @@ StaticLibrary true - v145 + v110 Unicode @@ -122,6 +122,8 @@ true stdafx.h MultiThreadedDebug + Default + true