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) diff --git a/contrib/poly2tri/poly2tri/common/dll_symbol.h b/contrib/poly2tri/poly2tri/common/dll_symbol.h index 72ed5a75f..c18c2baec 100644 --- a/contrib/poly2tri/poly2tri/common/dll_symbol.h +++ b/contrib/poly2tri/poly2tri/common/dll_symbol.h @@ -53,7 +53,9 @@ # define P2T_DLL_SYMBOL # elif defined(P2T_SHARED_EXPORTS) # define P2T_DLL_SYMBOL P2T_COMPILER_DLLEXPORT -# else +# elif defined(BUILD_SHARED_LIBS) # define P2T_DLL_SYMBOL P2T_COMPILER_DLLIMPORT +# else +# define P2T_DLL_SYMBOL # endif #endif