rewrite glfw and fix glew

pull/103/head
xq114 4 years ago
parent 7f5048106b
commit 5588a948e9
  1. 17
      packages/g/glew/xmake.lua
  2. 131
      packages/g/glfw/xmake.lua

@ -11,6 +11,8 @@ package("glew")
add_versions("2.1.0", "2700383d4de2455f06114fbaf872684f15529d4bdc5cdea69b5fb0e9aa7763f1")
end
add_configs("build_utils", {description = "Build utility binaries", default = false, type = "boolean"})
if is_plat("windows", "mingw") then
add_syslinks("glu32", "opengl32")
else
@ -25,7 +27,9 @@ package("glew")
on_load(function (package)
package:add("defines", "GLEW_BUILD")
if package:is_plat("windows", "mingw") then
if package:is_plat("windows") then
package:add("links", package:config("shared") and "glew32" or "glew32s")
elseif package:is_plat("mingw") then
package:add("links", "glew32")
end
end)
@ -37,12 +41,15 @@ package("glew")
on_install("windows", function (package)
os.cp("include", package:installdir())
if is_arch("x64") then
os.cp("bin/Release/x64/*.dll", package:installdir("lib"))
os.cp("bin/Release/x64/*.dll", package:installdir("bin"))
os.cp("lib/Release/x64/*.lib", package:installdir("lib"))
else
os.cp("bin/Release/Win32/*.dll", package:installdir("lib"))
os.cp("bin/Release/Win32/*.dll", package:installdir("bin"))
os.cp("lib/Release/Win32/*.lib", package:installdir("lib"))
end
if package:config("shared") then
package:addenv("PATH", "bin")
end
end)
on_install("linux", "macosx", function (package)
@ -72,9 +79,11 @@ package("glew")
local configs = {}
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
table.insert(configs, "-DBUILD_UTILS=" .. (package:config("build_utils") and "ON" or "OFF"))
import("package.tools.cmake").install(package, configs, {buildir = "build"})
if package:config("shared") then
os.cp("build/bin/*.dll", package:installdir("lib"))
os.cp("build/bin/*.dll", package:installdir("bin"))
package:addenv("PATH", "bin")
end
end)

