Browse Source

stb: move includes to stb folder (#1766)

Jérôme Leclercq 2 years ago
parent
commit
689c5b6a1f
1 changed files with 6 additions and 5 deletions
  1. 6 5
      packages/s/stb/xmake.lua

+ 6 - 5
packages/s/stb/xmake.lua

@@ -1,5 +1,4 @@
 package("stb")
 package("stb")
-
     set_kind("library", {headeronly = true})
     set_kind("library", {headeronly = true})
     set_homepage("https://github.com/nothings/stb")
     set_homepage("https://github.com/nothings/stb")
     set_description("single-file public domain (or MIT licensed) libraries for C/C++")
     set_description("single-file public domain (or MIT licensed) libraries for C/C++")
@@ -15,12 +14,14 @@ package("stb")
         add_extsources("pacman::stb", "apt::libstb-dev")
         add_extsources("pacman::stb", "apt::libstb-dev")
     end
     end
 
 
+    add_includedirs("include", "include/stb")
+
     on_install(function (package)
     on_install(function (package)
-        os.cp("*.h", package:installdir("include"))
-        os.cp("*.c", package:installdir("include"))
+        os.cp("*.h", package:installdir("include/stb"))
+        os.cp("*.c", package:installdir("include/stb"))
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)
-        assert(package:has_cfuncs("stbi_load_from_memory", {includes = "stb_image.h"}))
-        assert(package:has_cfuncs("stb_include_string", {includes = "stb_include.h"}))
+        assert(package:has_cfuncs("stbi_load_from_memory", {includes = "stb/stb_image.h"}))
+        assert(package:has_cfuncs("stb_include_string", {includes = "stb/stb_include.h"}))
     end)
     end)