fix glfw

4 years ago · ec52791083
parent 47c659ec8a
commit ec52791083
1 changed files with 2 additions and 10 deletions
--- a/packages/g/glfw/xmake.lua
+++ b/packages/g/glfw/xmake.lua
@ -54,18 +54,10 @@ package("glfw")
    end)

    on_test(function (package)
-        assert(package:check_csnippets([[
+        assert(package:check_csnippets({test = [[
            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)
+        ]]}, {configs = {languages = "c11"}, includes = "GLFW/glfw3.h"}))
    end)