From 4aa15580017bbf1a34218949797bfa98a5aaf235 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 8 Feb 2016 15:41:13 +0100 Subject: [PATCH] Static Lib => Shared DLL --- build/wxExtend.props | 14 ++++++++++---- build/wxExtend.vcxproj | 8 ++++---- include/wxex/appbar.h | 4 ++-- include/wxex/appex.h | 2 +- include/wxex/common.h | 10 +++++++--- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/build/wxExtend.props b/build/wxExtend.props index 08b2b3e..4e717ca 100644 --- a/build/wxExtend.props +++ b/build/wxExtend.props @@ -1,8 +1,14 @@ - + - - + + ..\..\..\output\$(Platform).$(Configuration)\ + + + + WXEXTEND;%(PreprocessorDefinitions) + + - + \ No newline at end of file diff --git a/build/wxExtend.vcxproj b/build/wxExtend.vcxproj index ce312b2..76c3ada 100644 --- a/build/wxExtend.vcxproj +++ b/build/wxExtend.vcxproj @@ -44,23 +44,23 @@ - StaticLibrary + DynamicLibrary true Unicode - StaticLibrary + DynamicLibrary true Unicode - StaticLibrary + DynamicLibrary false true Unicode - StaticLibrary + DynamicLibrary false true Unicode diff --git a/include/wxex/appbar.h b/include/wxex/appbar.h index e1bb55c..4a9d479 100644 --- a/include/wxex/appbar.h +++ b/include/wxex/appbar.h @@ -279,7 +279,7 @@ protected: /// /// Dockable application bar frame /// -class wxAppBarFrame : public wxAppBar +class ZRCOLA_API wxAppBarFrame : public wxAppBar { public: wxAppBarFrame(); @@ -308,7 +308,7 @@ public: /// /// Dockable application bar dialog /// -class wxAppBarDialog : public wxAppBar +class ZRCOLA_API wxAppBarDialog : public wxAppBar { public: wxAppBarDialog(); diff --git a/include/wxex/appex.h b/include/wxex/appex.h index 75d5064..2e5e479 100644 --- a/include/wxex/appex.h +++ b/include/wxex/appex.h @@ -28,7 +28,7 @@ /// /// Extended application /// -class wxAppEx : public wxApp +class ZRCOLA_API wxAppEx : public wxApp { public: /// diff --git a/include/wxex/common.h b/include/wxex/common.h index 028266d..275460e 100644 --- a/include/wxex/common.h +++ b/include/wxex/common.h @@ -24,9 +24,13 @@ #include -//--------------------------------------------------------------------------- -// Usual debugging macros -//--------------------------------------------------------------------------- +#ifdef WXEXTEND +#define ZRCOLA_API __declspec(dllexport) +#else +#define ZRCOLA_API __declspec(dllimport) +#endif + + #if wxDEBUG_LEVEL #define wxVERIFY(x) wxASSERT((x)) #else