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

some compilers (Watcom) don't like it if wxBase library PCH file contains

Browse Source 
symbols from GUI components and won't link a DLL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-08-08 09:49:24 +00:00
parent 7235a82e6c
commit 15d93f1ebb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/bakefiles/common.bkl
View File

@ -390,19 +390,21 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
</template> </template>
<template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/> <template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
<template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies"/> <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies">
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_dll" template="wx_dll_b,wx_3rdparty_dependencies" <template id="wx_dll" template="wx_dll_b,wx_3rdparty_dependencies"
template_append="wx_append_nomono"/> template_append="wx_append_nomono"/>
<template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies" <template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
template_append="wx_append_base_nomono"/> template_append="wx_append_base_nomono">
<define>wxUSE_GUI=0</define>
</template>
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Templates for building wxWindows plugins: --> <!-- Templates for building wxWindows plugins: -->
<!-- =============================================================== --> <!-- =============================================================== -->
<set var="">
</set>
<if cond="WX_STABLE_BRANCH=='1'"> <if cond="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION"> <set var="PLUGIN_VERSION">
<if cond="PLATFORM_UNIX=='1'"> <if cond="PLATFORM_UNIX=='1'">
@ -430,6 +432,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
$(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION) $(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)
</dllname> </dllname>
<define>WXUSINGDLL</define> <define>WXUSINGDLL</define>
<define>wxUSE_GUI=0</define>
</template> </template>
</define-rule> </define-rule>

2
build/bakefiles/multilib.bkl
View File

@ -11,7 +11,6 @@
cond="SHARED=='1' and MONOLITHIC=='0'"> cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL_BASE</define> <define>WXMAKINGDLL_BASE</define>
<define>wxUSE_BASE=1</define> <define>wxUSE_BASE=1</define>
<define>wxUSE_GUI=0</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources> <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers> <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
<msvc-copy-setup-h/> <msvc-copy-setup-h/>
@ -20,7 +19,6 @@
<lib id="baselib" template="wx_base_lib" <lib id="baselib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'"> cond="SHARED=='0' and MONOLITHIC=='0'">
<define>wxUSE_BASE=1</define> <define>wxUSE_BASE=1</define>
<define>wxUSE_GUI=0</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources> <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers> <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
<msvc-copy-setup-h/> <msvc-copy-setup-h/>