Add llvm_path

Learning-Ray-Tracing-From-Zero · Feb 11, 2025 · 96f7c8d · 96f7c8d
1 parent 0e75c1a
commit 96f7c8d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/clangcxx/xmake.lua b/src/clangcxx/xmake.lua
@@ -6,11 +6,15 @@ if not is_mode("debug") then
     set_pcxxheader("src/pch.h")
     add_headerfiles("../../include/luisa/clangcxx/**.h")
     add_files("src/**.cpp")
-    add_linkdirs("llvm/lib")
-    add_includedirs("llvm/include")
     on_load(function(target, opt)
         local libs = {}
-        local p = "$(scriptdir)/llvm/lib/*.lib"
+        local llvm_path = get_config("llvm_path")
+        if (not llvm_path) or (llvm_path == "") then
+            llvm_path = path.join(os.scriptdir(), "llvm")
+        end
+        local p = path.join(llvm_path, "lib/*.lib")
+        target:add("linkdirs", path.join(llvm_path, "lib"))
+        target:add("includedirs", path.join(llvm_path, "include"))
         for __, filepath in ipairs(os.files(p)) do
             local basename = path.basename(filepath)
             table.insert(libs, basename)

diff --git a/src/ext/imgui b/src/ext/imgui
diff --git a/src/ext/xxHash b/src/ext/xxHash
diff --git a/xmake.lua b/xmake.lua
@@ -152,6 +152,10 @@ set_values(true, false)
 set_default(false)
 set_showmenu(true)
 option_end()
+option("llvm_path")
+set_default(false)
+set_showmenu(true)
+option_end()
 -- pre-defined options end
 
 -- use xrepo from skr
+1 −1		.github/ISSUE_TEMPLATE/issue_template.yml
+3 −0		.gitignore
+1 −0		backends/imgui_impl_glfw.cpp
+1 −0		backends/imgui_impl_glfw.h
+1 −1		backends/imgui_impl_glut.cpp
+3 −2		backends/imgui_impl_metal.mm
+2 −0		backends/imgui_impl_osx.mm
+2 −1		backends/imgui_impl_sdl2.cpp
+6 −6		backends/imgui_impl_sdl3.cpp
+2 −4		backends/imgui_impl_sdl3.h
+69 −71		backends/imgui_impl_sdlgpu3.cpp
+11 −8		backends/imgui_impl_sdlgpu3.h
+26 −23		backends/imgui_impl_sdlrenderer2.cpp
+7 −5		backends/imgui_impl_sdlrenderer2.h
+27 −26		backends/imgui_impl_sdlrenderer3.cpp
+9 −9		backends/imgui_impl_sdlrenderer3.h
+11 −5		backends/imgui_impl_vulkan.cpp
+10 −4		backends/imgui_impl_wgpu.cpp
+18 −18		backends/imgui_impl_win32.cpp
+93 −2		docs/CHANGELOG.txt
+5 −5		docs/CONTRIBUTING.md
+1 −1		docs/FAQ.md
+1 −3		docs/FONTS.md
+1 −1		docs/TODO.txt
+3 −3		examples/example_allegro5/README.md
+2 −2		examples/example_apple_metal/main.mm
+1 −1		examples/example_sdl2_vulkan/main.cpp
+4 −4		examples/example_sdl3_opengl3/Makefile
+0 −1		examples/example_sdl3_opengl3/main.cpp
+4 −4		examples/example_sdl3_sdlgpu3/Makefile
+6 −4		examples/example_sdl3_sdlgpu3/main.cpp
+4 −4		examples/example_sdl3_sdlrenderer3/Makefile
+4 −0		examples/example_sdl3_sdlrenderer3/main.cpp
+1 −1		examples/example_sdl3_vulkan/main.cpp
+1 −1		examples/example_win32_opengl3/build_mingw.bat
+161 −101		imgui.cpp
+68 −52		imgui.h
+53 −48		imgui_demo.cpp
+56 −49		imgui_draw.cpp
+22 −11		imgui_internal.h
+6 −4		imgui_tables.cpp
+159 −90		imgui_widgets.cpp
+1 −1		misc/freetype/README.md
+10 −10		misc/freetype/imgui_freetype.cpp
+3 −3		.github/workflows/ci.yml
+1 −1		.github/workflows/scorecard.yml
+1 −1		Doxyfile
+10 −5		Makefile
+3 −0		README.md
+1 −1		cli/xsum_arch.c
+2 −2		cli/xsum_arch.h
+5 −5		cli/xsum_sanity_check.c
+16 −12		cli/xxhsum.c
+1 −1		tests/bench/main.c
+1 −1		xxh_x86dispatch.c
+63 −31		xxhash.h