Amebis/wxExtend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WXEXTEND_API is defined according to WXEXTEND_DLL and WXEXTEND_DLLIMP constants instead of WXEXTEND now

Browse Source
This commit is contained in:
Simon Rozman 2016-10-07 14:28:39 +02:00
parent 2fff163aea
commit a287e6e884
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/wxExtend.props
View File

@ -8,9 +8,6 @@
<OutDir>..\..\..\output\$(Platform).$(Configuration)\</OutDir> <OutDir>..\..\..\output\$(Platform).$(Configuration)\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WXEXTEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<POCompile> <POCompile>
<OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName)$(wxExtendVersion).mo</OutputFile> <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName)$(wxExtendVersion).mo</OutputFile>
</POCompile> </POCompile>

6
build/wxExtendDll.props
View File

@ -5,6 +5,10 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup /> <ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WXEXTEND_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />
</Project> </Project>

8
include/wxex/common.h
View File

@ -48,14 +48,14 @@
/// ///
/// Public function calling convention /// Public function calling convention
/// ///
#ifdef WXEXTEND #ifndef WXEXTEND_API
#ifdef _WINDLL #if defined(WXEXTEND_DLL)
#define WXEXTEND_API __declspec(dllexport) #define WXEXTEND_API __declspec(dllexport)
#elif defined(WXEXTEND_DLLIMP)
#define WXEXTEND_API __declspec(dllimport)
#else #else
#define WXEXTEND_API #define WXEXTEND_API
#endif #endif
#else
#define WXEXTEND_API __declspec(dllimport)
#endif #endif