From e400c9aa8ee5c86a7fc0d6d0478a964791e4cefe Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 17 Sep 2024 16:00:51 +0800 Subject: [PATCH 1/3] emscripten-glfw: add package --- packages/e/emscripten-glfw/xmake.lua | 67 ++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 packages/e/emscripten-glfw/xmake.lua diff --git a/packages/e/emscripten-glfw/xmake.lua b/packages/e/emscripten-glfw/xmake.lua new file mode 100644 index 00000000000..8b661c2cbfc --- /dev/null +++ b/packages/e/emscripten-glfw/xmake.lua @@ -0,0 +1,67 @@ +package("emscripten-glfw") + set_homepage("https://pongasoft.github.io/emscripten-glfw/test/demo/main.html") + set_description("This project is an emscripten port of GLFW written in C++ for the web/webassembly platform #wasm") + set_license("Apache-2.0") + + add_urls("https://github.com/pongasoft/emscripten-glfw.git") + add_urls("https://github.com/pongasoft/emscripten-glfw/archive/refs/tags/$(version).tar.gz", { + alias = "github", + version = function (version) + return "v3.4.0." .. tostring(version):gsub("%.", "") + end + }) + add_urls("https://github.com/pongasoft/emscripten-glfw/releases/download/v$(version)/emscripten-glfw3-$(version).zip", { + alias = "release", + version = function (version) + return "3.4.0." .. tostring(version):gsub("%.", "") + end + }) + + add_versions("github:2024.09.07", "ad4eea0c52ce61921da18e9fc8b6402a4a2e4515a8c783e2f1ae62671ab23fe3") + + add_versions("release:2024.09.07", "bddd7b7b3b34e5799024f7dd618435c391a420ca21c2fb0252b4ae68c8e07c89") + + add_configs("joystick", {description = "Enable joystick support", default = true, type = "boolean"}) + add_configs("multi_window", {description = "Enable multi window support", default = true, type = "boolean"}) + + add_syslinks("GL") + + add_deps("cmake") + + on_load(function (package) + if not package:is_debug() then + package:add("defines", "EMSCRIPTEN_GLFW3_DISABLE_WARNING") + end + if not package:config("joystick") then + package:add("defines", "EMSCRIPTEN_GLFW3_DISABLE_JOYSTICK") + end + if not package:config("multi_window") then + package:add("defines", "EMSCRIPTEN_GLFW3_DISABLE_MULTI_WINDOW_SUPPORT") + end + end) + + on_install("wasm", function (package) + io.replace("CMakeLists.txt", "if(CMAKE_CURRENT_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)", + [[ include(GNUInstallDirs) + install(TARGETS ${target} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + install(DIRECTORY external/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES src/js/lib_emscripten_glfw3.js DESTINATION ${CMAKE_INSTALL_LIBDIR}) + if(0)]], {plain = true}) + + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DEMSCRIPTEN_GLFW3_DISABLE_JOYSTICK=" .. (package:config("joystick") and "OFF" or "ON")) + table.insert(configs, "-DEMSCRIPTEN_GLFW3_DISABLE_MULTI_WINDOW_SUPPORT =" .. (package:config("multi_window") and "OFF" or "ON")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("glfwInit", {includes = "GLFW/glfw3.h"})) + assert(package:has_cfuncs("emscripten_glfw_open_url", {includes = "GLFW/emscripten_glfw3.h"})) + end) From aaac21c06f8d1ba7ffafe3f2125564eec5c9b794 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 21 Sep 2024 01:20:31 +0800 Subject: [PATCH 2/3] fix links --- packages/e/emscripten-glfw/xmake.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/e/emscripten-glfw/xmake.lua b/packages/e/emscripten-glfw/xmake.lua index 8b661c2cbfc..c8cf70a3be9 100644 --- a/packages/e/emscripten-glfw/xmake.lua +++ b/packages/e/emscripten-glfw/xmake.lua @@ -50,7 +50,7 @@ package("emscripten-glfw") ) install(DIRECTORY external/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES src/js/lib_emscripten_glfw3.js DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES src/js/lib_emscripten_glfw3.js DESTINATION ${CMAKE_INSTALL_BINDIR}) if(0)]], {plain = true}) local configs = {} @@ -59,6 +59,12 @@ package("emscripten-glfw") table.insert(configs, "-DEMSCRIPTEN_GLFW3_DISABLE_JOYSTICK=" .. (package:config("joystick") and "OFF" or "ON")) table.insert(configs, "-DEMSCRIPTEN_GLFW3_DISABLE_MULTI_WINDOW_SUPPORT =" .. (package:config("multi_window") and "OFF" or "ON")) import("package.tools.cmake").install(package, configs) + + package:add("ldflags", + "--js-library", + package:installdir("bin/lib_emscripten_glfw3.js"), + os.files(package:installdir("lib/*.a"))[1] + ) end) on_test(function (package) From 6765677f4eacb3400bd9420f26b88e460925f191 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 22 Sep 2024 20:58:27 +0800 Subject: [PATCH 3/3] improve download --- packages/e/emscripten-glfw/xmake.lua | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/e/emscripten-glfw/xmake.lua b/packages/e/emscripten-glfw/xmake.lua index c8cf70a3be9..93069c94d0a 100644 --- a/packages/e/emscripten-glfw/xmake.lua +++ b/packages/e/emscripten-glfw/xmake.lua @@ -5,21 +5,12 @@ package("emscripten-glfw") add_urls("https://github.com/pongasoft/emscripten-glfw.git") add_urls("https://github.com/pongasoft/emscripten-glfw/archive/refs/tags/$(version).tar.gz", { - alias = "github", version = function (version) return "v3.4.0." .. tostring(version):gsub("%.", "") end }) - add_urls("https://github.com/pongasoft/emscripten-glfw/releases/download/v$(version)/emscripten-glfw3-$(version).zip", { - alias = "release", - version = function (version) - return "3.4.0." .. tostring(version):gsub("%.", "") - end - }) - - add_versions("github:2024.09.07", "ad4eea0c52ce61921da18e9fc8b6402a4a2e4515a8c783e2f1ae62671ab23fe3") - add_versions("release:2024.09.07", "bddd7b7b3b34e5799024f7dd618435c391a420ca21c2fb0252b4ae68c8e07c89") + add_versions("2024.09.07", "ad4eea0c52ce61921da18e9fc8b6402a4a2e4515a8c783e2f1ae62671ab23fe3") add_configs("joystick", {description = "Enable joystick support", default = true, type = "boolean"}) add_configs("multi_window", {description = "Enable multi window support", default = true, type = "boolean"})