0024314: Generated env.sh defines Release libraries search paths for Debug target

Correct CSF_OPT_LNK64D/CSF_OPT_LNK32D defintion
chmod +x draw.sh template

diff --git a/src/WOKTclLib/templates/draw.sh b/src/WOKTclLib/templates/draw.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh
index 7f6613ce2130d746e7b65afde6bfdff050a80569..678a49d8c7684c530411e7df9a6b87d00bca9e13 100755 (executable)
--- a/src/WOKTclLib/templates/env.sh
+++ b/src/WOKTclLib/templates/env.sh
@@ -66,18 +66,17 @@ fi
 export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"
 
 if [ "${TARGET}" == "cbp" ]; then
-  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
-  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
   export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
   export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
 elif [ "${TARGET}" == "xcd" ]; then
-  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
-  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
   export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
   export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
 fi
 
-
 export CSF_OPT_CMPL=""
 
 # Optiona 3rd-parties should be enabled by HAVE macros
@@ -115,14 +114,24 @@ done
 if [ "$ARCH" == "32" ]; then
   set -- "$CSF_OPT_LIB32"
   declare -a aPartiesLibs=($*)
+  set -- "$CSF_OPT_LIB32D"
+  declare -a aPartiesLibsDeb=($*)
 else
   set -- "$CSF_OPT_LIB64"
   declare -a aPartiesLibs=($*)
+  set -- "$CSF_OPT_LIB64D"
+  declare -a aPartiesLibsDeb=($*)
 fi
 
 # Turn back value
 IFS=$aDelimBack
 
+OPT_LINKER_OPTIONS_DEB=""
+for anItem in ${aPartiesLibsDeb[*]}
+do
+  OPT_LINKER_OPTIONS_DEB="${OPT_LINKER_OPTIONS_DEB} -L${anItem}"
+done
+
 OPT_LINKER_OPTIONS=""
 for anItem in ${aPartiesLibs[*]}
 do
@@ -136,10 +145,10 @@ done
 
 if [ "$ARCH" == "64" ]; then
   export CSF_OPT_LNK64="$OPT_LINKER_OPTIONS"
-  export CSF_OPT_LNK64D="$OPT_LINKER_OPTIONS"
+  export CSF_OPT_LNK64D="$OPT_LINKER_OPTIONS_DEB"
 else
   export CSF_OPT_LNK32="$OPT_LINKER_OPTIONS"
-  export CSF_OPT_LNK32D="$OPT_LINKER_OPTIONS"
+  export CSF_OPT_LNK32D="$OPT_LINKER_OPTIONS_DEB"
 fi