X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e602dae828e1f522c3142d15d6449f89dda33340..cb751f46a0db6efd12b1e8f9d1074e71b6249253:/build/bakefiles/wxpresets/presets/wx_unix.bkl?ds=sidebyside

diff --git a/build/bakefiles/wxpresets/presets/wx_unix.bkl b/build/bakefiles/wxpresets/presets/wx_unix.bkl
index 324c24a5fa..cd9bddb8d4 100644
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -8,34 +8,20 @@ See wx.bkl for platform-independent notes.
 Format-specific notes:
 
 * autoconf:
-        Beware that you have to use AM_OPTIONS_WXCONFIG and
-        AM_PATH_WXCONFIG in your configure.in to get at least the
+        Beware that you have to use WX_CONFIG_OPTIONS and
+        WX_CONFIG_CHECK in your configure.in to get at least the
         WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
+
         To detect the WX_* option values typically you also want to use
-        the AM_WXPRESETS_OPTIONS and AM_WXPRESETS_CHECKS macros
-        (see wxpresets.m4 for more info).
+        the WX_STANDARD_OPTIONS, WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS,
+        WX_CONFIG_CHECK and finally WX_DETECT_STANDARD_OPTION_VALUES macros
+        (see wxwin.m4 for more info).
 
 -->
 
 
 <makefile>
 
-    <!-- ============================================================== -->
-    <!--                           Options                              -->
-    <!-- ============================================================== -->
-
-    <!-- on Unix the WX_PORT is not a fixed value but rather an option -->
-    <if cond="not isdefined('WX_PORT')">
-        <set var="WX_PORT_DEFAULT" overwrite="0">auto</set>
-        <option name="WX_PORT">
-            <values>auto,gtk1,gtk2,msw,x11,motif,mgl,mac</values>
-            <default-value>$(WX_PORT_DEFAULT)</default-value>
-            <description>
-                Port of the wx library to build against
-            </description>
-        </option>
-    </if>
-
 
 
     <!-- ============================================================== -->
@@ -50,8 +36,9 @@ Format-specific notes:
         <option name="WX_RESCOMP"/>
         <option name="WX_VERSION_MAJOR"/>
         <option name="WX_VERSION_MINOR"/>
+        <option name="WX_PORT"/>
 
-        <!-- wxpresets.m4 macros will detect all WX_* options defined above -->
+        <!-- wxwin.m4 macros will detect all WX_* options defined above -->
 
 
         <!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
@@ -62,8 +49,8 @@ Format-specific notes:
                 <!-- all wx-dependent libraries should have been already listed
                      thus we can now add WX_LIBS to the linker line -->
                 <ldlibs>$(WX_LIBS)</ldlibs>
-    </if>
-            <if cond="value not in ALLLIB_LIST.split()">
+            </if>
+            <if cond="value not in WX_LIB_LIST.split()">
                 <error>Unknown wxWidgets library given in the wx-lib tag</error>
             </if>
         </define-tag>
@@ -94,10 +81,8 @@ Format-specific notes:
             $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
         </set>
         <option name="WX_PORT">
-            <values>gtk1,gtk2,msw,x11,motif,mgl,mac,$(WX_PORT_DEFAULT)</values>
-            <default-value>
-                $(WX_PORT_DEFAULT)
-            </default-value>
+            <values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
+            <default-value force="1">$(WX_PORT_DEFAULT)</default-value>
             <description>
                 Port of the wx library to build against
             </description>
@@ -107,9 +92,9 @@ Format-specific notes:
             $(DOLLAR)(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
         </set>
         <option name="WX_SHARED">
-            <values>0,1,$(WX_SHARED_DEFAULT)</values>
-            <values-description>Static,DLL,$(WX_SHARED_DEFAULT)</values-description>
-            <default-value>$(WX_SHARED_DEFAULT)</default-value>
+            <values>0,1</values>
+            <values-description>Static,DLL</values-description>
+            <default-value force="1">$(WX_SHARED_DEFAULT)</default-value>
             <description>
                 Use DLL build of wx library to use?
             </description>
@@ -119,9 +104,9 @@ Format-specific notes:
             $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
         </set>
         <option name="WX_UNICODE">
-            <values>0,1,$(WX_UNICODE_DEFAULT)</values>
-            <values-description>ANSI,Unicode,$(WX_UNICODE_DEFAULT)</values-description>
-            <default-value>$(WX_UNICODE_DEFAULT)</default-value>
+            <values>0,1</values>
+            <values-description>ANSI,Unicode</values-description>
+            <default-value force="1">$(WX_UNICODE_DEFAULT)</default-value>
             <description>
                 Compile Unicode build of wxWidgets?
             </description>
@@ -131,9 +116,9 @@ Format-specific notes:
             $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
         </set>
         <option name="WX_DEBUG">
-            <values>0,1,$(WX_DEBUG_DEFAULT)</values>
-            <values-description>Release,Debug,$(WX_DEBUG_DEFAULT)</values-description>
-            <default-value>$(WX_DEBUG_DEFAULT)</default-value>
+            <values>0,1</values>
+            <values-description>Release,Debug</values-description>
+            <default-value force="1">$(WX_DEBUG_DEFAULT)</default-value>
             <description>
                 Use debug build of wxWidgets (define __WXDEBUG__)?
             </description>
@@ -202,15 +187,16 @@ Format-specific notes:
                          that simply creating the following target; if it fails the make
                          program will halt with the wx-config error message...
         -->
-        <action id="test_for_selected_wxbuild">
-            <dependency-of>all</dependency-of>
-
-            <!-- Use @ to hide to the user that we're running wx-config... -->
-            <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
-        </action>
+        <if cond="WX_TEST_FOR_SELECTED_WXBUILD=='1'">
+            <action id="test_for_selected_wxbuild">
+                <dependency-of>all</dependency-of>
 
+                <!-- Use @ to hide to the user that we're running wx-config... -->
+                <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
+            </action>
+        </if>
 
-        <!-- we need this but the trick used in default-values above
+        <!-- we need these vars but the trick used in the default values above
              prevents bakefile from detecting it: -->
         <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG WX_VERSION</set>
 
@@ -221,14 +207,14 @@ Format-specific notes:
         <define-tag name="wx-lib" rules="exe,dll,module">
             <if cond="value=='base'">
                 <!-- all wx libraries should have been already specified, thus
-                    $(__liblist) should contain the full list... -->
+                    $(__liblist) should contain the full list of required wxlibs... -->
                 <set var="__liblist" append="1">base</set>
-                <ldlibs>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldlibs>
+                <ldflags>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldflags>
             </if>
             <if cond="value!='base'">
                 <set var="__liblist" append="1">$(value)</set>
             </if>
-            <if cond="value not in ALLLIB_LIST.split()">
+            <if cond="value not in WX_LIB_LIST.split()">
                 <error>Unknown wxWidgets library given in the wx-lib tag</error>
             </if>
         </define-tag>