mirror of
https://github.com/notwa/rc
synced 2024-06-30 19:07:11 -07:00
use MSVC includes with clang-msvc
This commit is contained in:
parent
b63f1ba653
commit
79366bed63
14
sh/compile
14
sh/compile
|
@ -26,6 +26,7 @@ deb $site/$name/ llvm-toolchain-$name-$version main\n\
|
||||||
compile() {
|
compile() {
|
||||||
local gcc="$(whence -p gcc 2>/dev/null)"
|
local gcc="$(whence -p gcc 2>/dev/null)"
|
||||||
local clang="$(whence -p clang 2>/dev/null)"
|
local clang="$(whence -p clang 2>/dev/null)"
|
||||||
|
local clang_flags=() # currently just for clang-msvc
|
||||||
|
|
||||||
local cl
|
local cl
|
||||||
local vc
|
local vc
|
||||||
|
@ -36,6 +37,11 @@ compile() {
|
||||||
printf "%s\n" "/c/Program Files/LLVM"*(On/N[1]) | read -r dir
|
printf "%s\n" "/c/Program Files/LLVM"*(On/N[1]) | read -r dir
|
||||||
if [ -d "$dir" ] && [ -e "$dir/bin/clang" ]; then
|
if [ -d "$dir" ] && [ -e "$dir/bin/clang" ]; then
|
||||||
clang="$dir/bin/clang"
|
clang="$dir/bin/clang"
|
||||||
|
# not sure if i'll need this
|
||||||
|
#local clang_include
|
||||||
|
#printf "%s\n" "$dir/lib/clang/"*(On/N[1]) | read -r clang_include
|
||||||
|
#[ -n "$clang_include" ] || { echo "failed glob; missing clang include" >&2; return 1 }
|
||||||
|
#clang_flags+=(-I "$clang_include/include")
|
||||||
export PATH="$PATH:$dir/bin/"
|
export PATH="$PATH:$dir/bin/"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -57,10 +63,14 @@ compile() {
|
||||||
[ -n "$winkit" ] || { echo "failed glob; missing winkit" >&2; return 1 }
|
[ -n "$winkit" ] || { echo "failed glob; missing winkit" >&2; return 1 }
|
||||||
|
|
||||||
export PATH="$PATH:$vc/bin$clarch"
|
export PATH="$PATH:$vc/bin$clarch"
|
||||||
export INCLUDE="$vc/INCLUDE;$vc/ATLMFC/INCLUDE"
|
export INCLUDE="$vc/INCLUDE;$vc/ATLMFC/INCLUDE;${winkit/Lib/Include}/ucrt"
|
||||||
export LIB="$vc/LIB$clarch;$vc/ATLMFC/LIB$clarch;$winkit/um/$arch;$winkit/ucrt/$arch"
|
export LIB="$vc/LIB$clarch;$vc/ATLMFC/LIB$clarch;$winkit/um/$arch;$winkit/ucrt/$arch"
|
||||||
export LIBPATH="$vc/LIB$clarch;$vc/ATLMFC/LIB$clarch"
|
export LIBPATH="$vc/LIB$clarch;$vc/ATLMFC/LIB$clarch"
|
||||||
|
|
||||||
|
for d in "${(@s/;/)INCLUDE}"; do
|
||||||
|
clang_flags+=(-I "$d")
|
||||||
|
done
|
||||||
|
|
||||||
# convert msys2 paths to windows paths
|
# convert msys2 paths to windows paths
|
||||||
export INCLUDE="${${INCLUDE//\/c\//C:\\}//\//\\}"
|
export INCLUDE="${${INCLUDE//\/c\//C:\\}//\//\\}"
|
||||||
export LIB="${${LIB//\/c\//C:\\}//\//\\}"
|
export LIB="${${LIB//\/c\//C:\\}//\//\\}"
|
||||||
|
@ -95,6 +105,8 @@ compile() {
|
||||||
{ [ "$1" = gcc ] && CC="gcc" && CXX="g++" && shift } || \
|
{ [ "$1" = gcc ] && CC="gcc" && CXX="g++" && shift } || \
|
||||||
{ [ "$1" = msvc ] && CC="cl" && CXX="cl" && shift }
|
{ [ "$1" = msvc ] && CC="cl" && CXX="cl" && shift }
|
||||||
|
|
||||||
|
[ $CC = clang ] && [ -n "$clang_flags" ] && our_flags+="${clang_flags[@]}"
|
||||||
|
|
||||||
maybe_include() {
|
maybe_include() {
|
||||||
[ -d "$1" ] && our_flags+=("-I$1")
|
[ -d "$1" ] && our_flags+=("-I$1")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user