mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 06:41:41 +00:00
- disable XP toolset warning for 64 bit builds.
- fixed an error with assigning a string constant to a non-const char * variable that was pointed out by compiling with /permissive-.
This commit is contained in:
parent
27b9b67d68
commit
4c4f8288a4
2 changed files with 11 additions and 8 deletions
|
@ -14,15 +14,18 @@ list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
|
|||
include( CreateLaunchers )
|
||||
include( FindPackageHandleStandardArgs )
|
||||
|
||||
# Produce a warning if XP support will be missing.
|
||||
# Produce a warning if XP support will be missing when building a 32 bit target for MSVC.
|
||||
if( MSVC )
|
||||
list( APPEND WINXP_TOOLSETS v140_xp v141_xp)
|
||||
list( FIND WINXP_TOOLSETS "${CMAKE_GENERATOR_TOOLSET}" HAVE_WINXP_SUPPORT)
|
||||
if(NOT "${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
|
||||
|
||||
if( HAVE_WINXP_SUPPORT EQUAL -1 )
|
||||
string( REPLACE ";" " or " WINXP_TOOLSETS_STR "${WINXP_TOOLSETS}" )
|
||||
message( WARNING "This project supports Windows XP but you must set the optional toolset to ${WINXP_TOOLSETS_STR} manually to have it in your build!\n"
|
||||
"Assign toolset's name to CMAKE_GENERATOR_TOOLSET variable or use -T <toolset> from the command prompt." )
|
||||
list( APPEND WINXP_TOOLSETS v140_xp v141_xp)
|
||||
list( FIND WINXP_TOOLSETS "${CMAKE_GENERATOR_TOOLSET}" HAVE_WINXP_SUPPORT)
|
||||
|
||||
if( HAVE_WINXP_SUPPORT EQUAL -1 )
|
||||
string( REPLACE ";" " or " WINXP_TOOLSETS_STR "${WINXP_TOOLSETS}" )
|
||||
message( WARNING "This project supports Windows XP but you must set the optional toolset to ${WINXP_TOOLSETS_STR} manually to have it in your build!\n"
|
||||
"Assign toolset's name to CMAKE_GENERATOR_TOOLSET variable or use -T <toolset> from the command prompt." )
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
@ -3359,7 +3359,7 @@ namespace
|
|||
bool __declspec(thread) DrawerExceptionSetJumpResult;
|
||||
CONTEXT __declspec(thread) DrawerExceptionSetJumpContext;
|
||||
PVOID __declspec(thread) DrawerExceptionHandlerHandle;
|
||||
char __declspec(thread) *DrawerExceptionReason;
|
||||
const char __declspec(thread) *DrawerExceptionReason;
|
||||
bool __declspec(thread) DrawerExceptionFatal;
|
||||
|
||||
LONG WINAPI DrawerExceptionHandler(_EXCEPTION_POINTERS *exceptionInfo)
|
||||
|
|
Loading…
Reference in a new issue