AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

restored changes accidentally reverted by previous commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-08-17 10:41:12 +00:00
parent 1359768207
commit 21041c70a3
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/bakefiles/files.bkl
View File

@ -7,8 +7,8 @@
IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-->
<!-- ======================================================================
FILES
@ -187,6 +187,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/utilscmn.cpp
</set>
<set var="BASE_CMN_HDR" hints="files">
wx/afterstd.h
wx/app.h
wx/apptrait.h
wx/arrimpl.cpp
@ -524,7 +525,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/accel.h
wx/access.h
wx/afterstd.h
wx/artprov.h
wx/bitmap.h
wx/busyinfo.h
@ -1557,6 +1557,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/fontdlgg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
<!-- Unix files used by wxMac: -->
@ -2145,8 +2146,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
</set>
<!-- wxNet files: -->
<set var="NET_MACOSX_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
@ -2172,7 +2173,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- GUI sources: -->
<set var="LOWLEVEL_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
@ -2193,7 +2194,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
</set>
<set var="GUI_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
@ -2219,7 +2220,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
</if>
</set>
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
@ -2253,15 +2254,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
$(OPENGL_HDR) $(DBGRID_HDR)
</if>
</set>
<set var="ALL_BASE_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
$(NET_CMN_HDR) $(NET_PLATFORM_HDR)
$(XML_HDR)
$(XML_HDR) $(ODBC_HDR)
</set>
<set var="ALL_HEADERS" make_var="1" hints="files">
@ -2278,7 +2279,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(BASE_AND_GUI_DARWIN_SRC)
$(BASE_AND_GUI_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
$(XML_SRC)
$(XML_SRC) $(ODBC_SRC)
</set>
</makefile>

4
contrib/build/deprecated/deprecated.bkl
View File

@ -11,7 +11,7 @@
proplist.cpp
resource.cpp
tbarsmpl.cpp
treelay.cpp
treelay.cpp
wxexpr.cpp
<!--
@ -38,12 +38,14 @@
<dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_DEPRECATED</define>
<include>$(SRCDIR)</include>
<sources>$(DEPRECATED_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
<include>$(SRCDIR)</include>
<sources>$(DEPRECATED_SRC)</sources>
</lib>