From: Andarwinux Date: Thu, 7 Mar 2024 00:00:00 +0000 (+0000) Subject: loader: allow GAS on MinGW X-Git-Tag: upstream/1.3.296~93 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc7a7c092fb1be1ac222bd641a41b51bc6d904f8;p=platform%2Fupstream%2FVulkan-Loader.git loader: allow GAS on MinGW Disabled by default, user must explicitly enable USE_GAS. --- diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 96e86ef6..fba0fabf 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -129,7 +129,7 @@ set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} extensions will suffer from a corrupted if (APPLE_UNIVERSAL_BINARY) set(USE_ASSEMBLY_FALLBACK ON) -elseif(WIN32) +elseif(WIN32 AND NOT USE_GAS) option(USE_MASM "Use MASM" ON) if(USE_MASM AND MINGW) find_program(JWASM_FOUND NAMES jwasm uasm) @@ -215,7 +215,7 @@ end set(USE_ASSEMBLY_FALLBACK ON) message(WARNING "Could not find working MASM assembler\n${ASM_FAILURE_MSG}") endif() -elseif(UNIX) # i.e.: Linux & Apple +elseif(UNIX OR MINGW) # i.e.: Linux & Apple & MinGW option(USE_GAS "Use GAS" ON) if(USE_GAS)