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

reverted previous change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-02 13:01:44 +00:00
parent fd24237519
commit 3d97f1823a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/bakefiles/multilib.bkl
View File

@@ -7,7 +7,6 @@
<dll id="basedll" template="wx_dll" <dll id="basedll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='0'"> cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_BASE</define> <define>WXMAKINGDLL_BASE</define>
<define>wxUSE_BASE=1</define> <define>wxUSE_BASE=1</define>
<define>wxUSE_GUI=0</define> <define>wxUSE_GUI=0</define>
@@ -27,7 +26,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</define> <define>WXUSINGDLL_BASE</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>
@@ -47,7 +46,8 @@
<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</define> <define>WXUSINGDLL_BASE</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>

2
include/wx/defs.h
View File

@@ -387,7 +387,6 @@ typedef int wxWindowID;
// 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
#undef WXUSINGDLL_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_BASE)
@@ -399,7 +398,6 @@ typedef int wxWindowID;
#endif #endif
#ifdef WXMAKINGDLL_CORE #ifdef WXMAKINGDLL_CORE
#undef WXUSINGDLL_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_CORE)