Skip to content

GitLab

Commit e0b60166 authored by Alexander Neundorf's avatar Alexander Neundorf
Browse files
Options

Some more fixes for nasm support, from Etienne (#10069) 

Alex
parent d25c2eb0
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 17 deletions
Modules/CMakeASM_NASMInformation.cmake
View file @ e0b60166
...@@ -16,27 +16,29 @@ ...@@ -16,27 +16,29 @@
set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm) set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm)
if(WIN32) if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) if(WIN32)
SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64) if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64)
else()
SET(CMAKE_ASM_NASM_OBJECT_FORMAT win32)
endif()
elseif(APPLE)
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho64)
else()
SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho)
endif()
else() else()
SET(CMAKE_ASM_NASM_OBJECT_FORMAT win32) if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
endif() SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf64)
elseif(APPLE) else()
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf)
SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho64) endif()
else()
SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho)
endif()
else()
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf64)
else()
SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf)
endif() endif()
endif() endif()
set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <CMAKE_ASM_NASM_FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
# Load the generic ASMInformation file: # Load the generic ASMInformation file:
set(ASM_DIALECT "_NASM") set(ASM_DIALECT "_NASM")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment