Skip to content
Permalink
Browse files

- 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-.
  • Loading branch information...
coelckers committed Mar 25, 2018
1 parent 27b9b67 commit 4c4f8288a48d2ac0deea935c86140078ac7a78c4
Showing with 11 additions and 8 deletions.
  1. +10 −7 CMakeLists.txt
  2. +1 −1 src/win32/i_crash.cpp
@@ -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)

0 comments on commit 4c4f828

Please sign in to comment.
You can’t perform that action at this time.