[Scummvm-cvs-logs] SF.net SVN: scummvm:[46680] tools/branches/gsoc2009-gui/configure
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Dec 28 19:25:24 CET 2009
Revision: 46680
http://scummvm.svn.sourceforge.net/scummvm/?rev=46680&view=rev
Author: fingolfin
Date: 2009-12-28 18:25:24 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
Merge some more scummvm configure features into tools configure
Modified Paths:
--------------
tools/branches/gsoc2009-gui/configure
Modified: tools/branches/gsoc2009-gui/configure
===================================================================
--- tools/branches/gsoc2009-gui/configure 2009-12-28 17:17:22 UTC (rev 46679)
+++ tools/branches/gsoc2009-gui/configure 2009-12-28 18:25:24 UTC (rev 46680)
@@ -80,6 +80,9 @@
_iconv=auto
_endian=unknown
_need_memalign=no
+# Default option behaviour yes/no
+_debug_build=auto
+_release_build=auto
_verbose_build=no
# Default commands
_ranlib=ranlib
@@ -264,6 +267,11 @@
--mandir=DIR directory to install the manpage in [PREFIX/share/man]
--libdir=DIR directory to install the plugins in [PREFIX/lib]
+Optional Features:
+ --disable-debug disable building with debugging symbols
+ --enable-Werror treat warnings as errors
+ --enable-verbose-build enable regular echoing of commands during build process
+
Optional Libraries:
--with-ogg-prefix=DIR Prefix where libogg is installed (optional)
--with-vorbis-prefix=DIR Prefix where libvorbis is installed (optional)
@@ -358,9 +366,21 @@
arg=`echo $ac_option | cut -d '=' -f 2`
_wxpath="$arg:$arg/bin"
;;
+ --enable-debug)
+ _debug_build=yes
+ ;;
+ --disable-debug)
+ _debug_build=no
+ ;;
--enable-Werror)
CXXFLAGS="$CXXFLAGS -Werror"
;;
+ --enable-release)
+ _release_build=yes
+ ;;
+ --disable-release)
+ _release_build=no
+ ;;
--enable-profiling)
CXXFLAGS="$CXXFLAGS -pg"
LDFLAGS="$LDFLAGS -pg"
@@ -661,6 +681,7 @@
darwin*)
DEFINES="$DEFINES -DUNIX -DMACOSX"
LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
+ add_line_to_config_mk 'MACOSX = 1'
;;
mingw*)
DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0"
@@ -1177,3 +1198,26 @@
SAVED_ASFLAGS := $SAVED_ASFLAGS
SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS
EOF
+
+#
+# Create a custom Makefile when building outside the source tree
+# TODO: Add a better check than just looking for 'Makefile'
+#
+if test ! -f Makefile.common ; then
+echo "Creating Makefile"
+
+cat > Makefile << EOF
+# -------- Generated by configure -----------
+srcdir = $_srcdir
+vpath %.h \$(srcdir)
+vpath %.cpp \$(srcdir)
+vpath %.c \$(srcdir)
+vpath %.m \$(srcdir)
+vpath %.mm \$(srcdir)
+vpath %.asm \$(srcdir)
+vpath %.s \$(srcdir)
+vpath %.S \$(srcdir)
+include \$(srcdir)/Makefile
+EOF
+
+fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list