[Scummvm-cvs-logs] SF.net SVN: scummvm:[35853] residual/trunk/configure
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Tue Jan 13 23:51:10 CET 2009
Revision: 35853
http://scummvm.svn.sourceforge.net/scummvm/?rev=35853&view=rev
Author: aquadran
Date: 2009-01-13 22:51:10 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
synced configure with scummvm changes
Modified Paths:
--------------
residual/trunk/configure
Modified: residual/trunk/configure
===================================================================
--- residual/trunk/configure 2009-01-13 22:35:34 UTC (rev 35852)
+++ residual/trunk/configure 2009-01-13 22:51:10 UTC (rev 35853)
@@ -565,7 +565,7 @@
fi
case $cxx_version in
- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9]|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
cxx_version="$cxx_version, ok"
@@ -707,7 +707,6 @@
#
# Determine build settings
#
-# TODO - also add an command line option to override this?!?
echo_n "Checking hosttype... "
echo $_host_os
case $_host_os in
@@ -717,13 +716,22 @@
;;
beos*)
DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
- LIBS="$LIBS -lbind"
+ LDFLAGS="-L/boot/home/config/lib"
+ CFLAGS="-I/boot/home/config/include"
+ CXXFLAGS="$CXXFLAGS -fhuge-objects"
type_1_byte='char'
type_2_byte='short'
type_4_byte='long'
- ;;
+ ;;
+ haiku*)
+ DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+ CXXFLAGS="$CXXFLAGS -fhuge-objects"
+ type_1_byte='char'
+ type_2_byte='short'
+ type_4_byte='long'
+ ;;
solaris*)
- DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+ DEFINES="$DEFINES -DUNIX -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
LIBS="$LIBS -lnsl"
;;
irix*)
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