From b5f69e3734bc3c73915b1d146037851dcc3392dd Mon Sep 17 00:00:00 2001 From: mkuritsu Date: Wed, 31 Jul 2024 21:11:23 +0100 Subject: [PATCH] Added ADD condition in poly2tri dll_symbol.h to only define macros for dynamic library linking if assimp is ordered to build as DLL --- contrib/poly2tri/poly2tri/common/dll_symbol.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/poly2tri/poly2tri/common/dll_symbol.h b/contrib/poly2tri/poly2tri/common/dll_symbol.h index 72ed5a75f..394911ef6 100644 --- a/contrib/poly2tri/poly2tri/common/dll_symbol.h +++ b/contrib/poly2tri/poly2tri/common/dll_symbol.h @@ -31,11 +31,11 @@ #pragma once -#if defined(_WIN32) +#if defined(_WIN32) && defined(ASSIMP_BUILD_DLL_EXPORT) # pragma warning( disable: 4273) # define P2T_COMPILER_DLLEXPORT __declspec(dllexport) # define P2T_COMPILER_DLLIMPORT __declspec(dllimport) -#elif defined(__GNUC__) +#elif defined(__GNUC__) && defined(ASSIMP_BUILD_DLL_EXPORT) # define P2T_COMPILER_DLLEXPORT __attribute__ ((visibility ("default"))) # define P2T_COMPILER_DLLIMPORT __attribute__ ((visibility ("default"))) #else