xq114 4 年之前
父节点
当前提交
ec52791083
共有 1 个文件被更改,包括 2 次插入10 次删除
  1. 2 10
      packages/g/glfw/xmake.lua

+ 2 - 10
packages/g/glfw/xmake.lua

@@ -54,18 +54,10 @@ package("glfw")
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)
-        assert(package:check_csnippets([[
+        assert(package:check_csnippets({test = [[
             void test() {
             void test() {
                 glfwInit();
                 glfwInit();
                 glfwTerminate();
                 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)
     end)