aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJonathan Gray2003-05-20 09:43:33 +0000
committerJonathan Gray2003-05-20 09:43:33 +0000
commit50bcac3a0426c19f19d7330ca1dfb4ebd5c32c44 (patch)
tree29dd359af7fd6464418a2f23f5e80911e6fa976f /configure
parent7e8c4f2660bb37edbb9bd0bce0a752322ad7af0f (diff)
downloadscummvm-rg350-50bcac3a0426c19f19d7330ca1dfb4ebd5c32c44.tar.gz
scummvm-rg350-50bcac3a0426c19f19d7330ca1dfb4ebd5c32c44.tar.bz2
scummvm-rg350-50bcac3a0426c19f19d7330ca1dfb4ebd5c32c44.zip
add makefile to test configure with make -f Makefile.new after running configure
svn-id: r7713
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 16 insertions, 1 deletions
diff --git a/configure b/configure
index e3054493cc..ae4bf137c8 100755
--- a/configure
+++ b/configure
@@ -29,6 +29,7 @@ _alsa=auto
_build_scumm=yes
_build_simon=yes
_build_sky=yes
+_need_memalign=no
# binary names
_ranlib=ranlib
@@ -258,6 +259,20 @@ case $endianess in
esac
rm -f tmp_endianess_check tmp_endianess_check.cpp
+echo -n "Alignment required... "
+cat > $TMPC << EOF
+#include <malloc.h>
+int main (void) { (void) memalign(64, sizeof(char)); return 0; }
+EOF
+_need_memalign=yes
+cc_check && _need_memalign=no
+if test "$_need_memalign" = yes ; then
+ echo "#define SCUMM_NEED_ALIGNMENT" >> config.h
+else
+ echo "#undef SCUMM_NEED_ALIGNMENT" >> config.h
+fi
+echo "$_need_memalign"
+
#
# Determine data type sizes
# TODO: proper error checking
@@ -298,7 +313,7 @@ EOF
fi
if test "$_vorbis" = yes ; then
echo "#define USE_VORBIS" >> config.h
- LIBS="$LIBS -lvorbisfile -lvorbis"
+ LIBS="$LIBS -lvorbisfile -lvorbis -logg"
else
echo "#undef USE_VORBIS" >> config.h
fi