]> git.saurik.com Git - wxWidgets.git/blobdiff - distrib/scripts/includes/configure_build.inc
add Scintilla.iface to the distribution
[wxWidgets.git] / distrib / scripts / includes / configure_build.inc
index a754d9a03669a2d913e62a4005a04113c34d8f7d..5323f17c0b67f0d3141ecc7e36ba04f76bb86180 100644 (file)
@@ -4,10 +4,10 @@ if [ "$INSTALLDIR" = "" ]; then
   mkdir -p $INSTALLDIR
 fi
 
   mkdir -p $INSTALLDIR
 fi
 
-# wxPython needs this option so that it can build extensions that store the 
+# wxPython needs this option so that it can build extensions that store the
 # right install_name (e.g. /usr/local/lib) even if the files aren't actually
 # in /usr/local/lib at the time they're being linked against
 # right install_name (e.g. /usr/local/lib) even if the files aren't actually
 # in /usr/local/lib at the time they're being linked against
-# we do this by setting the "official" prefix at build time, and later 
+# we do this by setting the "official" prefix at build time, and later
 if [ "$BUILDPREFIX" = "" ]; then
   BUILDPREFIX=$INSTALLDIR
 fi
 if [ "$BUILDPREFIX" = "" ]; then
   BUILDPREFIX=$INSTALLDIR
 fi
@@ -22,42 +22,36 @@ ANSI_OPTS="--enable-ansi"
 WXPYTHON_OPTS="--enable-monolithic \
        --with-opengl \
        --enable-sound \
 WXPYTHON_OPTS="--enable-monolithic \
        --with-opengl \
        --enable-sound \
+        --enable-mediactrl \
        --enable-display \
        --enable-geometry \
        --enable-debug_flag \
        --enable-optimise \
        --disable-debugreport "
        --enable-display \
        --enable-geometry \
        --enable-debug_flag \
        --enable-optimise \
        --disable-debugreport "
-       
-       
+
+
 do_build(){
     OPTS=""
     if [ "$WXPYTHON" == "1" ]; then
       OPTS="$WXPYTHON_OPTS"
     fi
 do_build(){
     OPTS=""
     if [ "$WXPYTHON" == "1" ]; then
       OPTS="$WXPYTHON_OPTS"
     fi
-    
+
     if [ "$DEBUG" == "1" ]; then
       OPTS="$OPTS $DEBUG_OPTS "
     fi
     if [ "$DEBUG" == "1" ]; then
       OPTS="$OPTS $DEBUG_OPTS "
     fi
-    
+
     if [ "$UNICODE" == "1" ]; then
       OPTS="$OPTS $UNICODE_OPTS "
     fi
     if [ "$UNICODE" == "1" ]; then
       OPTS="$OPTS $UNICODE_OPTS "
     fi
-    
-    
-    
+
+
+
     if [ "$STATIC" == "1" ]; then
       OPTS="$OPTS --enable-static"
     fi
     if [ "$STATIC" == "1" ]; then
       OPTS="$OPTS --enable-static"
     fi
-    
+
     OPTS="$OPTS $OTHER_OPTS"
     OPTS="$OPTS $OTHER_OPTS"
-    
+
     $WXROOT/configure --prefix=$BUILDPREFIX $OPTS
     make
     $WXROOT/configure --prefix=$BUILDPREFIX $OPTS
     make
-    
-    # build the libs wxPython needs
-    if [ "$WXPYTHON" == "1" ]; then
-      make -C contrib/src/animate
-      make -C contrib/src/gizmos
-      make -C contrib/src/stc
-    fi
-}
\ No newline at end of file
+}