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

* Removed BASE_AND_GUI_MAC_SRC. At the moment DARWIN/MAC are identical

Browse Source 
(they both have only utilsunx.cpp) and Bakefile needs some work to allow
  more complex conditions before having this separate will be easy.
* Allow wxGTK to be built on OS X.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-07-11 13:19:48 +00:00
parent b1e4e7cc96
commit 4aa75221eb
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/bakefiles/files.bkl
View File

@@ -99,9 +99,6 @@
src/mac/utils.cpp src/mac/utils.cpp
src/mac/utilsexc.cpp src/mac/utilsexc.cpp
</set> </set>
<set var="BASE_AND_GUI_MAC_SRC">
src/unix/utilsunx.cpp
</set>
<set var="BASE_MAC_HDR"> <set var="BASE_MAC_HDR">
</set> </set>
@@ -1758,19 +1755,22 @@
<!-- Define sources for specific libraries: --> <!-- Define sources for specific libraries: -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- Nested if would be nicer, but this works -->
<set var="BASE_MACOSX_SRC">
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
</set>
<set var="BASE_PLATFORM_SRC"> <set var="BASE_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if> <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if> <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
<!-- FIXME: this should really be <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
PLATFORM_MACOSX==1 && TOOLKIT{=='MAC',!='MAC'} -->
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
</set> </set>
<set var="BASE_AND_GUI_PLATFORM_SRC"> <set var="BASE_AND_GUI_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if> <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if> <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if> <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_DARWIN_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_AND_GUI_DARWIN_SRC)</if>
</set> </set>
<set var="BASE_PLATFORM_HDR"> <set var="BASE_PLATFORM_HDR">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if> <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>