Show
Ignore:
Timestamp:
28.04.2013 20:18:04 (6 years ago)
Author:
davidb
Message:

Edits after testing

Location:
gs2-extensions/echoprint/trunk/src
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/echoprint/trunk/src/gs3-devel.sh

    r27246 r27267  
    22 
    33if [ -d cascade-make ] ; then 
    4   source cascade-make/lib/cascade-lib.bash GEXT_HUGIN . $* 
     4  source cascade-make/lib/cascade-lib.bash GEXT_ECHOPRINT . $* 
    55fi 
    66 
    7 if [ -z $GEXT_HUGIN ] ; then 
     7if [ -z $GEXT_ECHOPRINT ] ; then 
    88  source gs3-setup.sh 
    99fi 
    1010 
    11 if [ -z $GEXTHUGIN_DEVEL ] ; then 
     11if [ -z $GEXTECHOPRINT_DEVEL ] ; then 
    1212    # Set environment variable so we can tell devel.bash has been sourced 
    13     export GEXTHUGIN_DEVEL=$GEXT_HUGIN 
     13    export GEXTECHOPRINT_DEVEL=$GEXT_ECHOPRINT 
    1414     
    15     export PATH="$GEXTHUGIN_INSTALLED/bin:$PATH" 
    16     export CFLAGS="-I$GEXTHUGIN_INSTALLED/include $CFLAGS" 
    17     export CPPFLAGS="-I$GEXTHUGIN_INSTALLED/include $CPPFLAGS" 
    18     export CXXFLAGS="-I$GEXTHUGIN_INSTALLED/include $CXXFLAGS" 
    19     export LDFLAGS="-L$GEXTHUGIN_INSTALLED/lib $LDFLAGS" 
    20     export PKG_CONFIG_PATH="$GEXTHUGIN_INSTALLED/lib/pkgconfig:$PKG_CONFIG_PATH" 
     15    export PATH="$GEXTECHOPRINT_INSTALLED/bin:$PATH" 
     16    export CFLAGS="-I$GEXTECHOPRINT_INSTALLED/include $CFLAGS" 
     17    export CPPFLAGS="-I$GEXTECHOPRINT_INSTALLED/include $CPPFLAGS" 
     18    export CXXFLAGS="-I$GEXTECHOPRINT_INSTALLED/include $CXXFLAGS" 
     19    export LDFLAGS="-L$GEXTECHOPRINT_INSTALLED/lib $LDFLAGS" 
     20    export PKG_CONFIG_PATH="$GEXTECHOPRINT_INSTALLED/lib/pkgconfig:$PKG_CONFIG_PATH" 
    2121     
    22     echo "+Your environment is now setup to compile with the Hugin Support Library" 
     22    echo "+Your environment is now setup to compile with the Echoprint Support Library" 
    2323 
    2424else 
    25     echo "+Your environment is already setup to compile with the Hugin Support Library" 
     25    echo "+Your environment is already setup to compile with the Echoprint Support Library" 
    2626fi 
  • gs2-extensions/echoprint/trunk/src/packages/CASCADE-MAKE.sh

    r27248 r27267  
    1010echo $LD_LIBRARY_PATH; 
    1111 
    12 for d in CMAKE ZLIB BOOST ; do 
     12for d in CMAKE ZLIB BZIP2 BOOST TAGLIB ; do 
    1313    echo "    Running CASCADE-MAKE/$d.sh" 
    1414 
  • gs2-extensions/echoprint/trunk/src/packages/CASCADE-MAKE/BOOST.sh

    r27247 r27267  
    66progname=$0 
    77 
    8 source ../cascade-make/lib/cascade-lib.bash GEXT_HUGIN ../.. $* 
     8source ../cascade-make/lib/cascade-lib.bash GEXT_ECHOPRINT ../.. $* 
    99 
    10 prefix=$GEXTHUGIN_INSTALLED 
     10prefix=$GEXTECHOPRINT_INSTALLED 
    1111 
    1212opt_run_untar $force_untar $auto_untar $package $version 
  • gs2-extensions/echoprint/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

    r27247 r27267  
    66progname=$0 
    77 
    8 source ../cascade-make/lib/cascade-lib.bash GEXT_HUGIN ../.. $* 
     8source ../cascade-make/lib/cascade-lib.bash GEXT_ECHOPRINT ../.. $* 
    99 
    10 prefix=$GEXTHUGIN_INSTALLED 
     10prefix=$GEXTECHOPRINT_INSTALLED 
    1111 
    1212opt_run_untar $force_untar $auto_untar $package $version 
  • gs2-extensions/echoprint/trunk/src/packages/CASCADE-MAKE/ZLIB.sh

    r27247 r27267  
    66progname=$0 
    77 
    8 source ../cascade-make/lib/cascade-lib.bash GEXT_HUGIN ../.. $* 
     8source ../cascade-make/lib/cascade-lib.bash GEXT_ECHOPRINT ../.. $* 
    99 
    10 prefix=$GEXTHUGIN_INSTALLED 
     10prefix=$GEXTECHOPRINT_INSTALLED 
    1111 
    1212opt_run_untar $force_untar $auto_untar $package $version