Selaa lähdekoodia

improve magnum (#1082)

* improve magnum

* fix imgui

* update magnum
ruki 3 vuotta sitten
vanhempi
commit
69cf2192d9
2 muutettua tiedostoa jossa 2 lisäystä ja 6 poistoa
  1. 2 2
      packages/i/imgui/xmake.lua
  2. 0 4
      packages/m/magnum-integration/xmake.lua

+ 2 - 2
packages/i/imgui/xmake.lua

@@ -59,7 +59,7 @@ package("imgui")
                     add_files("*.cpp", "backends/imgui_impl_glfw.cpp", "backends/imgui_impl_opengl3.cpp")
                     add_packages(%s)
                     add_includedirs(".")
-                    add_headerfiles("*.h", {prefixdir = "imgui"})
+                    add_headerfiles("*.h")
                     add_headerfiles("(backends/imgui_impl_glfw.h)", "(backends/imgui_impl_opengl3.h)")
             ]], pkgs, pkgs)
             if package:version():ge("1.84") then
@@ -74,7 +74,7 @@ package("imgui")
                 target("imgui")
                     set_kind("static")
                     add_files("*.cpp")
-                    add_headerfiles("*.h", {prefixdir = "imgui"})
+                    add_headerfiles("*.h")
             ]]
         end
 

+ 0 - 4
packages/m/magnum-integration/xmake.lua

@@ -33,10 +33,6 @@ package("magnum-integration")
         for _, integration in ipairs(integrations) do
             table.insert(configs, "-DWITH_" .. integration:upper() .. "=" .. (package:config(integration) and "ON" or "OFF"))
         end
-        local packagedeps = {}
-        if package:config("imgui") then
-            table.insert(packagedeps, "imgui")
-        end
         import("package.tools.cmake").install(package, configs, {packagedeps = packagedeps})
     end)