Ticket #1427: 0ad-r11863-without-nvtt.patch

File 0ad-r11863-without-nvtt.patch, 1.3 KB (added by pcpa, 12 years ago)

0ad-r11863-without-nvtt.patch

  • 0ad-r11863-alpha/build/workspaces/update-workspaces.sh 

    diff -up 0ad-r11863-alpha/build/workspaces/update-workspaces.sh.orig 0ad-r11863-alpha/build/workspaces/update-workspaces.sh
    old new fi  
    3131
    3232premake_args=""
    3333
     34without_nvtt=false
    3435with_system_nvtt=false
    3536with_system_enet=false
    3637with_system_mozjs185=false
    … … for i in "$@"  
    4041do
    4142  case $i in
    4243    --with-system-nvtt ) with_system_nvtt=true; premake_args="${premake_args} --with-system-nvtt" ;;
     44    --without-nvtt ) without_nvtt=true; premake_args="${premake_args} --without-nvtt" ;;
    4345    --with-system-enet ) with_system_enet=true; premake_args="${premake_args} --with-system-enet" ;;
    4446    --with-system-mozjs185 ) with_system_mozjs185=true; premake_args="${premake_args} --with-system-mozjs185" ;;
    4547    --enable-atlas ) enable_atlas=true ;;
    … … if [ "$with_system_mozjs185" = "false" ]  
    6971  (cd ../../libraries/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"
    7072fi
    7173echo
    72 if [ "$with_system_nvtt" = "false" ]; then
     74if [ "$with_system_nvtt" = "false" -a "$without_nvtt" = "false" ]; then
    7375  (cd ../../libraries/nvtt && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "NVTT build failed"
    7476fi
    7577echo