From e97d07ce82bec02b72ed832335820a2b8059ae97 Mon Sep 17 00:00:00 2001 From: escherstair Date: Thu, 8 Nov 2018 09:25:48 +0100 Subject: [PATCH 1/3] add clang to pushpack1.h --- include/assimp/Compiler/pushpack1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/Compiler/pushpack1.h b/include/assimp/Compiler/pushpack1.h index 94ee1e474..4c9fbb857 100644 --- a/include/assimp/Compiler/pushpack1.h +++ b/include/assimp/Compiler/pushpack1.h @@ -25,7 +25,7 @@ #if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) # pragma pack(push,1) # define PACK_STRUCT -#elif defined( __GNUC__ ) +#elif defined( __GNUC__ ) || defined(__clang__) # if !defined(HOST_MINGW) # define PACK_STRUCT __attribute__((__packed__)) # else From b47739cfb8190328afd5f0394a35c517e5ad8e94 Mon Sep 17 00:00:00 2001 From: escherstair Date: Thu, 8 Nov 2018 11:47:09 +0100 Subject: [PATCH 2/3] build AppVeyor clang_on_Windows branch --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2b5f212f9..213cbaf75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ clone_folder: c:\projects\assimp branches: # whitelist only: - - master + - clang_on_Windows matrix: fast_finish: true From deb9eb974b09fbb6904aa32657ff2e5a74efb8c8 Mon Sep 17 00:00:00 2001 From: escherstair Date: Thu, 8 Nov 2018 13:40:04 +0100 Subject: [PATCH 3/3] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 213cbaf75..2b5f212f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ clone_folder: c:\projects\assimp branches: # whitelist only: - - clang_on_Windows + - master matrix: fast_finish: true