From 5c50d5305c5c5674c49fbd69bb42250615201520 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 30 Nov 2021 12:02:41 +0100 Subject: [PATCH] Unify DLL import/export constants with wxWidgets Signed-off-by: Simon Rozman --- build/wxExtendDll.props | 2 +- include/wxex/common.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/wxExtendDll.props b/build/wxExtendDll.props index b328252..9f629f1 100644 --- a/build/wxExtendDll.props +++ b/build/wxExtendDll.props @@ -27,7 +27,7 @@ - WXEXTEND_DLL;%(PreprocessorDefinitions) + WXMAKINGDLL_WXEXTEND;WXUSINGDLL;%(PreprocessorDefinitions) diff --git a/include/wxex/common.h b/include/wxex/common.h index 1f4ecd4..1ca4c28 100644 --- a/include/wxex/common.h +++ b/include/wxex/common.h @@ -48,9 +48,9 @@ /// Public function calling convention /// #ifndef WXEXTEND_API -#if defined(WXEXTEND_DLL) +#if defined(WXMAKINGDLL_WXEXTEND) #define WXEXTEND_API __declspec(dllexport) -#elif defined(WXEXTEND_DLLIMP) +#elif defined(WXUSINGDLL) #define WXEXTEND_API __declspec(dllimport) #else #define WXEXTEND_API