Allow wxPreferencesEditor::Dismiss() to work when using modal dialogs too.

[wxWidgets.git] / build / bakefiles / wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index fb2d87699ede0fcd5748f3662b1ddba3c86dde0c..11a5aa23fe58db936cbc11b51891caacd3cc8fa1 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -24,7 +24,7 @@
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 

-    <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
+    <if cond="IS_MSVC_PRJ">

         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>


@@ -40,7 +40,7 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>

-        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>
+        <dir cond="FORMAT!='autoconf'">../../samples</dir>

     </subproject>
 
     <if cond="FORMAT=='autoconf'">
     </subproject>
 
     <if cond="FORMAT=='autoconf'">


@@ -87,7 +87,7 @@
 
         <data-files>
             <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
 
         <data-files>
             <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>

-            <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl</files>
+            <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py</files>

             <install-to>$(DATADIR)/bakefile/presets</install-to>
         </data-files>
 
             <install-to>$(DATADIR)/bakefile/presets</install-to>
         </data-files>
 


@@ -97,10 +97,16 @@
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
                 $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
                 $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config

-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) ../`basename $(LIBDIR)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)

             </command>
         </action>
 
             </command>
         </action>
 

+        <modify-target target="install">
+            <command>
+                $(DYLIB_RPATH_INSTALL)
+            </command>
+        </modify-target>
+

         <set var="RCDEFS_H">
             <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
         </set>
         <set var="RCDEFS_H">
             <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
         </set>


@@ -171,8 +177,8 @@
     </if>
 
 
     </if>
 
 

-    <!-- copy setup.h on DOS/OS2/Windows: -->
-    <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+    <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
+    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0'">

         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>


@@ -188,8 +194,8 @@
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>

-            <if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
-            <if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
+            <if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
+            <if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>

         </set>
 
         <copy-file-to-file-if-not-exist id="master_setup.h">
         </set>
 
         <copy-file-to-file-if-not-exist id="master_setup.h">


@@ -202,12 +208,11 @@
             <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
             <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
             <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
             <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>

-

     </if>
 
 
     <!-- create rcdefs.h on Windows: -->
     </if>
 
 
     <!-- create rcdefs.h on Windows: -->

-    <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
+    <if cond="FORMAT in ['borland','mingw','msvc','watcom']">

 
         <mkdir id="libdir_setup_wx_msw">
             <depends>libdir_setup_wx</depends>
 
         <mkdir id="libdir_setup_wx_msw">
             <depends>libdir_setup_wx</depends>


@@ -249,7 +254,7 @@
 @echo " wxWidgets comes with no guarantees and doesn't claim"
 @echo " to be suitable for any purpose."
 @echo " "
 @echo " wxWidgets comes with no guarantees and doesn't claim"
 @echo " to be suitable for any purpose."
 @echo " "

-@echo " Read the wxWidgets Licence on licencing conditions."
+@echo " Read the wxWindows Licence on licencing conditions."

 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "