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

  (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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b7320c52ef36701d63ad9956f847546dafa93777..c5437f3d1b961fca8e70f6ee6e2dcbbcfa5ce359 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -99,9 +99,6 @@
     src/mac/utils.cpp
     src/mac/utilsexc.cpp
 </set>
     src/mac/utils.cpp
     src/mac/utilsexc.cpp
 </set>

-<set var="BASE_AND_GUI_MAC_SRC">
-    src/unix/utilsunx.cpp
-</set>

 <set var="BASE_MAC_HDR">
 </set>
 
 <set var="BASE_MAC_HDR">
 </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">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
     <set var="BASE_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>

-        <!-- FIXME: this should really be 
-                    PLATFORM_MACOSX==1 && TOOLKIT{=='MAC',!='MAC'} -->
-        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>

     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_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="TOOLKIT=='COCOA'">$(BASE_AND_GUI_DARWIN_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_DARWIN_SRC)</if>

     </set>
     <set var="BASE_PLATFORM_HDR">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
     </set>
     <set var="BASE_PLATFORM_HDR">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>