Self compilers fixes.

Sat, 03 Nov 2012 18:29:40 -0400

author
Techwolf Lupindo
date
Sat, 03 Nov 2012 18:29:40 -0400
changeset 1695
d3a541b660e4
parent 1694
e8c7971f5151
child 1696
f5e63c92bacf

Self compilers fixes.

indra/cmake/FMOD.cmake file | annotate | diff | revisions
indra/cmake/OPENAL.cmake file | annotate | diff | revisions
install.xml file | annotate | diff | revisions
macbuild.sh file | annotate | diff | revisions
     1.1 --- a/indra/cmake/FMOD.cmake	Sun Jul 01 17:03:32 2012 +0200
     1.2 +++ b/indra/cmake/FMOD.cmake	Sat Nov 03 18:29:40 2012 -0400
     1.3 @@ -1,6 +1,6 @@
     1.4  # -*- cmake -*-
     1.5  
     1.6 -set(FMOD ON CACHE BOOL "Use FMOD sound library.")
     1.7 +set(FMOD OFF CACHE BOOL "Use FMOD sound library.")
     1.8  
     1.9  if (FMOD)
    1.10    if (STANDALONE)
     2.1 --- a/indra/cmake/OPENAL.cmake	Sun Jul 01 17:03:32 2012 +0200
     2.2 +++ b/indra/cmake/OPENAL.cmake	Sat Nov 03 18:29:40 2012 -0400
     2.3 @@ -2,11 +2,11 @@
     2.4  include(Linking)
     2.5  include(Prebuilt)
     2.6  
     2.7 -if (LINUX)
     2.8 +#if (LINUX)
     2.9    set(OPENAL ON CACHE BOOL "Enable OpenAL")
    2.10 -else (LINUX)
    2.11 -  set(OPENAL OFF CACHE BOOL "Enable OpenAL")
    2.12 -endif (LINUX)
    2.13 +#else (LINUX)
    2.14 +#  set(OPENAL OFF CACHE BOOL "Enable OpenAL")
    2.15 +#endif (LINUX)
    2.16  
    2.17  if (OPENAL)
    2.18    if (STANDALONE)
     3.1 --- a/install.xml	Sun Jul 01 17:03:32 2012 +0200
     3.2 +++ b/install.xml	Sat Nov 03 18:29:40 2012 -0400
     3.3 @@ -266,9 +266,9 @@
     3.4            <key>linux</key>
     3.5            <map>
     3.6              <key>md5sum</key>
     3.7 -            <string>aa5b145a5e8b111443e5f30cf6aaa95a</string>
     3.8 +            <string>2ab29212a7f3acdaebf10059af816be0</string>
     3.9              <key>url</key>
    3.10 -            <uri>http://sldev.free.fr/libraries/GL-linux-20080812.tar.bz2</uri>
    3.11 +            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20080812.tar.bz2</uri>
    3.12            </map>
    3.13            <key>linux64</key>
    3.14            <map>
    3.15 @@ -280,9 +280,9 @@
    3.16            <key>windows</key>
    3.17            <map>
    3.18              <key>md5sum</key>
    3.19 -            <string>30c77915bc707ca935b143e79075b4aa</string>
    3.20 +            <string>91155239b02f576384603795d41eb971</string>
    3.21              <key>url</key>
    3.22 -            <uri>http://sldev.free.fr/libraries/GL-windows-20090505.tar.bz2</uri>
    3.23 +            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-windows-20090505.tar.bz2</uri>
    3.24            </map>
    3.25          </map>
    3.26        </map>
    3.27 @@ -618,21 +618,21 @@
    3.28              <key>md5sum</key>
    3.29              <string>69011586de5725de08c10611b1a0289a</string>
    3.30              <key>url</key>
    3.31 -            <uri>http://www.fmod.org/files/fmod3/fmodapi375mac.zip</uri>
    3.32 +            <uri>file:///fmodapi375mac.zip</uri>
    3.33            </map>
    3.34            <key>linux</key>
    3.35            <map>
    3.36              <key>md5sum</key>
    3.37              <string>4fbd42fb8187c37ea454cc66186a1dfa</string>
    3.38              <key>url</key>
    3.39 -            <uri>http://www.fmod.org/files/fmod3/fmodapi375linux.tar.gz</uri>
    3.40 +            <uri>file:///fmodapi375linux.tar.gz</uri>
    3.41            </map>
    3.42            <key>windows</key>
    3.43            <map>
    3.44              <key>md5sum</key>
    3.45              <string>4d28a685a92557c0dac06f9ab2567203</string>
    3.46              <key>url</key>
    3.47 -            <uri>http://www.fmod.org/files/fmod3/fmodapi375win.zip</uri>
    3.48 +            <uri>file:///fmodapi375win.zip</uri>
    3.49            </map>
    3.50          </map>
    3.51        </map>
     4.1 --- a/macbuild.sh	Sun Jul 01 17:03:32 2012 +0200
     4.2 +++ b/macbuild.sh	Sat Nov 03 18:29:40 2012 -0400
     4.3 @@ -10,7 +10,7 @@
     4.4          echo "Configuring (for real)..."
     4.5          ./develop.py configure -G Xcode \
     4.6  	        -DCMAKE_OSX_ARCHITECTURES="$1" \
     4.7 -	        -DOPENAL:BOOL=FALSE -DFMOD:BOOL=TRUE \
     4.8 +	        -DOPENAL:BOOL=TRUE -DFMOD:BOOL=FALSE \
     4.9          	-DCMAKE_BUILD_TYPE=Release \
    4.10          	-DGCC_DISABLE_FATAL_WARNINGS:BOOL=TRUE \
    4.11  		2>&1 > /dev/null

mercurial