修复几处bug

This commit is contained in:
Zhuo Yang 2022-04-11 16:08:01 +08:00
parent 37b29fd98a
commit 3a5f44b810
1 changed files with 19 additions and 4 deletions

View File

@ -30,23 +30,38 @@ make -s -f "$WM_DIR"/makefiles/files MAKE_DIR="$MakeDir" OBJECTS_DIR="$objectsDi
make -s -f "$WM_DIR"/makefiles/files MAKE_DIR="$MakeDir" OBJECTS_DIR="$objectsDir" make -s -f "$WM_DIR"/makefiles/files MAKE_DIR="$MakeDir" OBJECTS_DIR="$objectsDir"
s=`make --dry-run -f "$WM_DIR"/makefiles/general MAKE_DIR="$MakeDir" OBJECTS_DIR="$objectsDir" $targetType` s=`make --dry-run -f "$WM_DIR"/makefiles/general MAKE_DIR="$MakeDir" OBJECTS_DIR="$objectsDir" $targetType`
link_flags_extra=`echo $s | grep -oP '(?<=Xlinker).*(?=Make)'` if [ $WM_COMPILE_OPTION = "Debug" ]; then
echo $s
fi
link_flags_extra=`echo $s | grep -oP '(?<=Xlinker)(.*?)(?=Make)'`
link_flags_extra="-Xlinker $link_flags_extra" link_flags_extra="-Xlinker $link_flags_extra"
OF_compile_flags=`printInfo "cxxflags"` OF_compile_flags=`printInfo "cxxflags"`
OF_compile_flags="$OF_compile_flags -iquote."
OF_link_flags="$OF_compile_flags $link_flags_extra" OF_link_flags="$OF_compile_flags $link_flags_extra"
# echo OF_compile_flags: $OF_compile_flags # echo OF_compile_flags: $OF_compile_flags
# echo OF_link_flags: $OF_link_flags # echo OF_link_flags: $OF_link_flags
OF_project_name=`cat Make/files | grep -oP '(?<=/).*$'` OF_project_name=`cat Make/files | grep EXE | grep -oP '(?<=/).*$'`
# echo OF_testCaseDir: '${CMAKE_SORCE_DIR}/testCase' # echo OF_testCaseDir: '${CMAKE_SORCE_DIR}/testCase'
OF_sources=`cat Make/files | grep -oP '.*.C'` OF_sources=`cat Make/files | grep -oP '.*.C'`
# echo OF_sources: $OF_sources # echo OF_sources: $OF_sources
str_inc=`echo $s | sed 's/ /\n/g' | grep -E '^-I' | sort | uniq |grep -oP '(?<=-I).*'` str_inc=`echo $s | sed 's/ /\n/g' | grep -E '^-I' | sort | uniq |grep -oP '(?<=-I).*'`
OF_includeDir=${str_inc/%lnInclude/} OF_includeDir_tmp=${str_inc/%lnInclude/}
# echo OF_includeDir: $OF_includeDir OF_includeDir=""
for inc in $OF_includeDir_tmp
do
if [ "${inc:0:1}" != "/" ]
then
inc="\${CMAKE_SOURCE_DIR}/$inc"
fi
OF_includeDir="$OF_includeDir $inc"
done
OF_includeDir="$OF_includeDir \${CMAKE_SOURCE_DIR}/lnInclude"
OF_includeDir=`echo $OF_includeDir | sed 's/ /\n/g'`
OF_linkLib=`echo $s | sed 's/ /\n/g' | grep -E '^-l' | sort | uniq |grep -oP '(?<=-l).*'` OF_linkLib=`echo $s | sed 's/ /\n/g' | grep -E '^-l' | sort | uniq |grep -oP '(?<=-l).*'`
OF_linkDir=$WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib OF_linkDir=$WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib