From d41b6b253d215a003ed6cfd7db197dbe7e7e8206 Mon Sep 17 00:00:00 2001 From: mkuritsu <92603490+mkuritsu@users.noreply.github.com> Date: Tue, 13 Aug 2024 08:39:53 +0100 Subject: [PATCH] =?UTF-8?q?Added=20AND=20condition=20in=20poly2tri=20dll?= =?UTF-8?q?=5Fsymbol.h=20to=20only=20define=20macros=20fo=E2=80=A6=20(#569?= =?UTF-8?q?3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added ADD condition in poly2tri dll_symbol.h to only define macros for dynamic library linking if assimp is ordered to build as DLL * Reverted last commit to handle this issue in a better way. * added P2T_STATIC_EXPORTS to compile definitions when building assimp as DLL --------- Co-authored-by: Kim Kulling --- code/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index e4e67e682..30730f716 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1334,7 +1334,7 @@ ADD_LIBRARY(assimp::assimp ALIAS assimp) IF (BUILD_SHARED_LIBS) TARGET_COMPILE_DEFINITIONS(assimp PRIVATE ASSIMP_BUILD_DLL_EXPORT) ELSE () - TARGET_COMPILE_DEFINITIONS(assimp PRIVATE OPENDDL_STATIC_LIBARY) + TARGET_COMPILE_DEFINITIONS(assimp PRIVATE OPENDDL_STATIC_LIBARY P2T_STATIC_EXPORTS) ENDIF () TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)