Browse Source

[imgui] Simplify (#1986)

Qudix 2 years ago
parent
commit
9cf110242a
2 changed files with 3 additions and 5 deletions
  1. 2 3
      packages/i/imgui/port/xmake.lua
  2. 1 2
      packages/i/imgui/xmake.lua

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

@@ -10,7 +10,6 @@ option("opengl2",          {showmenu = true,  default = false})
 option("opengl3",          {showmenu = true,  default = false})
 option("glad",             {showmenu = true,  default = false})
 option("sdl2",             {showmenu = true,  default = false})
-option("sdl2_no_renderer", {showmenu = true,  default = false})
 option("sdlrenderer",      {showmenu = true,  default = false})
 option("vulkan",           {showmenu = true,  default = false})
 option("win32",            {showmenu = true,  default = false})
@@ -28,7 +27,7 @@ end
 
 if has_config("sdlrenderer") then
     add_requires("libsdl >=2.0.17")
-elseif has_config("sdl2") or has_config("sdl2_no_renderer") then
+elseif has_config("sdl2") then
     add_requires("libsdl")
 end
 
@@ -88,7 +87,7 @@ target("imgui")
         end
     end
 
-    if has_config("sdl2") or has_config("sdl2_no_renderer") then
+    if has_config("sdl2") then
         if os.exists("backends/imgui_impl_sdl2.cpp") then
             add_files("backends/imgui_impl_sdl2.cpp")
             add_headerfiles("(backends/imgui_impl_sdl2.h)")

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

@@ -112,8 +112,7 @@ package("imgui")
             opengl2          = package:config("opengl2"),
             opengl3          = package:config("opengl3"),
             glad             = package:config("opengl3") and (not package:gitref() and package:version():lt("1.84")),
-            sdl2             = package:config("sdl2"),
-            sdl2_no_renderer = package:config("sdl2_no_renderer"),
+            sdl2             = package:config("sdl2") or package:config("sdl2_no_renderer"),
             sdlrenderer      = package:config("sdlrenderer"),
             vulkan           = package:config("vulkan"),
             win32            = package:config("win32"),