Mercurial > pub > dyncall > dyncall
changeset 31:6e7b1b7ad9d3
Fixed failing builds when the compiler is ICC/ICPC
| author | Snaipe <franklinmathieu@gmail.com> |
|---|---|
| date | Fri, 27 Nov 2015 00:04:24 +0100 |
| parents | c16bc7736bb4 |
| children | f533c5ad1b6e |
| files | CMakeLists.txt dyncall/dyncall_macros.h |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Sat Nov 21 16:16:26 2015 +0100 +++ b/CMakeLists.txt Fri Nov 27 00:04:24 2015 +0100 @@ -46,7 +46,7 @@ #set(CMAKE_ASM_COMPILER_ARG1 "/c") #set(CMAKE_ASM_MASM_SOURCE_FILE_EXTENSIONS asm) #set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> <FLAGS> /c /Fo <OBJECT> <SOURCE>") -elseif(CMAKE_COMPILER_IS_GNUCC) +elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Intel") # when used in shared libraries, -fPIC is required by several architectures # and platforms (observed on AMD64, Solaris/Sparc). # we enable it per default here.
--- a/dyncall/dyncall_macros.h Sat Nov 21 16:16:26 2015 +0100 +++ b/dyncall/dyncall_macros.h Fri Nov 27 00:04:24 2015 +0100 @@ -169,10 +169,10 @@ /* Architecture. */ /* Check architecture. */ -#if defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(__386__) || defined(__i386) +#if defined(_M_X64_) || defined(_M_AMD64) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) +# define DC__Arch_AMD64 +#elif defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(__386__) || defined(__i386) # define DC__Arch_Intel_x86 -#elif defined(_M_X64_) || defined(_M_AMD64) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) -# define DC__Arch_AMD64 #elif defined(_M_IA64) || defined(__ia64__) # define DC__Arch_Itanium #elif defined(_M_PPC) || defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__) || defined(__ppc__) || defined(__power__)