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

Fixes for USE_GUI=0 to make pure wxBase makefiles possible. Nothing rebaked because GUI builds are not influenced (but makefiles minimally changed).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-18 08:14:18 +00:00
parent 62038e5976
commit 0bcf9597ab
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build/bakefiles/common.bkl
View File

@@ -505,20 +505,28 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<mac_version>$(WXMACVERSION)</mac_version> <mac_version>$(WXMACVERSION)</mac_version>
</template> </template>
<template id="wx_3rdparty_dependencies"> <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
<depends>wxtiff</depends> <depends>wxtiff</depends>
<depends>wxjpeg</depends> <depends>wxjpeg</depends>
<depends>wxpng</depends> <depends>wxpng</depends>
</template>
<template id="wx_3rdparty_dependencies"
template="wx_3rdparty_dependencies_gui">
<depends>wxexpat</depends> <depends>wxexpat</depends>
<depends>wxzlib</depends> <depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends> <depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends> <depends>wxregex</depends>
</template> </template>
<template id="wx_3rdparty_includes"> <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
<include>$(INC_TIFF)</include> <include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include> <include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include> <include>$(INC_PNG)</include>
</template>
<template id="wx_3rdparty_includes"
template="wx_3rdparty_includes_gui">
<include>$(INC_ZLIB)</include> <include>$(INC_ZLIB)</include>
<include>$(INC_ODBC)</include> <include>$(INC_ODBC)</include>
<include>$(INC_REGEX)</include> <include>$(INC_REGEX)</include>

4
build/bakefiles/multilib.bkl
View File

@@ -166,7 +166,7 @@
<!-- ================================================================ --> <!-- ================================================================ -->
<dll id="htmldll" template="wx_dll" <dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define> <define>WXUSINGDLL</define>
<define>WXMAKINGDLL_HTML</define> <define>WXMAKINGDLL_HTML</define>
<sources>$(HTML_SRC)</sources> <sources>$(HTML_SRC)</sources>
@@ -177,7 +177,7 @@
</dll> </dll>
<lib id="htmllib" template="wx_lib" <lib id="htmllib" template="wx_lib"
cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'"> cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<sources>$(HTML_SRC)</sources> <sources>$(HTML_SRC)</sources>
<msvc-headers>$(HTML_HDR)</msvc-headers> <msvc-headers>$(HTML_HDR)</msvc-headers>
</lib> </lib>