pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Simplify the structure of the LLVM package 

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1310/head
Dimitar Dobrev 5 years ago
parent
c80986e04e
commit
8b3eadf6de
2 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      build/LLVM.lua
  2. 10
      build/scripts/LLVM.lua

18
build/LLVM.lua
Unescape View File

@ -43,30 +43,30 @@ function SetupLLVMIncludes()
includedirs includedirs
{ {
path.join(LLVMRootDirDebug, "include"), path.join(LLVMRootDirDebug, "include"),
path.join(LLVMRootDirDebug, "tools/clang/include"), path.join(LLVMRootDirDebug, "clang/include"),
path.join(LLVMRootDirDebug, "tools/clang/lib"), path.join(LLVMRootDirDebug, "clang/lib"),
path.join(LLVMRootDirDebug, "build/include"), path.join(LLVMRootDirDebug, "build/include"),
path.join(LLVMRootDirDebug, "build/tools/clang/include"), path.join(LLVMRootDirDebug, "build/clang/include"),
} }
filter { "configurations:Release" } filter { "configurations:Release" }
includedirs includedirs
{ {
path.join(LLVMRootDirRelease, "include"), path.join(LLVMRootDirRelease, "include"),
path.join(LLVMRootDirRelease, "tools/clang/include"), path.join(LLVMRootDirRelease, "clang/include"),
path.join(LLVMRootDirRelease, "tools/clang/lib"), path.join(LLVMRootDirRelease, "clang/lib"),
path.join(LLVMRootDirRelease, "build/include"), path.join(LLVMRootDirRelease, "build/include"),
path.join(LLVMRootDirRelease, "build/tools/clang/include"), path.join(LLVMRootDirRelease, "build/clang/include"),
} }
else else
local LLVMBuildDir = get_llvm_build_dir() local LLVMBuildDir = get_llvm_build_dir()
includedirs includedirs
{ {
path.join(LLVMRootDir, "include"), path.join(LLVMRootDir, "include"),
path.join(LLVMRootDir, "tools/clang/include"), path.join(LLVMRootDir, "clang/include"),
path.join(LLVMRootDir, "tools/clang/lib"), path.join(LLVMRootDir, "clang/lib"),
path.join(LLVMBuildDir, "include"), path.join(LLVMBuildDir, "include"),
path.join(LLVMBuildDir, "tools/clang/include"), path.join(LLVMBuildDir, "clang/include"),
} }
end end

10
build/scripts/LLVM.lua
Unescape View File

@ -399,14 +399,14 @@ function package_llvm(conf, llvm_base, llvm_build)
os.copydir(llvm_build_libdir, out .. "/build/lib", "*.a") os.copydir(llvm_build_libdir, out .. "/build/lib", "*.a")
end end
os.copydir(llvm_base .. "/clang/include", out .. "/tools/clang/include") os.copydir(llvm_base .. "/clang/include", out .. "/clang/include")
os.copydir(llvm_build .. "/tools/clang/include", out .. "/build/tools/clang/include") os.copydir(llvm_build .. "/tools/clang/include", out .. "/build/clang/include")
os.copydir(llvm_build_libdir .. "/clang", out .. "/lib/clang") os.copydir(llvm_build_libdir .. "/clang", out .. "/lib/clang")
os.copydir(llvm_base .. "/clang/lib/CodeGen", out .. "/tools/clang/lib/CodeGen", "*.h") os.copydir(llvm_base .. "/clang/lib/CodeGen", out .. "/clang/lib/CodeGen", "*.h")
os.copydir(llvm_base .. "/clang/lib/Driver", out .. "/tools/clang/lib/Driver", "*.h") os.copydir(llvm_base .. "/clang/lib/Driver", out .. "/clang/lib/Driver", "*.h")
os.copydir(llvm_base .. "/clang/lib/Driver/ToolChains", out .. "/tools/clang/lib/Driver/ToolChains", "*.h") os.copydir(llvm_base .. "/clang/lib/Driver/ToolChains", out .. "/clang/lib/Driver/ToolChains", "*.h")
local out_lib_dir = out .. "/build/lib" local out_lib_dir = out .. "/build/lib"
if os.ishost("windows") then if os.ishost("windows") then

Write Preview
Loading…
Cancel
Save