install as option

Learning-Ray-Tracing-From-Zero · Feb 18, 2025 · acaf825 · acaf825
1 parent b07b8ac
commit acaf825
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/scripts/xmake_func.lua b/scripts/xmake_func.lua
@@ -399,17 +399,20 @@ rule_end()
 
 rule('lc_install_sdk')
 on_load(function(target)
+    local custom_sdk_dir = get_config("sdk_dir")
+    if custom_sdk_dir and not os.exists(custom_sdk_dir) then
+        return
+    end
     local packages = import('packages')
     local libnames = target:extraconf("rules", "lc_install_sdk", "libnames")
     local find_sdk = import('find_sdk')
     local enable = true
-    local sdk_dir = get_config("sdk_dir")
     for _, lib in ipairs(libnames) do
-        local valid = find_sdk.check_file(lib, sdk_dir)
+        local valid = find_sdk.check_file(lib, custom_sdk_dir)
         if not valid then
             utils.error("Library: " .. packages.sdks()[lib]['name'] ..
                             " not installed, run 'xmake lua setup.lua' or download it manually from " ..
-                            packages.sdk_address(packages.sdks()[lib]) .. ' to ' .. packages.sdk_dir(os.arch(), sdk_dir) ..
+                            packages.sdk_address(packages.sdks()[lib]) .. ' to ' .. packages.sdk_dir(os.arch(), custom_sdk_dir) ..
                             '.')
             enable = false
         end
@@ -419,6 +422,10 @@ on_load(function(target)
     end
 end)
 on_clean(function(target)
+    local custom_sdk_dir = get_config("sdk_dir")
+    if custom_sdk_dir and not os.exists(custom_sdk_dir) then
+        return
+    end
     local bin_dir = target:targetdir()
     local find_sdk = import('find_sdk')
     local packages = import('packages')
@@ -433,14 +440,18 @@ on_clean(function(target)
     end
 end)
 before_build(function(target)
+    local custom_sdk_dir = get_config("sdk_dir")
+    if custom_sdk_dir and not os.exists(custom_sdk_dir) then
+        return
+    end
     local bin_dir = target:targetdir()
     local lib = import('lib')
     lib.mkdirs(bin_dir)
     local libnames = target:extraconf("rules", "lc_install_sdk", "libnames")
     local packages = import('packages')
     local find_sdk = import('find_sdk')
     local sdks = packages.sdks()
-    local sdk_dir = packages.sdk_dir(os.arch(), get_config("sdk_dir"))
+    local sdk_dir = packages.sdk_dir(os.arch(), custom_sdk_dir)
     for _, lib in ipairs(libnames) do
         local sdk_map = sdks[lib]
         local zip = sdk_map['name']

diff --git a/src/ext/imgui b/src/ext/imgui
+2 −1		backends/imgui_impl_sdl2.cpp
+27 −8		backends/imgui_impl_vulkan.cpp
+8 −7		backends/imgui_impl_vulkan.h
+13 −1		docs/CHANGELOG.txt
+1 −0		examples/example_glfw_vulkan/main.cpp
+1 −0		examples/example_sdl2_vulkan/main.cpp
+1 −0		examples/example_sdl3_vulkan/main.cpp
+1 −0		examples/example_win32_vulkan/main.cpp
+1 −2		imconfig.h
+1 −0		imgui.cpp
+3 −15		imgui_draw.cpp
+2 −1		imgui_internal.h
+5 −1		imgui_tables.cpp
+5 −4		imgui_widgets.cpp
+4 −12		misc/freetype/README.md