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

Static Lib => Shared DLL

Browse Source
This commit is contained in:
Simon Rozman 2016-02-08 15:41:13 +01:00
parent 62c74b5694
commit 4aa1558001
5 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/wxExtend.props
View File

@ -1,8 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup /> <PropertyGroup>
<ItemDefinitionGroup /> <OutDir>..\..\..\output\$(Platform).$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WXEXTEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />
</Project> </Project>

8
build/wxExtend.vcxproj
View File

@ -44,23 +44,23 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>

4
include/wxex/appbar.h
View File

@ -279,7 +279,7 @@ protected:
/// ///
/// Dockable application bar frame /// Dockable application bar frame
/// ///
class wxAppBarFrame : public wxAppBar<wxFrame> class ZRCOLA_API wxAppBarFrame : public wxAppBar<wxFrame>
{ {
public: public:
wxAppBarFrame(); wxAppBarFrame();
@ -308,7 +308,7 @@ public:
/// ///
/// Dockable application bar dialog /// Dockable application bar dialog
/// ///
class wxAppBarDialog : public wxAppBar<wxDialog> class ZRCOLA_API wxAppBarDialog : public wxAppBar<wxDialog>
{ {
public: public:
wxAppBarDialog(); wxAppBarDialog();

2
include/wxex/appex.h
View File

@ -28,7 +28,7 @@
/// ///
/// Extended application /// Extended application
/// ///
class wxAppEx : public wxApp class ZRCOLA_API wxAppEx : public wxApp
{ {
public: public:
/// ///

10
include/wxex/common.h
View File

@ -24,9 +24,13 @@
#include <wx/defs.h> #include <wx/defs.h>
//--------------------------------------------------------------------------- #ifdef WXEXTEND
// Usual debugging macros #define ZRCOLA_API __declspec(dllexport)
//--------------------------------------------------------------------------- #else
#define ZRCOLA_API __declspec(dllimport)
#endif
#if wxDEBUG_LEVEL #if wxDEBUG_LEVEL
#define wxVERIFY(x) wxASSERT((x)) #define wxVERIFY(x) wxASSERT((x))
#else #else