From f97dce199cbf8ffc5ce6563d7eeba4a74a9917c0 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Wed, 7 Dec 2022 13:42:56 -0600 Subject: [PATCH] change windows archtecture logic assume win64 by default, it's not 2012 anymore --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b40b4e441..a9428a2d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,10 +102,10 @@ endif() # Automatically detect architecture based on Visual Studio generator if(MSVC AND NOT DEFINED DFHACK_BUILD_ARCH) - if(${CMAKE_GENERATOR} MATCHES "Win64") - set(DFHACK_BUILD_ARCH "64") - else() + if ( (${CMAKE_GENERATOR} MATCHES "Win32") OR (${CMAKE_GENERATOR} MATCHES "x86")) set(DFHACK_BUILD_ARCH "32") + else() + set(DFHACK_BUILD_ARCH "64") endif() else() set(DFHACK_BUILD_ARCH "64" CACHE STRING "Architecture to build ('32' or '64')")