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

removed WXUSINGDLL_FOO, one WXUSINGDLL is enough

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-05 17:11:57 +00:00
parent ed4c6c69a9
commit a7140600c9
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/bakefiles/multilib.bkl
View File

@@ -28,7 +28,7 @@
<dll id="coredll" template="wx_dll" <dll id="coredll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'"> cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL_BASE</define> <define>WXUSINGDLL</define>
<define>WXMAKINGDLL_CORE</define> <define>WXMAKINGDLL_CORE</define>
<define>wxUSE_BASE=0</define> <define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources> <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
@@ -48,8 +48,7 @@
<dll id="htmldll" template="wx_dll" <dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'"> cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL_BASE</define> <define>WXUSINGDLL</define>
<define>WXUSINGDLL_CORE</define>
<define>WXMAKINGDLL_HTML</define> <define>WXMAKINGDLL_HTML</define>
<sources>$(HTML_SRC)</sources> <sources>$(HTML_SRC)</sources>
<library>coredll</library> <library>coredll</library>

15
include/wx/defs.h
View File

@@ -371,27 +371,18 @@ typedef int wxWindowID;
#ifdef WXMAKINGDLL #ifdef WXMAKINGDLL
#if wxUSE_BASE #if wxUSE_BASE
#define WXMAKINGDLL_BASE #define WXMAKINGDLL_BASE
#else
#define WXUSINGDLL_BASE
#endif #endif
#define WXMAKINGDLL_CORE #define WXMAKINGDLL_CORE
#define WXMAKINGDLL_HTML #define WXMAKINGDLL_HTML
#endif // WXMAKINGDLL #endif // WXMAKINGDLL
#ifdef WXUSINGDLL
#define WXUSINGDLL_BASE
#define WXUSINGDLL_CORE
#define WXUSINGDLL_HTML
#endif // WXUSINGDLL
// WXDLLEXPORT maps to export declaration when building the DLL, to import // WXDLLEXPORT maps to export declaration when building the DLL, to import
// declaration if using it or to nothing at all if we don't use wxWin as DLL // declaration if using it or to nothing at all if we don't use wxWin as DLL
#ifdef WXMAKINGDLL_BASE #ifdef WXMAKINGDLL_BASE
#define WXDLLIMPEXP_BASE WXEXPORT #define WXDLLIMPEXP_BASE WXEXPORT
#define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type #define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
#elif defined(WXUSINGDLL_BASE) #elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_BASE WXIMPORT #define WXDLLIMPEXP_BASE WXIMPORT
#define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type #define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type
#else // not making nor using DLL #else // not making nor using DLL
@@ -402,7 +393,7 @@ typedef int wxWindowID;
#ifdef WXMAKINGDLL_CORE #ifdef WXMAKINGDLL_CORE
#define WXDLLIMPEXP_CORE WXEXPORT #define WXDLLIMPEXP_CORE WXEXPORT
#define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type #define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
#elif defined(WXUSINGDLL_CORE) #elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_CORE WXIMPORT #define WXDLLIMPEXP_CORE WXIMPORT
#define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type #define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type
#else // not making nor using DLL #else // not making nor using DLL
@@ -413,7 +404,7 @@ typedef int wxWindowID;
#ifdef WXMAKINGDLL_HTML #ifdef WXMAKINGDLL_HTML
#define WXDLLIMPEXP_HTML WXEXPORT #define WXDLLIMPEXP_HTML WXEXPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
#elif defined(WXUSINGDLL_HTML) #elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_HTML WXIMPORT #define WXDLLIMPEXP_HTML WXIMPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type #define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type
#else // not making nor using DLL #else // not making nor using DLL