X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6990514b0d041f762a8372dcbe20d1714039267e..3682ea7d2cafc2cbb3f9093e0f864dfff54327dd:/build/bakefiles/config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index a936cfcd77..94c9d82556 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -8,7 +8,7 @@
     <option name="SHARED">
         <values>0,1</values>
         <values-description>,DLL</values-description>
-        <default-value>1</default-value>
+        <default-value>0</default-value>
         <description>
             What type of library to build?
         </description>
@@ -16,7 +16,7 @@
     
     <option name="WXUNIV">
         <values>0,1</values>
-        <values-description>,wxUniv</values-description>
+        <values-description>,Universal</values-description>
         <default-value>0</default-value>
         <description>
             Build wxUniversal instead of native port?
@@ -32,10 +32,23 @@
         </description>
     </option>
 
+    <if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
+        <option name="MSLU">
+            <values>0,1</values>
+            <default-value>0</default-value>        
+            <description>
+                Use MSLU library when building Unicode version.
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
+        <set var="MSLU">0</set>
+    </if>
+
     <option name="BUILD">
         <values>debug,release</values>
         <values-description>Debug,Release</values-description>
-        <default-value>release</default-value>
+        <default-value>debug</default-value>
         <description>
             Type of compiled binaries
         </description>
@@ -155,8 +168,9 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         <option name="EXTRALIBS_ODBC"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
-        <option name="SAMPLES_RPATH_FLAG"/>
         <option name="HOST_SUFFIX"/>
+        <option name="SAMPLES_RPATH_FLAG"/>
+        <option name="SAMPLES_RPATH_POSTLINK"/>
         
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
@@ -184,13 +198,17 @@ it if SHARED=1 unless you know what you are doing.
         <set var="TOOLKIT">MSW</set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
-        <set var="SAMPLES_RPATH_FLAG"/>
         <set var="HOST_SUFFIX"/>
+        <set var="EXTRACFLAGS"/>
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
         <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
-        <set var="EXTRACFLAGS"/>
+        <set var="EXTRALIBS_OPENGL">
+            <if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
+            <if cond="COMPILER=='vc'">opengl32.lib glu32.lib</if>
+            <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
+        </set>
 
         <set var="SRCDIR">
             <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
@@ -214,5 +232,24 @@ Set the version of your Mingw installation here.
         </set>
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
+
     
+
+    <!-- ================================================================== -->
+    <!--            Project files - hardcode some defaults                  -->
+    <!-- ================================================================== -->
+
+    <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
+        <set var="RUNTIME_LIBS">dynamic</set>
+        <set var="OFFICIAL_BUILD">0</set>
+        <set var="USE_HTML">1</set>
+        <set var="USE_OPENGL">1</set>
+        <set var="USE_ODBC">1</set>
+        <set var="MONOLITHIC">0</set>
+        <set var="USE_GUI">1</set>
+        <set var="DEBUG_INFO">default</set>
+        <set var="DEBUG_FLAG">default</set>
+        <set var="MSLU">0</set>
+    </if>
+
 </makefile>