Merge pull request #58 from microsoft/cmakecr

CMake update to fix cases where DIRECTX_ARCH is not defined

Author: chuckw-alt

build/CompilerAndLinker.cmake

@@ -30,6 +30,12 @@ elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64$")
     set(DIRECTX_ARCH arm64)
 elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64EC$")
     set(DIRECTX_ARCH arm64ec)
+elseif(NOT (DEFINED DIRECTX_ARCH))
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "[Aa][Rr][Mm]64|aarch64|arm64")
+        set(DIRECTX_ARCH arm64)
+    else()
+        set(DIRECTX_ARCH x64)
+    endif()
 endif()
 
 #--- Determines host architecture
@@ -44,6 +50,10 @@ if(WIN32)
   list(APPEND COMPILER_DEFINES _UNICODE UNICODE)
 endif()
 
+if(MINGW)
+  list(APPEND LINKER_SWITCHES -municode)
+endif()
+
 #--- General MSVC-like SDL options
 if(MSVC)
     list(APPEND COMPILER_SWITCHES "$<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>")
@@ -66,11 +76,7 @@ else()
 endif()
 
 #--- Target architecture switches
-if(XBOX_CONSOLE_TARGET STREQUAL "scarlett")
-    list(APPEND COMPILER_SWITCHES $<IF:$<CXX_COMPILER_ID:MSVC>,/favor:AMD64 /arch:AVX2,-march=znver2>)
-elseif(XBOX_CONSOLE_TARGET MATCHES "xboxone|durango")
-    list(APPEND COMPILER_SWITCHES  $<IF:$<CXX_COMPILER_ID:MSVC>,/favor:AMD64 /arch:AVX,-march=btver2>)
-elseif(NOT (${DIRECTX_ARCH} MATCHES "^arm"))
+if(NOT (${DIRECTX_ARCH} MATCHES "^arm"))
     if((${DIRECTX_ARCH} STREQUAL "x86") OR (CMAKE_SIZEOF_VOID_P EQUAL 4))
         set(ARCH_SSE2 $<$<CXX_COMPILER_ID:MSVC,Intel>:/arch:SSE2> $<$<NOT:$<CXX_COMPILER_ID:MSVC,Intel>>:-msse2>)
     else()
@@ -104,8 +110,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     endif()
 
     if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.11)
-       AND (OpenMP_CXX_FOUND
-           OR (XBOX_CONSOLE_TARGET STREQUAL "durango")))
+       AND OpenMP_CXX_FOUND)
       # OpenMP in MSVC is not compatible with /permissive- unless you disable two-phase lookup
       list(APPEND COMPILER_SWITCHES /Zc:twoPhase-)
     endif()
@@ -118,21 +123,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
       list(APPEND COMPILER_SWITCHES /JMC-)
     endif()
 
-    if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.20)
-       AND (XBOX_CONSOLE_TARGET STREQUAL "durango"))
-        list(APPEND COMPILER_SWITCHES /d2FH4-)
-        if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-          list(APPEND LINKER_SWITCHES -d2:-FH4-)
-        endif()
-    endif()
-
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
       list(APPEND COMPILER_SWITCHES /ZH:SHA_256)
     endif()
 
-    if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
-       AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
-        list(APPEND COMPILER_SWITCHES /Zc:preprocessor /wd5104 /wd5105)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
+      list(APPEND COMPILER_SWITCHES /Zc:preprocessor /wd5104 /wd5105)
     endif()
 
     if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
@@ -148,62 +144,11 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
       list(APPEND COMPILER_SWITCHES /external:W4)
     endif()
 
-    if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31)
-       AND (XBOX_CONSOLE_TARGET STREQUAL "durango"))
-        list(APPEND COMPILER_SWITCHES /Zc:static_assert-)
-    endif()
-
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)
       if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
         list(APPEND COMPILER_SWITCHES $<$<NOT:$<CONFIG:Debug>>:/Zc:checkGwOdr>)
       endif()
 
-      if(NOT (DEFINED XBOX_CONSOLE_TARGET))
-        list(APPEND COMPILER_SWITCHES $<$<VERSION_GREATER_EQUAL:${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION},10.0.22000>:/Zc:templateScope>)
-      endif()
+      list(APPEND COMPILER_SWITCHES $<$<VERSION_GREATER_EQUAL:${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION},10.0.22000>:/Zc:templateScope>)
     endif()
 endif()
-
-#--- Windows API Family
-include(CheckIncludeFileCXX)
-
-if(DEFINED XBOX_CONSOLE_TARGET)
-    message(STATUS "Building for Xbox Console Target: ${XBOX_CONSOLE_TARGET}")
-    set(CMAKE_REQUIRED_QUIET ON)
-    if(XBOX_CONSOLE_TARGET STREQUAL "durango")
-        CHECK_INCLUDE_FILE_CXX(xdk.h XDKLegacy_HEADER)
-        if(NOT XDKLegacy_HEADER)
-            message(FATAL_ERROR "Legacy Xbox One XDK required to build for Durango.")
-        endif()
-        list(APPEND COMPILER_DEFINES WINAPI_FAMILY=WINAPI_FAMILY_TV_TITLE _XBOX_ONE _TITLE MONOLITHIC=1)
-    else()
-        CHECK_INCLUDE_FILE_CXX(gxdk.h GXDK_HEADER)
-        if(NOT GXDK_HEADER)
-            message(FATAL_ERROR "Microsoft GDK with Xbox Extensions required to build for Xbox. See https://aka.ms/gdkx")
-        endif()
-        list(APPEND COMPILER_DEFINES WINAPI_FAMILY=WINAPI_FAMILY_GAMES)
-        if(XBOX_CONSOLE_TARGET STREQUAL "scarlett")
-            CHECK_INCLUDE_FILE_CXX(d3d12_xs.h D3D12XS_HEADER)
-            if(NOT D3D12XS_HEADER)
-                message(FATAL_ERROR "Microsoft GDK with Xbox Extensions environment needs to be set for Xbox Series X|S.")
-            endif()
-            list(APPEND COMPILER_DEFINES _GAMING_XBOX _GAMING_XBOX_SCARLETT)
-        elseif(XBOX_CONSOLE_TARGET STREQUAL "xboxone")
-            CHECK_INCLUDE_FILE_CXX(d3d12_x.h D3D12X_HEADER)
-            if(NOT D3D12X_HEADER)
-                message(FATAL_ERROR "Microsoft GDK with Xbox Extensions environment needs to be set for Xbox One.")
-            endif()
-            list(APPEND COMPILER_DEFINES _GAMING_XBOX _GAMING_XBOX_XBOXONE)
-        else()
-            message(FATAL_ERROR "Unknown XBOX_CONSOLE_TARGET")
-        endif()
-    endif()
-elseif(WINDOWS_STORE)
-    list(APPEND COMPILER_DEFINES WINAPI_FAMILY=WINAPI_FAMILY_APP)
-endif()
-
-#--- Address Sanitizer switches
-if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    set(ASAN_SWITCHES /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div)
-    set(ASAN_LIBS sancov.lib)
-endif()