@ -3,108 +3,69 @@ package("glfw")
set_homepage("https://www.glfw.org/")
set_description("GLFW is an Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development.")
if is_plat("windows", "mingw") then
if is_arch("x64", "x86_64") then
set_urls("https://github.com/glfw/glfw/releases/download/$(version)/glfw-$(version).bin.WIN64.zip")
add_versions("3.3.2", "aa291d8dce27d9e6cd567dc56e3768dcefceb3ddb7a65fb4cc3ef35be2a7548c")
else
set_urls("https://github.com/glfw/glfw/releases/download/$(version)/glfw-$(version).bin.WIN32.zip")
add_versions("3.3.2", "a2a5f93884f728dfc1bcb090fbdbb1015f1c1898b35a50fa17c7ade6761102b1")
end
elseif is_plat("macosx") then
set_urls("https://github.com/glfw/glfw/releases/download/$(version)/glfw-$(version).bin.MACOS.zip")
add_versions("3.3.2", "e412c75f850c320192df491ec3bf623847fafa847b46ffd3bbd7478057148f5a")
elseif is_plat("linux") then
set_urls("https://github.com/glfw/glfw/releases/download/$(version)/glfw-$(version).zip")
add_versions("3.3.2", "08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7")
add_deps("cmake")
end
add_urls("https://github.com/glfw/glfw/archive/$(version).tar.gz",
"https://github.com/glfw/glfw.git")
add_versions("3.3.2", "98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537")
add_configs("include_none", {description = "Adds the GLFW_INCLUDE_NONE Preprocessor Macro to disable all OpenGL includes inside GLFW", default = true, type = "boolean"})
add_configs("glfw_include", {description = "Choose submodules enabled in glfw", default = "none", type = "string", values = {"none", "vulkan", "glu", "glext", "es2", "es3"}})
add_deps("cmake")
if is_plat("macosx") then
add_frameworks("Cocoa", "IOKit")
elseif is_plat("windows") then
add_syslinks("user32", "shell32", "gdi32")
elseif is_plat("mingw@windows") then
add_syslinks("gdi32")
elseif is_plat("linux") then
-- TODO: add wayland support
add_deps("libx11", "libxrandr", "libxrender", "libxinerama", "libxcursor", "libxi", "libxext")
add_syslinks("dl", "pthread")
add_defines("_GLFW_X11")
end
on_load(function (package)
if package:config("shared") then
if package:is_plat("windows", "mingw") then
package:add("defines", "GLFW_DLL")
package:add("links", "glfw3dll")
elseif package:is_plat("macosx") then
package:add("links", "glfw")
end
else
if package:is_plat("windows", "mingw") then
package:add("links", "glfw3")
if package:is_plat("windows") then
package:add("syslinks", "user32", "shell32")
end
package:add("syslinks", "gdi32")
elseif package:is_plat("macosx") then
package:add("links", "glfw3")
elseif package:is_plat("linux") then
package:add("syslinks", "dl", "pthread")
end
end
if package:config("include_none") then
package:add("defines", "GLFW_INCLUDE_NONE")
end
package:add("defines", "GLFW_INCLUDE_" .. package:config("glfw_include"):upper())
end)
on_install("windows", function (package)
os.cp("include/*", package:installdir("include"))
local pathlist = os.args(package:build_getenv("cxx")):split('\\')
local msvc_ver = pathlist[table.getn(pathlist)-9]
os.cp("lib-vc"..msvc_ver.."/*.lib", package:installdir("lib"))
os.cp("lib-vc"..msvc_ver.."/*.dll", package:installdir("lib"))
end)
on_install("mingw", function (package)
os.cp("include/*", package:installdir("include"))
if is_arch("x64", "x86_64") then
os.cp("lib-mingw-w64/*.a", package:installdir("lib"))
os.cp("lib-mingw-w64/*.dll", package:installdir("lib"))
else
os.cp("lib-mingw/*.a", package:installdir("lib"))
os.cp("lib-mingw/*.dll", package:installdir("lib"))
end
end)
on_install("macosx", function (package)
os.cp("include/*", package:installdir("include"))
os.cp("lib-macos/*.a", package:installdir("lib"))
os.cp("lib-macos/*.dylib", package:installdir("lib"))
end)
on_install("linux", function (package)
local configs = {}
table.insert(configs, "-DGLFW_BUILD_DOCS=OFF")
table.insert(configs, "-DGLFW_BUILD_TESTS=OFF")
table.insert(configs, "-DGLFW_BUILD_EXAMPLES=OFF")
on_install("macosx", "windows", "linux", "mingw", function (package)
local configs = {"-DGLFW_BUILD_DOCS=OFF", "-DGLFW_BUILD_TESTS=OFF", "-DGLFW_BUILD_EXAMPLES=OFF"}
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
-- patch missing libxrender/includes
local cflags = {}
local fetchinfo = package:dep("libxrender"):fetch()
if fetchinfo then
for _, includedir in ipairs(fetchinfo.includedirs) do
table.insert(cflags, "-I" .. includedir)
if is_plat("windows") and vs_runtime and vs_runtime:startswith("MD") then
table.insert(configs, "-DUSE_MSVC_RUNTIME_LIBRARY_DLL")
elseif is_plat("linux") then
-- patch missing libxrender/includes
local cflags = {}
local fetchinfo = package:dep("libxrender"):fetch()
if fetchinfo then
for _, includedir in ipairs(fetchinfo.includedirs) do
table.insert(cflags, "-I" .. includedir)
end
end
if #cflags > 0 then
table.insert(configs, "-DCMAKE_C_FLAGS=" .. table.concat(cflags, " "))
end
end
if #cflags > 0 then
table.insert(configs, "-DCMAKE_C_FLAGS=" .. table.concat(cflags, " "))
import("package.tools.cmake").install(package, configs, {buildir = "build"})
if is_host("windows") and package:config("shared") then
os.trycp("build/install/bin", package:installdir())
package:addenv("PATH", "bin")
end
import("package.tools.cmake").install(package, configs)
end)
on_test(function (package)
local cxflags
if not package:config("shared") and package:is_plat("windows") then
cxflags = "/MD"
end
assert(package:has_cfuncs("glfwInit", {includes = "GLFW/glfw3.h", configs = {cxflags = cxflags}}))
assert(package:check_csnippets([[
void test() {
glfwInit();
glfwTerminate();
}
<<<<<<< HEAD
<<<<<<< HEAD
]], {configs = {languages = "c11"}, includes = "GLFW/glfw3.h"}))
=======
]], {languages = "c11", includes = "GLFW/glfw3.h"}))
>>>>>>> cc78b65 (rewrite glfw/xmake.lua)
=======
]], {configs = {languages = "c11"}, includes = "GLFW/glfw3.h"}))
>>>>>>> 729104c (activate ci)
end)

Loading…
Cancel
Save