Changeset 30257

Show
Ignore:
Timestamp:
21.09.2015 12:43:47 (4 years ago)
Author:
jmt12
Message:

Correcting and optimizing for GS3 (which needs fewer paths to be included)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/tdb/trunk/enable_tdb.sh

    r30255 r30257  
    5252    then 
    5353    # - No Extension variables yet - add them in with TDB parts 
    54     sed -i 's:AR = ar:# Support for adding in extension classes\nEXT_DEFINES = -DUSE_TDB\nEXT_INCLUDES = -I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include -I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\nEXT_SOURCES = tdbclass.cpp\nEXT_OBJECTS = tdbclass.o\n\n&:' "${MAKEFILE}" 
     54    sed -i 's:AR = ar:# Support for adding in extension classes\nEXT_DEFINES = -DUSE_TDB\nEXT_INCLUDES = -I'${EXTDIR}'/'${GSDLOS}'/include\nEXT_SOURCES = tdbclass.cpp\nEXT_OBJECTS = tdbclass.o\n\n&:' "${MAKEFILE}" 
    5555    sed -i 's:DEFS = @DEFS@ .*:& $(EXT_DEFINES):' "${MAKEFILE}" 
    5656    sed -i 's:INCLUDES = -I. .*:& $(EXT_INCLUDES):' "${MAKEFILE}" 
     
    6060    # - Extension support already present - add TDB parts 
    6161    sed -i 's:EXT_DEFINES =.*:& -DUSE_TDB:' "${MAKEFILE}" 
    62     sed -i 's:EXT_INCLUDES =.*:& -I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include -I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib:' "${MAKEFILE}" 
     62    sed -i 's:EXT_INCLUDES =.*:& -I'${EXTDIR}'/'${GSDLOS}'/include:' "${MAKEFILE}" 
    6363    sed -i 's:EXT_SOURCES =.*:& tdbclass.cpp:' "${MAKEFILE}" 
    6464    sed -i 's:EXT_OBJECTS =.*:& tdbclass.o:' "${MAKEFILE}" 
     
    221221echo 'rerun:' 
    222222echo 
    223 echo ' ./configure <any required arguments>' 
    224 echo ' make' 
    225 echo ' make install' 
     223if [ "${GSDL3HOME}x" == "x" ] 
     224then 
     225    echo ' ./configure <any required arguments>' 
     226    echo ' make' 
     227    echo ' make install' 
     228else 
     229    echo ' ant install' 
     230fi 
    226231echo 
    227232echo 'to complete TDB installation.'