diff options
| author | Liu <[email protected]> | 2019-12-02 21:32:50 +0800 |
|---|---|---|
| committer | Liu <[email protected]> | 2019-12-02 21:33:15 +0800 |
| commit | 30d4183095aa5dcdb9cbe00b1b48e45ca31424fe (patch) | |
| tree | b8e47b54d84dab64cc9a65e101fcc947e52ea6cc | |
| parent | 45b739d927c89d93d85f626ab77dee70746c1cd3 (diff) | |
clear tail white space
109 files changed, 212 insertions, 212 deletions
@@ -236,7 +236,7 @@ add_rules("mode.debug", "mode.release") target("console") set_kind("binary") - add_files("src/*.c") + add_files("src/*.c") if is_mode("debug") then add_defines("DEBUG") end diff --git a/README_zh.md b/README_zh.md index 6a7af96bd..5535f5a6a 100644 --- a/README_zh.md +++ b/README_zh.md @@ -235,7 +235,7 @@ add_rules("mode.debug", "mode.release") target("console") set_kind("binary") - add_files("src/*.c") + add_files("src/*.c") if is_mode("debug") then add_defines("DEBUG") end diff --git a/core/src/lcurses/xmake.lua b/core/src/lcurses/xmake.lua index 6280b33a0..c4714c316 100644 --- a/core/src/lcurses/xmake.lua +++ b/core/src/lcurses/xmake.lua @@ -11,7 +11,7 @@ target("lcurses") end -- add the common source files - add_files("lcurses.c") + add_files("lcurses.c") -- add options if is_plat("windows") then diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua index ccf385cc9..d0aea2473 100644 --- a/core/src/luajit/xmake.lua +++ b/core/src/luajit/xmake.lua @@ -28,7 +28,7 @@ target("luajit") add_includedirs("luajit/src", {public = true}) -- add the common source files - add_files("luajit/src/*.c|ljamalg.c|luajit.c") + add_files("luajit/src/*.c|ljamalg.c|luajit.c") if is_plat("windows") then add_files(autogendir .. "/lj_vm.obj") else diff --git a/core/src/pdcurses/xmake.lua b/core/src/pdcurses/xmake.lua index 865d20351..ecbeb62e0 100644 --- a/core/src/pdcurses/xmake.lua +++ b/core/src/pdcurses/xmake.lua @@ -8,7 +8,7 @@ target("pdcurses") add_includedirs("pdcurses", {public = true}) -- add the common source files - add_files("pdcurses/pdcurses/*.c", "pdcurses/win32/*.c") + add_files("pdcurses/pdcurses/*.c", "pdcurses/win32/*.c") -- add defines add_defines("PDC_WIDE") diff --git a/core/xmake.lua b/core/xmake.lua index 0082eff5c..f7df1d282 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -24,7 +24,7 @@ add_defines("_GNU_SOURCE=1", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE") -- for the windows platform (msvc) if is_plat("windows") then - add_cxflags("-MT") + add_cxflags("-MT") add_ldflags("-nodefaultlib:msvcrt.lib") add_links("kernel32", "user32", "gdi32") end diff --git a/tests/apis/add_deps/xmake.lua b/tests/apis/add_deps/xmake.lua index 566da01f9..54c3fcf7a 100644 --- a/tests/apis/add_deps/xmake.lua +++ b/tests/apis/add_deps/xmake.lua @@ -1,7 +1,7 @@ target("dep1") set_kind("static") - add_files("src/*.c") + add_files("src/*.c") add_cflags("-DFLAG1") add_cflags("-DFLAG2", {interface = true}) add_includedirs("inc1", {public = true}) @@ -10,7 +10,7 @@ target("dep1") target("dep2") set_kind("shared") add_deps("dep1") - add_files("src/*.c") + add_files("src/*.c") add_includedirs("inc2", {interface = true}) add_defines("TEST2", {interface = true}) @@ -30,12 +30,12 @@ target("dep2") target("dep3") set_kind("static") - add_files("src/*.c") + add_files("src/*.c") add_includedirs("inc3") target("dep4") set_kind("static") - add_files("src/*.c") + add_files("src/*.c") add_includedirs("inc4", {public = true}) add_defines("TEST4", {public = true}) @@ -43,4 +43,4 @@ target("demo") set_kind("binary") add_deps("dep2", "dep3") add_deps("dep4", {inherit = false}) - add_files("src/*.c") + add_files("src/*.c") diff --git a/tests/projects/c++/console/xmake.lua b/tests/projects/c++/console/xmake.lua index f6beb31d8..9ab7f42ca 100644 --- a/tests/projects/c++/console/xmake.lua +++ b/tests/projects/c++/console/xmake.lua @@ -8,5 +8,5 @@ target("console_c++") set_kind("binary") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/class/xmake.lua b/tests/projects/c++/modules/class/xmake.lua index f0dcc3ea7..a3bc3a394 100644 --- a/tests/projects/c++/modules/class/xmake.lua +++ b/tests/projects/c++/modules/class/xmake.lua @@ -1,5 +1,5 @@ target("class") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/dependence/xmake.lua b/tests/projects/c++/modules/dependence/xmake.lua index 4a2608cd3..14d6ca17c 100644 --- a/tests/projects/c++/modules/dependence/xmake.lua +++ b/tests/projects/c++/modules/dependence/xmake.lua @@ -1,6 +1,6 @@ target("dependence") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_files("src/*.cpp", "src/*.mpp") set_languages("c++11") diff --git a/tests/projects/c++/modules/hello/xmake.lua b/tests/projects/c++/modules/hello/xmake.lua index e22047e4b..6c3bff19a 100644 --- a/tests/projects/c++/modules/hello/xmake.lua +++ b/tests/projects/c++/modules/hello/xmake.lua @@ -1,5 +1,5 @@ target("hello") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/impl_unit/xmake.lua b/tests/projects/c++/modules/impl_unit/xmake.lua index 1ce6cb8b6..3d19e0908 100644 --- a/tests/projects/c++/modules/impl_unit/xmake.lua +++ b/tests/projects/c++/modules/impl_unit/xmake.lua @@ -1,5 +1,5 @@ target("impl_unit") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/inline_and_template/xmake.lua b/tests/projects/c++/modules/inline_and_template/xmake.lua index e22a0ef04..c0722cccc 100644 --- a/tests/projects/c++/modules/inline_and_template/xmake.lua +++ b/tests/projects/c++/modules/inline_and_template/xmake.lua @@ -1,6 +1,6 @@ target("inline_and_template") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_files("src/*.cpp", "src/*.mpp") set_languages("c++11") diff --git a/tests/projects/c++/shared_library/xmake.lua b/tests/projects/c++/shared_library/xmake.lua index cd423db3b..4410e1aa7 100644 --- a/tests/projects/c++/shared_library/xmake.lua +++ b/tests/projects/c++/shared_library/xmake.lua @@ -8,7 +8,7 @@ target("shared_library_c++") set_kind("shared") -- add files - add_files("src/interface.cpp") + add_files("src/interface.cpp") -- add target target("test") @@ -20,6 +20,6 @@ target("test") add_deps("shared_library_c++") -- add files - add_files("src/test.cpp") + add_files("src/test.cpp") diff --git a/tests/projects/c++/static_library/xmake.lua b/tests/projects/c++/static_library/xmake.lua index b084aab18..9c82ee074 100644 --- a/tests/projects/c++/static_library/xmake.lua +++ b/tests/projects/c++/static_library/xmake.lua @@ -8,7 +8,7 @@ target("static_library_c++") set_kind("static") -- add files - add_files("src/interface.cpp") + add_files("src/interface.cpp") -- add target target("test") @@ -20,6 +20,6 @@ target("test") add_deps("static_library_c++") -- add files - add_files("src/test.cpp") + add_files("src/test.cpp") diff --git a/tests/projects/c/console/xmake.lua b/tests/projects/c/console/xmake.lua index a9106daff..547d0f101 100644 --- a/tests/projects/c/console/xmake.lua +++ b/tests/projects/c/console/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,5 +9,5 @@ target("console_c") set_kind("binary") -- add files - add_files("src/*.c") + add_files("src/*.c") diff --git a/tests/projects/c/shared_library/xmake.lua b/tests/projects/c/shared_library/xmake.lua index 48ccc67b3..6507658c6 100644 --- a/tests/projects/c/shared_library/xmake.lua +++ b/tests/projects/c/shared_library/xmake.lua @@ -2,11 +2,11 @@ add_rules("mode.release", "mode.debug") target("shared_library_c") set_kind("shared") - add_files("src/interface.c") + add_files("src/interface.c") target("test") set_kind("binary") add_deps("shared_library_c") - add_files("src/test.c") + add_files("src/test.c") diff --git a/tests/projects/c/static library with spaces/xmake.lua b/tests/projects/c/static library with spaces/xmake.lua index 318c286ee..b35709072 100644 --- a/tests/projects/c/static library with spaces/xmake.lua +++ b/tests/projects/c/static library with spaces/xmake.lua @@ -28,7 +28,7 @@ target("static_library_c") set_kind("static") -- add files - add_files("s r c/interface.c") + add_files("s r c/interface.c") -- add target target("test") @@ -40,6 +40,6 @@ target("test") add_deps("static_library_c") -- add files - add_files("s r c/test.c") + add_files("s r c/test.c") diff --git a/tests/projects/c/static_library/xmake.lua b/tests/projects/c/static_library/xmake.lua index c3cc56e1a..67081b1c2 100644 --- a/tests/projects/c/static_library/xmake.lua +++ b/tests/projects/c/static_library/xmake.lua @@ -2,11 +2,11 @@ add_rules("mode.release", "mode.debug") target("static_library_c") set_kind("static") - add_files("src/interface.c") + add_files("src/interface.c") target("test") set_kind("binary") add_deps("static_library_c") - add_files("src/test.c") + add_files("src/test.c") diff --git a/tests/projects/dlang/console/xmake.lua b/tests/projects/dlang/console/xmake.lua index 474c15ec2..374a6826a 100644 --- a/tests/projects/dlang/console/xmake.lua +++ b/tests/projects/dlang/console/xmake.lua @@ -8,5 +8,5 @@ target("console_dlang") set_kind("binary") -- add files - add_files("src/*.d") + add_files("src/*.d") diff --git a/tests/projects/dlang/shared_library/xmake.lua b/tests/projects/dlang/shared_library/xmake.lua index ced757e5e..7fa8b3b8a 100644 --- a/tests/projects/dlang/shared_library/xmake.lua +++ b/tests/projects/dlang/shared_library/xmake.lua @@ -8,7 +8,7 @@ target("interfaces") set_kind("shared") -- add files - add_files("src/interfaces.d") + add_files("src/interfaces.d") -- add target target("test") @@ -20,7 +20,7 @@ target("test") add_deps("interfaces") -- add files - add_files("src/main.d") + add_files("src/main.d") -- add links add_links("interfaces") diff --git a/tests/projects/dlang/static_library/xmake.lua b/tests/projects/dlang/static_library/xmake.lua index 238aa1197..74699bb04 100644 --- a/tests/projects/dlang/static_library/xmake.lua +++ b/tests/projects/dlang/static_library/xmake.lua @@ -8,7 +8,7 @@ target("interfaces") set_kind("static") -- add files - add_files("src/interfaces.d") + add_files("src/interfaces.d") -- add target target("test") @@ -20,7 +20,7 @@ target("test") add_deps("interfaces") -- add files - add_files("src/main.d") + add_files("src/main.d") -- add links add_links("interfaces") diff --git a/tests/projects/go/console/xmake.lua b/tests/projects/go/console/xmake.lua index cae347a8d..b263bdac7 100644 --- a/tests/projects/go/console/xmake.lua +++ b/tests/projects/go/console/xmake.lua @@ -8,5 +8,5 @@ target("console_go") set_kind("binary") -- add files - add_files("src/*.go") + add_files("src/*.go") diff --git a/tests/projects/go/static_library/xmake.lua b/tests/projects/go/static_library/xmake.lua index 560d67292..8284fb983 100644 --- a/tests/projects/go/static_library/xmake.lua +++ b/tests/projects/go/static_library/xmake.lua @@ -8,7 +8,7 @@ target("module") set_kind("static") -- add files - add_files("src/test/*.go") + add_files("src/test/*.go") -- add target target("test") @@ -20,7 +20,7 @@ target("test") add_deps("module") -- add files - add_files("src/*.go") + add_files("src/*.go") -- add link directory add_linkdirs("$(buildir)/$(plat)/$(arch)/$(mode)") diff --git a/tests/projects/hybrid/static_library/xmake.lua b/tests/projects/hybrid/static_library/xmake.lua index bc382c7c3..5d0ef1494 100644 --- a/tests/projects/hybrid/static_library/xmake.lua +++ b/tests/projects/hybrid/static_library/xmake.lua @@ -4,20 +4,20 @@ target("test") set_kind("static") add_files("src/*.c", "src/*.cpp") if is_plat("macosx") then - add_files("src/*.m", "src/*.mm") + add_files("src/*.m", "src/*.mm") end target("demo") set_kind("binary") add_deps("test") - add_files("src/main.cpp") + add_files("src/main.cpp") if is_plat("macosx") then add_defines("MACOSX") end target("demo2") set_kind("binary") - add_files("src/main2.cpp", "src/*.d") + add_files("src/main2.cpp", "src/*.d") if not is_plat("macosx") then set_enabled(false) end diff --git a/tests/projects/objc++/console/xmake.lua b/tests/projects/objc++/console/xmake.lua index 8fba2d568..d701c3723 100644 --- a/tests/projects/objc++/console/xmake.lua +++ b/tests/projects/objc++/console/xmake.lua @@ -18,5 +18,5 @@ target("console_objc++") set_kind("binary") -- add files - add_files("src/*.mm") + add_files("src/*.mm") diff --git a/tests/projects/objc++/modulemap/xmake.lua b/tests/projects/objc++/modulemap/xmake.lua index a7cdbc308..efd641f1b 100644 --- a/tests/projects/objc++/modulemap/xmake.lua +++ b/tests/projects/objc++/modulemap/xmake.lua @@ -1,6 +1,6 @@ target("modulemap") set_kind("binary") - add_files("src/*.mm", "src/*.m") + add_files("src/*.mm", "src/*.m") add_mxxflags("-fmodules", "-fcxx-modules", "-fmodule-map-file=src/module.modulemap") diff --git a/tests/projects/objc/console/xmake.lua b/tests/projects/objc/console/xmake.lua index 440ce0ffb..5073b3b0f 100644 --- a/tests/projects/objc/console/xmake.lua +++ b/tests/projects/objc/console/xmake.lua @@ -18,5 +18,5 @@ target("console_objc") set_kind("binary") -- add files - add_files("src/*.m") + add_files("src/*.m") diff --git a/tests/projects/objc/modulemap/xmake.lua b/tests/projects/objc/modulemap/xmake.lua index db00678f2..1aad626b0 100644 --- a/tests/projects/objc/modulemap/xmake.lua +++ b/tests/projects/objc/modulemap/xmake.lua @@ -1,6 +1,6 @@ target("modulemap") set_kind("binary") - add_files("src/*.m") + add_files("src/*.m") add_mflags("-fmodules", "-fmodule-map-file=src/module.modulemap") diff --git a/tests/projects/other/merge_archive/xmake.lua b/tests/projects/other/merge_archive/xmake.lua index 81b22c5e0..86a08ab8a 100644 --- a/tests/projects/other/merge_archive/xmake.lua +++ b/tests/projects/other/merge_archive/xmake.lua @@ -2,18 +2,18 @@ add_rules("mode.debug", "mode.release") target("add") set_kind("static") - add_files("src/add.c") + add_files("src/add.c") set_targetdir("$(buildir)/merge_archive") target("sub") set_kind("static") - add_files("src/sub.c") + add_files("src/sub.c") set_targetdir("$(buildir)/merge_archive") target("mul") set_kind("static") add_deps("add", "sub") - add_files("src/mul.c") + add_files("src/mul.c") if is_plat("windows") then add_files("$(buildir)/merge_archive/*.lib") else diff --git a/tests/projects/other/merge_object/xmake.lua b/tests/projects/other/merge_object/xmake.lua index 772bc2c18..8e634b03c 100644 --- a/tests/projects/other/merge_object/xmake.lua +++ b/tests/projects/other/merge_object/xmake.lua @@ -8,7 +8,7 @@ target("merge_object") set_kind("static") -- add files - add_files("src/interface.c") + add_files("src/interface.c") -- save object file after_build_file(function (target, sourcefile) @@ -25,7 +25,7 @@ target("test") add_deps("merge_object") -- add files - add_files("src/test.c") + add_files("src/test.c") if is_plat("windows") then add_files("$(buildir)/merge_object/interface.c.obj") else diff --git a/tests/projects/package/basic/xmake.lua b/tests/projects/package/basic/xmake.lua index b7ec6919d..b7e6c67ea 100644 --- a/tests/projects/package/basic/xmake.lua +++ b/tests/projects/package/basic/xmake.lua @@ -14,7 +14,7 @@ target("console") set_kind("binary") -- add files - add_files("src/*.c") + add_files("src/*.c") -- add packages add_packages("tbox", "zlib", "pcre2", "luajit") diff --git a/tests/projects/qt/console/xmake.lua b/tests/projects/qt/console/xmake.lua index 249f52cdd..71b7ae892 100644 --- a/tests/projects/qt/console/xmake.lua +++ b/tests/projects/qt/console/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,5 +9,5 @@ target("qt_console") add_rules("qt.console") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") diff --git a/tests/projects/qt/console_static/xmake.lua b/tests/projects/qt/console_static/xmake.lua index 249f52cdd..71b7ae892 100644 --- a/tests/projects/qt/console_static/xmake.lua +++ b/tests/projects/qt/console_static/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,5 +9,5 @@ target("qt_console") add_rules("qt.console") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") diff --git a/tests/projects/qt/quickapp/xmake.lua b/tests/projects/qt/quickapp/xmake.lua index f71402a14..747f1a1dc 100644 --- a/tests/projects/qt/quickapp/xmake.lua +++ b/tests/projects/qt/quickapp/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,7 +12,7 @@ target("qt_demo") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/qml.qrc") diff --git a/tests/projects/qt/quickapp_static/xmake.lua b/tests/projects/qt/quickapp_static/xmake.lua index 563851141..05fd78e84 100644 --- a/tests/projects/qt/quickapp_static/xmake.lua +++ b/tests/projects/qt/quickapp_static/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- includes @@ -15,7 +15,7 @@ target("qt_demo") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/qml.qrc") -- add plugin: qml.QtQuick diff --git a/tests/projects/qt/shared_library/xmake.lua b/tests/projects/qt/shared_library/xmake.lua index c0679d6b1..3e855ddad 100644 --- a/tests/projects/qt/shared_library/xmake.lua +++ b/tests/projects/qt/shared_library/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,7 +12,7 @@ target("qt_demo") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") -- add defines add_defines("QT_DEMO_LIBRARY") diff --git a/tests/projects/qt/static_library/xmake.lua b/tests/projects/qt/static_library/xmake.lua index b69261d45..480c55f48 100644 --- a/tests/projects/qt/static_library/xmake.lua +++ b/tests/projects/qt/static_library/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,7 +12,7 @@ target("qt_demo") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") -- add frameworks add_frameworks("QtGui") diff --git a/tests/projects/qt/widgetapp/xmake.lua b/tests/projects/qt/widgetapp/xmake.lua index 1bee2e4b6..2554e52d8 100644 --- a/tests/projects/qt/widgetapp/xmake.lua +++ b/tests/projects/qt/widgetapp/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,10 +12,10 @@ target("qt_demo") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/mainwindow.ui") -- add files with Q_OBJECT meta (only for qt.moc) - add_files("src/mainwindow.h") + add_files("src/mainwindow.h") diff --git a/tests/projects/qt/widgetapp_static/xmake.lua b/tests/projects/qt/widgetapp_static/xmake.lua index 12fdd0715..9adeae04c 100644 --- a/tests/projects/qt/widgetapp_static/xmake.lua +++ b/tests/projects/qt/widgetapp_static/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- includes @@ -15,11 +15,11 @@ target("qt_demo") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/mainwindow.ui") -- add files with Q_OBJECT meta (only for qt.moc) - add_files("src/mainwindow.h") + add_files("src/mainwindow.h") -- add plugin: QSvgPlugin (optional) qt_add_static_plugins("QSvgPlugin", {linkdirs = "plugins/imageformats", links = {"qsvg", "Qt5Svg"}}) diff --git a/tests/projects/rust/console/xmake.lua b/tests/projects/rust/console/xmake.lua index b2c8efd39..868e70595 100644 --- a/tests/projects/rust/console/xmake.lua +++ b/tests/projects/rust/console/xmake.lua @@ -8,5 +8,5 @@ target("console_rust") set_kind("binary") -- add files - add_files("src/*.rs") + add_files("src/*.rs") diff --git a/tests/projects/rust/static_library/xmake.lua b/tests/projects/rust/static_library/xmake.lua index b873a4c9e..f66f48b0f 100644 --- a/tests/projects/rust/static_library/xmake.lua +++ b/tests/projects/rust/static_library/xmake.lua @@ -8,7 +8,7 @@ target("interfaces") set_kind("static") -- add files - add_files("src/interfaces.rs") + add_files("src/interfaces.rs") -- add target target("test") @@ -20,7 +20,7 @@ target("test") add_deps("interfaces") -- add files - add_files("src/main.rs") + add_files("src/main.rs") -- add link directory add_linkdirs("$(buildir)/$(mode)/$(arch)") diff --git a/tests/projects/swift/console/xmake.lua b/tests/projects/swift/console/xmake.lua index e792b81f0..a9440ef2d 100644 --- a/tests/projects/swift/console/xmake.lua +++ b/tests/projects/swift/console/xmake.lua @@ -8,5 +8,5 @@ target("console_swift") set_kind("binary") -- add files - add_files("src/*.swift") + add_files("src/*.swift") diff --git a/tests/projects/wdk/kmdf/ioctl/driver/nonpnp.c b/tests/projects/wdk/kmdf/ioctl/driver/nonpnp.c index 2e66a9e13..13f811f35 100644 --- a/tests/projects/wdk/kmdf/ioctl/driver/nonpnp.c +++ b/tests/projects/wdk/kmdf/ioctl/driver/nonpnp.c @@ -1187,7 +1187,7 @@ Return Value: goto End;
}
- #pragma prefast(suppress:6387, "If outBuf==NULL at this point, then outBufLen==0")
+ #pragma prefast(suppress:6387, "If outBuf==NULL at this point, then outBufLen==0")
status = WdfRequestProbeAndLockUserBufferForWrite(Request,
outBuf,
outBufLen,
diff --git a/tests/projects/wdk/kmdf/ioctl/xmake.lua b/tests/projects/wdk/kmdf/ioctl/xmake.lua index c630367b5..51d895655 100644 --- a/tests/projects/wdk/kmdf/ioctl/xmake.lua +++ b/tests/projects/wdk/kmdf/ioctl/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add include directories @@ -25,6 +25,6 @@ target("app") add_rules("wdk.env.kmdf", "wdk.binary") -- add files - add_files("exe/*.c") + add_files("exe/*.c") add_files("exe/*.inf") diff --git a/tests/projects/wdk/kmdf/serial/xmake.lua b/tests/projects/wdk/kmdf/serial/xmake.lua index 0a6143838..38b222e9d 100644 --- a/tests/projects/wdk/kmdf/serial/xmake.lua +++ b/tests/projects/wdk/kmdf/serial/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target diff --git a/tests/projects/wdk/umdf/echo/xmake.lua b/tests/projects/wdk/umdf/echo/xmake.lua index 582e9ee46..edb623793 100644 --- a/tests/projects/wdk/umdf/echo/xmake.lua +++ b/tests/projects/wdk/umdf/echo/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- enable unicode @@ -19,7 +19,7 @@ target("echo") -- set_values("wdk.sign.certfile", path.join(os.projectdir(), "xxx.cer")) -- add files - add_files("driver/*.c") + add_files("driver/*.c") add_files("driver/*.inx") -- add includedirs @@ -32,5 +32,5 @@ target("app") add_rules("wdk.env.umdf", "wdk.binary") -- add files - add_files("exe/*.cpp") + add_files("exe/*.cpp") diff --git a/tests/projects/wdk/umdf/skeleton/xmake.lua b/tests/projects/wdk/umdf/skeleton/xmake.lua index 0cd653885..82ca03e54 100644 --- a/tests/projects/wdk/umdf/skeleton/xmake.lua +++ b/tests/projects/wdk/umdf/skeleton/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- enable unicode @@ -16,7 +16,7 @@ target("UMDFSkeleton") -- add files add_files("*.cpp", {rule = "wdk.tracewpp"}) - add_files("*.rc", "*.inx") + add_files("*.rc", "*.inx") -- set umdf sdk version set_values("wdk.umdf.sdkver", "1.9") diff --git a/tests/projects/wdk/wdm/msdsm/xmake.lua b/tests/projects/wdk/wdm/msdsm/xmake.lua index 069f69767..0c5939a84 100644 --- a/tests/projects/wdk/wdm/msdsm/xmake.lua +++ b/tests/projects/wdk/wdm/msdsm/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target diff --git a/tests/projects/wdk/wdm/perfcounters/xmake.lua b/tests/projects/wdk/wdm/perfcounters/xmake.lua index 21a36ee4c..c5a51cd23 100644 --- a/tests/projects/wdk/wdm/perfcounters/xmake.lua +++ b/tests/projects/wdk/wdm/perfcounters/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -13,7 +13,7 @@ target("kcs") add_values("wdk.man.resource", "kcsCounters.rc") add_values("wdk.man.header", "kcsCounters.h") add_values("wdk.man.counter_header", "kcsCounters_counters.h") - + -- add files - add_files("*.c", "*.rc", "*.man") + add_files("*.c", "*.rc", "*.man") diff --git a/xmake/actions/require/impl/action/install.lua b/xmake/actions/require/impl/action/install.lua index d6ec9434c..74f8ba5fc 100644 --- a/xmake/actions/require/impl/action/install.lua +++ b/xmake/actions/require/impl/action/install.lua @@ -128,9 +128,9 @@ function main(package) -- the package scripts local scripts = { - package:script("install_before") + package:script("install_before") , package:script("install") - , package:script("install_after") + , package:script("install_after") } -- install the third-party package directly, e.g. brew::pcre2/libpcre2-8, conan::OpenSSL/1.0.2n@conan/stable diff --git a/xmake/actions/require/impl/action/test.lua b/xmake/actions/require/impl/action/test.lua index bd1a9edf8..72177a994 100644 --- a/xmake/actions/require/impl/action/test.lua +++ b/xmake/actions/require/impl/action/test.lua @@ -28,9 +28,9 @@ function main(package) -- the package scripts local scripts = { - package:script("test_before") + package:script("test_before") , package:script("test") - , package:script("test_after") + , package:script("test_after") } -- enter the test directory diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua index 139ebc3e5..d1ef9c6c3 100644 --- a/xmake/actions/require/impl/package.lua +++ b/xmake/actions/require/impl/package.lua @@ -36,10 +36,10 @@ import("repository") -- add_requires("zlib") -- add_requires("tbox >=1.5.1", "zlib >=1.2.11") -- add_requires("zlib master") --- add_requires("xmake-repo@tbox >=1.5.1") +-- add_requires("xmake-repo@tbox >=1.5.1") -- add_requires("aaa_bbb_ccc >=1.5.1 <1.6.0", {optional = true, alias = "mypkg", debug = true}) -- add_requires("tbox", {config = {coroutine = true, abc = "xxx"}}) --- add_requires("xmake::xmake-repo@tbox >=1.5.1") +-- add_requires("xmake::xmake-repo@tbox >=1.5.1") -- add_requires("conan::OpenSSL/1.0.2n@conan/stable") -- add_requires("brew::pcre2/libpcre2-8 10.x", {alias = "pcre2"}) -- diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 3349239a9..0e44ab58b 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -267,7 +267,7 @@ function _instance:lock(opt) if self:filelock():trylock(opt) then return true elseif option.get("diagnosis") then - utils.warning("the current package is being accessed by other processes, please waiting!") + utils.warning("the current package is being accessed by other processes, please waiting!") end local ok, errors = self:filelock():lock(opt) if not ok then diff --git a/xmake/core/project/option.lua b/xmake/core/project/option.lua index 292adacba..7507daef6 100644 --- a/xmake/core/project/option.lua +++ b/xmake/core/project/option.lua @@ -79,13 +79,13 @@ function _instance:_do_check() -- get conditions local links = self:get("links") - local snippets = self:get(kind .. "snippets") + local snippets = self:get(kind .. "snippets") local types = self:get(kind .. "types") local funcs = self:get(kind .. "funcs") local includes = self:get(kind .. "includes") -- TODO it is deprecated - local snippet = self:get(kind .. "snippet") + local snippet = self:get(kind .. "snippet") if snippet then snippets = table.join(snippets or {}, snippet) end diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 0c3802347..70af2acbb 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -748,7 +748,7 @@ end function _instance:targetdir() -- the target directory - local targetdir = self:get("targetdir") + local targetdir = self:get("targetdir") if not targetdir then -- get build directory diff --git a/xmake/core/sandbox/modules/import/core/project/project.lua b/xmake/core/sandbox/modules/import/core/project/project.lua index 83bb9fead..a92031395 100644 --- a/xmake/core/sandbox/modules/import/core/project/project.lua +++ b/xmake/core/sandbox/modules/import/core/project/project.lua @@ -169,7 +169,7 @@ function sandbox_core_project.lock(opt) if sandbox_core_project.trylock(opt) then return true elseif baseoption.get("diagnosis") then - utils.warning("the current project is being accessed by other processes, please waiting!") + utils.warning("the current project is being accessed by other processes, please waiting!") end local ok, errors = sandbox_core_project.filelock():lock(opt) if not ok then diff --git a/xmake/modules/detect/tools/find_devenv.lua b/xmake/modules/detect/tools/find_devenv.lua index ce633e649..5f5bd9de3 100644 --- a/xmake/modules/detect/tools/find_devenv.lua +++ b/xmake/modules/detect/tools/find_devenv.lua @@ -52,7 +52,7 @@ function main(opt) if vcvarsall then for _, vsvars in pairs(vcvarsall) do if vsvars.DevEnvdir and os.isexec(path.join(vsvars.DevEnvdir, "devenv.exe")) then - program = path.join(vsvars.DevEnvdir, "devenv.exe") + program = path.join(vsvars.DevEnvdir, "devenv.exe") end end end diff --git a/xmake/modules/lib/detect/pkg_config.lua b/xmake/modules/lib/detect/pkg_config.lua index 4e766e313..5bc63c18d 100644 --- a/xmake/modules/lib/detect/pkg_config.lua +++ b/xmake/modules/lib/detect/pkg_config.lua @@ -150,7 +150,7 @@ function libinfo(name, opt) for _, flag in ipairs(flags:split('%s')) do -- get links - local link = flag:match("%-l(.*)") + local link = flag:match("%-l(.*)") if link then result.links = result.links or {} table.insert(result.links, link) @@ -158,7 +158,7 @@ function libinfo(name, opt) -- get linkdirs local linkdirs = nil - local linkdir = flag:match("%-L(.*)") + local linkdir = flag:match("%-L(.*)") if linkdir and os.isdir(linkdir) then result.linkdirs = result.linkdirs or {} table.insert(result.linkdirs, linkdir) @@ -166,7 +166,7 @@ function libinfo(name, opt) -- get includedirs local includedirs = nil - local includedir = flag:match("%-I(.*)") + local includedir = flag:match("%-I(.*)") if includedir and os.isdir(includedir) then result.includedirs = result.includedirs or {} table.insert(result.includedirs, includedir) diff --git a/xmake/modules/net/ping.lua b/xmake/modules/net/ping.lua index 0292bbb9b..bdbcd7bc2 100644 --- a/xmake/modules/net/ping.lua +++ b/xmake/modules/net/ping.lua @@ -44,7 +44,7 @@ function main(hosts, opt) -- do not force ping? enable cache local cacheinfo = nil if not opt.force then - cacheinfo = cache.load("net.ping") + cacheinfo = cache.load("net.ping") end -- run tasks diff --git a/xmake/modules/private/action/require/packagenv.lua b/xmake/modules/private/action/require/packagenv.lua index dd95eff7e..466ffd160 100644 --- a/xmake/modules/private/action/require/packagenv.lua +++ b/xmake/modules/private/action/require/packagenv.lua @@ -33,7 +33,7 @@ function _enter_package(package_name, envs, installdir) end -- add the new environments - oldenvs.PATH = os.getenv("PATH") + oldenvs.PATH = os.getenv("PATH") for name, values in pairs(envs) do oldenvs[name] = oldenvs[name] or os.getenv(name) if name == "PATH" then diff --git a/xmake/modules/ui/app/version.lua b/xmake/modules/ui/app/version.lua index 4fd026ec0..03b5254f7 100644 --- a/xmake/modules/ui/app/version.lua +++ b/xmake/modules/ui/app/version.lua @@ -38,7 +38,7 @@ function app:init() self:background_set("blue") -- disable color code output - os.setenv("COLORTERM", "nocolor") + os.setenv("COLORTERM", "nocolor") -- get version info local version = os.iorun("xmake --version") diff --git a/xmake/platforms/android/config.lua b/xmake/platforms/android/config.lua index 0051f6448..df581dae0 100644 --- a/xmake/platforms/android/config.lua +++ b/xmake/platforms/android/config.lua @@ -56,7 +56,7 @@ end function _toolchains() -- get cross - local cross = config.get("cross") + local cross = config.get("cross") -- get gcc toolchain bin directory local gcc_toolchain_bin = nil diff --git a/xmake/platforms/cross/load.lua b/xmake/platforms/cross/load.lua index e44436da5..4198ad62b 100644 --- a/xmake/platforms/cross/load.lua +++ b/xmake/platforms/cross/load.lua @@ -25,7 +25,7 @@ import("core.project.config") function main(platform) -- init linkdirs and includedirs - local sdkdir = config.get("sdk") + local sdkdir = config.get("sdk") if sdkdir then local includedir = path.join(sdkdir, "include") if os.isdir(includedir) then diff --git a/xmake/platforms/linux/load.lua b/xmake/platforms/linux/load.lua index dcdacd8c1..848dcc54f 100644 --- a/xmake/platforms/linux/load.lua +++ b/xmake/platforms/linux/load.lua @@ -28,7 +28,7 @@ function main(platform) if config.get("cross") or config.get("bin") or config.get("sdk") then -- init linkdirs and includedirs - local sdkdir = config.get("sdk") + local sdkdir = config.get("sdk") if sdkdir then local includedir = path.join(sdkdir, "include") if os.isdir(includedir) then diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua index 29f0b28f7..878c9b8b2 100644 --- a/xmake/rules/c++/modules/xmake.lua +++ b/xmake/rules/c++/modules/xmake.lua @@ -20,6 +20,6 @@ -- define rule: c++.build.modules rule("c++.build.modules") - set_extensions(".mpp", ".mxx", ".cppm", ".ixx") + set_extensions(".mpp", ".mxx", ".cppm", ".ixx") before_build_files("build_modulefiles") diff --git a/xmake/rules/protobuf/proto.lua b/xmake/rules/protobuf/proto.lua index 41ae6a388..0a1d4d4df 100644 --- a/xmake/rules/protobuf/proto.lua +++ b/xmake/rules/protobuf/proto.lua @@ -32,7 +32,7 @@ function main(target, sourcekind, sourcefile_proto, opt) -- find protoc local protoc = target:data("protobuf.protoc") if not protoc and sourcekind == "cxx" then - protoc = find_tool("protoc") + protoc = find_tool("protoc") if protoc and protoc.program then target:data_set("protobuf.protoc", protoc.program) end diff --git a/xmake/rules/wdk/sign/sign.lua b/xmake/rules/wdk/sign/sign.lua index 934615db0..f2563b1e6 100644 --- a/xmake/rules/wdk/sign/sign.lua +++ b/xmake/rules/wdk/sign/sign.lua @@ -61,12 +61,12 @@ function main(target, filepath, mode) -- init arguments local argv = {"sign", "/v", "/t", timestamp} - local company = target:values("wdk.sign.company") + local company = target:values("wdk.sign.company") if company then table.insert(argv, "/n") table.insert(argv, company) end - local certfile = target:values("wdk.sign.certfile") + local certfile = target:values("wdk.sign.certfile") if certfile then table.insert(argv, "/ac") table.insert(argv, certfile) diff --git a/xmake/rules/wdk/sign/xmake.lua b/xmake/rules/wdk/sign/xmake.lua index 4344ea301..6786cb910 100644 --- a/xmake/rules/wdk/sign/xmake.lua +++ b/xmake/rules/wdk/sign/xmake.lua @@ -103,7 +103,7 @@ rule("wdk.sign") end -- get sign mode - local signmode = target:values("wdk.sign.mode") + local signmode = target:values("wdk.sign.mode") if not signmode then return end diff --git a/xmake/scripts/faq.lua b/xmake/scripts/faq.lua index 602c89c34..1a2154c7a 100644 --- a/xmake/scripts/faq.lua +++ b/xmake/scripts/faq.lua @@ -2,11 +2,11 @@ -- FAQ -- -- You can enter the project directory firstly before building project. --- +-- -- $ cd projectdir --- +-- -- 1. How to build project? --- +-- -- $ xmake -- -- 2. How to configure project? @@ -27,12 +27,12 @@ -- -- 5. How to install target to the system directory or other output directory? -- --- $ xmake install +-- $ xmake install -- $ xmake install -o installdir -- -- 6. Add some frequently-used compilation flags in xmake.lua -- --- @code +-- @code -- -- add debug and release modes -- add_rules("mode.debug", "mode.release") -- @@ -45,9 +45,9 @@ -- -- set language: c99, c++11 -- set_languages("c99", "c++11") -- --- -- set optimization: none, faster, fastest, smallest +-- -- set optimization: none, faster, fastest, smallest -- set_optimize("fastest") --- +-- -- -- add include search directories -- add_includedirs("/usr/include", "/usr/local/include") -- diff --git a/xmake/templates/c++/console/project/xmake.lua b/xmake/templates/c++/console/project/xmake.lua index 5ea3f6136..00499409f 100644 --- a/xmake/templates/c++/console/project/xmake.lua +++ b/xmake/templates/c++/console/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,6 +9,6 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") ${FAQ} diff --git a/xmake/templates/c++/qt.console/project/xmake.lua b/xmake/templates/c++/qt.console/project/xmake.lua index 4025a7218..855d487c3 100644 --- a/xmake/templates/c++/qt.console/project/xmake.lua +++ b/xmake/templates/c++/qt.console/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,6 +9,6 @@ target("${TARGETNAME}") add_rules("qt.console") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") ${FAQ} diff --git a/xmake/templates/c++/qt.quickapp/project/xmake.lua b/xmake/templates/c++/qt.quickapp/project/xmake.lua index 0a55677e8..3cd32674f 100644 --- a/xmake/templates/c++/qt.quickapp/project/xmake.lua +++ b/xmake/templates/c++/qt.quickapp/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,7 +12,7 @@ target("${TARGETNAME}") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/qml.qrc") ${FAQ} diff --git a/xmake/templates/c++/qt.quickapp_static/project/xmake.lua b/xmake/templates/c++/qt.quickapp_static/project/xmake.lua index b606b5f20..67d4933c5 100644 --- a/xmake/templates/c++/qt.quickapp_static/project/xmake.lua +++ b/xmake/templates/c++/qt.quickapp_static/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- includes @@ -15,7 +15,7 @@ target("${TARGETNAME}") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/qml.qrc") -- add plugin: qml.QtQuick diff --git a/xmake/templates/c++/qt.shared/project/xmake.lua b/xmake/templates/c++/qt.shared/project/xmake.lua index ac70b48de..2092e95a9 100644 --- a/xmake/templates/c++/qt.shared/project/xmake.lua +++ b/xmake/templates/c++/qt.shared/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,7 +12,7 @@ target("${TARGETNAME}") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") -- add defines add_defines("QT_DEMO_LIBRARY") diff --git a/xmake/templates/c++/qt.static/project/xmake.lua b/xmake/templates/c++/qt.static/project/xmake.lua index 2bf4505c5..36b1f6157 100644 --- a/xmake/templates/c++/qt.static/project/xmake.lua +++ b/xmake/templates/c++/qt.static/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,7 +12,7 @@ target("${TARGETNAME}") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") -- add frameworks add_frameworks("QtGui") diff --git a/xmake/templates/c++/qt.widgetapp/project/xmake.lua b/xmake/templates/c++/qt.widgetapp/project/xmake.lua index e7407f1fd..556113a3b 100644 --- a/xmake/templates/c++/qt.widgetapp/project/xmake.lua +++ b/xmake/templates/c++/qt.widgetapp/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -12,10 +12,10 @@ target("${TARGETNAME}") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/mainwindow.ui") -- add files with Q_OBJECT meta (only for qt.moc) - add_files("src/mainwindow.h") + add_files("src/mainwindow.h") ${FAQ} diff --git a/xmake/templates/c++/qt.widgetapp_static/project/xmake.lua b/xmake/templates/c++/qt.widgetapp_static/project/xmake.lua index fe4eb971c..2d3ad7c76 100644 --- a/xmake/templates/c++/qt.widgetapp_static/project/xmake.lua +++ b/xmake/templates/c++/qt.widgetapp_static/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- includes @@ -15,11 +15,11 @@ target("${TARGETNAME}") add_headerfiles("src/*.h") -- add files - add_files("src/*.cpp") + add_files("src/*.cpp") add_files("src/mainwindow.ui") -- add files with Q_OBJECT meta (only for qt.moc) - add_files("src/mainwindow.h") + add_files("src/mainwindow.h") -- add plugin: QSvgPlugin (optional) qt_add_static_plugins("QSvgPlugin", {linkdirs = "plugins/imageformats", links = {"qsvg", "Qt5Svg"}}) diff --git a/xmake/templates/c++/shared/project/xmake.lua b/xmake/templates/c++/shared/project/xmake.lua index 79ce52043..b4feb75ed 100644 --- a/xmake/templates/c++/shared/project/xmake.lua +++ b/xmake/templates/c++/shared/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,7 +9,7 @@ target("${TARGETNAME}") set_kind("shared") -- add files - add_files("src/interface.cpp") + add_files("src/interface.cpp") -- add target target("${TARGETNAME}_demo") @@ -21,6 +21,6 @@ target("${TARGETNAME}_demo") add_deps("${TARGETNAME}") -- add files - add_files("src/test.cpp") + add_files("src/test.cpp") ${FAQ} diff --git a/xmake/templates/c++/static_library/project/xmake.lua b/xmake/templates/c++/static_library/project/xmake.lua index c42aa839c..ade7a520d 100644 --- a/xmake/templates/c++/static_library/project/xmake.lua +++ b/xmake/templates/c++/static_library/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,7 +9,7 @@ target("${TARGETNAME}") set_kind("static") -- add files - add_files("src/interface.cpp") + add_files("src/interface.cpp") -- add target target("${TARGETNAME}_demo") @@ -21,6 +21,6 @@ target("${TARGETNAME}_demo") add_deps("${TARGETNAME}") -- add files - add_files("src/test.cpp") + add_files("src/test.cpp") ${FAQ} diff --git a/xmake/templates/c++/tbox.console/project/src/xmake.lua b/xmake/templates/c++/tbox.console/project/src/xmake.lua index 63056c764..8664f5347 100644 --- a/xmake/templates/c++/tbox.console/project/src/xmake.lua +++ b/xmake/templates/c++/tbox.console/project/src/xmake.lua @@ -11,5 +11,5 @@ target("${TARGETNAME}") add_packages("tbox") -- add files - add_files("*.cpp") + add_files("*.cpp") diff --git a/xmake/templates/c++/tbox.console/project/xmake.lua b/xmake/templates/c++/tbox.console/project/xmake.lua index 292b676c1..e2dc5c6e4 100644 --- a/xmake/templates/c++/tbox.console/project/xmake.lua +++ b/xmake/templates/c++/tbox.console/project/xmake.lua @@ -44,13 +44,13 @@ if is_plat("windows") then if is_mode("release") then -- link libcmt.lib - add_cxflags("-MT") + add_cxflags("-MT") -- the debug mode elseif is_mode("debug") then -- link libcmtd.lib - add_cxflags("-MTd") + add_cxflags("-MTd") end -- no msvcrt.lib @@ -58,14 +58,14 @@ if is_plat("windows") then end -- add syslinks -if is_plat("windows") then add_syslinks("ws2_32") -elseif is_plat("android") then add_syslinks("m", "c") +if is_plat("windows") then add_syslinks("ws2_32") +elseif is_plat("android") then add_syslinks("m", "c") else add_syslinks("pthread", "dl", "m", "c") end -- add requires add_requires("tbox", {debug = is_mode("debug")}) -- include project sources -includes("src") +includes("src") ${FAQ} diff --git a/xmake/templates/c++/tbox.shared/project/src/_demo/xmake.lua b/xmake/templates/c++/tbox.shared/project/src/_demo/xmake.lua index b17bd70b4..cbd73410b 100644 --- a/xmake/templates/c++/tbox.shared/project/src/_demo/xmake.lua +++ b/xmake/templates/c++/tbox.shared/project/src/_demo/xmake.lua @@ -11,7 +11,7 @@ target("demo") add_defines("__tb_prefix__=\"demo\"") -- add files - add_files("*.cpp") + add_files("*.cpp") -- add packages add_packages("tbox") diff --git a/xmake/templates/c++/tbox.shared/project/src/_library/xmake.lua b/xmake/templates/c++/tbox.shared/project/src/_library/xmake.lua index 46559ec9d..dd27e7cff 100644 --- a/xmake/templates/c++/tbox.shared/project/src/_library/xmake.lua +++ b/xmake/templates/c++/tbox.shared/project/src/_library/xmake.lua @@ -17,5 +17,5 @@ target("${TARGETNAME}") add_packages("tbox") -- add files - add_files("*.cpp") + add_files("*.cpp") diff --git a/xmake/templates/c++/tbox.shared/project/xmake.lua b/xmake/templates/c++/tbox.shared/project/xmake.lua index 02a9271a3..f2dec7a83 100644 --- a/xmake/templates/c++/tbox.shared/project/xmake.lua +++ b/xmake/templates/c++/tbox.shared/project/xmake.lua @@ -44,13 +44,13 @@ if is_plat("windows") then if is_mode("release") then -- link libcmt.lib - add_cxflags("-MT") + add_cxflags("-MT") -- the debug mode elseif is_mode("debug") then -- link libcmtd.lib - add_cxflags("-MTd") + add_cxflags("-MTd") end -- no msvcrt.lib @@ -58,14 +58,14 @@ if is_plat("windows") then end -- add syslinks -if is_plat("windows") then add_syslinks("ws2_32") -elseif is_plat("android") then add_syslinks("m", "c") +if is_plat("windows") then add_syslinks("ws2_32") +elseif is_plat("android") then add_syslinks("m", "c") else add_syslinks("pthread", "dl", "m", "c") end -- add requires add_requires("tbox", {debug = is_mode("debug")}) -- include project sources -includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") +includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") ${FAQ} diff --git a/xmake/templates/c++/tbox.static/project/src/_demo/xmake.lua b/xmake/templates/c++/tbox.static/project/src/_demo/xmake.lua index b17bd70b4..cbd73410b 100644 --- a/xmake/templates/c++/tbox.static/project/src/_demo/xmake.lua +++ b/xmake/templates/c++/tbox.static/project/src/_demo/xmake.lua @@ -11,7 +11,7 @@ target("demo") add_defines("__tb_prefix__=\"demo\"") -- add files - add_files("*.cpp") + add_files("*.cpp") -- add packages add_packages("tbox") diff --git a/xmake/templates/c++/tbox.static/project/src/_library/xmake.lua b/xmake/templates/c++/tbox.static/project/src/_library/xmake.lua index cb5f26ec6..1c7d3ea7b 100644 --- a/xmake/templates/c++/tbox.static/project/src/_library/xmake.lua +++ b/xmake/templates/c++/tbox.static/project/src/_library/xmake.lua @@ -17,5 +17,5 @@ target("${TARGETNAME}") add_packages("tbox") -- add files - add_files("*.cpp") + add_files("*.cpp") diff --git a/xmake/templates/c++/tbox.static/project/xmake.lua b/xmake/templates/c++/tbox.static/project/xmake.lua index 02a9271a3..f2dec7a83 100644 --- a/xmake/templates/c++/tbox.static/project/xmake.lua +++ b/xmake/templates/c++/tbox.static/project/xmake.lua @@ -44,13 +44,13 @@ if is_plat("windows") then if is_mode("release") then -- link libcmt.lib - add_cxflags("-MT") + add_cxflags("-MT") -- the debug mode elseif is_mode("debug") then -- link libcmtd.lib - add_cxflags("-MTd") + add_cxflags("-MTd") end -- no msvcrt.lib @@ -58,14 +58,14 @@ if is_plat("windows") then end -- add syslinks -if is_plat("windows") then add_syslinks("ws2_32") -elseif is_plat("android") then add_syslinks("m", "c") +if is_plat("windows") then add_syslinks("ws2_32") +elseif is_plat("android") then add_syslinks("m", "c") else add_syslinks("pthread", "dl", "m", "c") end -- add requires add_requires("tbox", {debug = is_mode("debug")}) -- include project sources -includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") +includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") ${FAQ} diff --git a/xmake/templates/c/console/project/xmake.lua b/xmake/templates/c/console/project/xmake.lua index dedb01e53..635cdc160 100644 --- a/xmake/templates/c/console/project/xmake.lua +++ b/xmake/templates/c/console/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,6 +9,6 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.c") + add_files("src/*.c") ${FAQ} diff --git a/xmake/templates/c/shared/project/xmake.lua b/xmake/templates/c/shared/project/xmake.lua index 4aaddabc9..b0f490620 100644 --- a/xmake/templates/c/shared/project/xmake.lua +++ b/xmake/templates/c/shared/project/xmake.lua @@ -1,5 +1,5 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -9,7 +9,7 @@ target("${TARGETNAME}") set_kind("shared") -- add files - add_files("src/interface.c") + add_files("src/interface.c") -- add target target("${TARGETNAME}_demo") @@ -21,6 +21,6 @@ target("${TARGETNAME}_demo") add_deps("${TARGETNAME}") -- add files - add_files("src/test.c") + add_files("src/test.c") ${FAQ} diff --git a/xmake/templates/c/static/project/xmake.lua b/xmake/templates/c/static/project/xmake.lua index a01a4407d..632776b96 100644 --- a/xmake/templates/c/static/project/xmake.lua +++ b/xmake/templates/c/static/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,7 +8,7 @@ target("${TARGETNAME}") set_kind("static") -- add files - add_files("src/interface.c") + add_files("src/interface.c") -- add target target("${TARGETNAME}_demo") @@ -20,6 +20,6 @@ target("${TARGETNAME}_demo") add_deps("${TARGETNAME}") -- add files - add_files("src/test.c") + add_files("src/test.c") ${FAQ} diff --git a/xmake/templates/c/tbox.console/project/src/xmake.lua b/xmake/templates/c/tbox.console/project/src/xmake.lua index 16287c25b..22773aad5 100644 --- a/xmake/templates/c/tbox.console/project/src/xmake.lua +++ b/xmake/templates/c/tbox.console/project/src/xmake.lua @@ -11,5 +11,5 @@ target("${TARGETNAME}") add_packages("tbox") -- add files - add_files("*.c") + add_files("*.c") diff --git a/xmake/templates/c/tbox.console/project/xmake.lua b/xmake/templates/c/tbox.console/project/xmake.lua index 83a45434f..31edb3c75 100644 --- a/xmake/templates/c/tbox.console/project/xmake.lua +++ b/xmake/templates/c/tbox.console/project/xmake.lua @@ -44,13 +44,13 @@ if is_plat("windows") then if is_mode("release") then -- link libcmt.lib - add_cxflags("-MT") + add_cxflags("-MT") -- the debug mode elseif is_mode("debug") then -- link libcmtd.lib - add_cxflags("-MTd") + add_cxflags("-MTd") end -- no msvcrt.lib @@ -58,12 +58,12 @@ if is_plat("windows") then end -- add syslinks -if is_plat("windows") then add_syslinks("ws2_32") -elseif is_plat("android") then add_syslinks("m", "c") +if is_plat("windows") then add_syslinks("ws2_32") +elseif is_plat("android") then add_syslinks("m", "c") else add_syslinks("pthread", "dl", "m", "c") end -- add requires add_requires("tbox", {debug = is_mode("debug")}) -- include project sources -includes("src") +includes("src") diff --git a/xmake/templates/c/tbox.shared/project/src/_demo/xmake.lua b/xmake/templates/c/tbox.shared/project/src/_demo/xmake.lua index 145096668..bd1a59ed6 100644 --- a/xmake/templates/c/tbox.shared/project/src/_demo/xmake.lua +++ b/xmake/templates/c/tbox.shared/project/src/_demo/xmake.lua @@ -11,7 +11,7 @@ target("demo") add_defines("__tb_prefix__=\"demo\"") -- add files - add_files("*.c") + add_files("*.c") -- add packages add_packages("tbox") diff --git a/xmake/templates/c/tbox.shared/project/src/_library/xmake.lua b/xmake/templates/c/tbox.shared/project/src/_library/xmake.lua index 1941864d0..4f77e0337 100644 --- a/xmake/templates/c/tbox.shared/project/src/_library/xmake.lua +++ b/xmake/templates/c/tbox.shared/project/src/_library/xmake.lua @@ -17,5 +17,5 @@ target("${TARGETNAME}") add_packages("tbox") -- add files - add_files("*.c") + add_files("*.c") diff --git a/xmake/templates/c/tbox.shared/project/xmake.lua b/xmake/templates/c/tbox.shared/project/xmake.lua index 02a9271a3..f2dec7a83 100644 --- a/xmake/templates/c/tbox.shared/project/xmake.lua +++ b/xmake/templates/c/tbox.shared/project/xmake.lua @@ -44,13 +44,13 @@ if is_plat("windows") then if is_mode("release") then -- link libcmt.lib - add_cxflags("-MT") + add_cxflags("-MT") -- the debug mode elseif is_mode("debug") then -- link libcmtd.lib - add_cxflags("-MTd") + add_cxflags("-MTd") end -- no msvcrt.lib @@ -58,14 +58,14 @@ if is_plat("windows") then end -- add syslinks -if is_plat("windows") then add_syslinks("ws2_32") -elseif is_plat("android") then add_syslinks("m", "c") +if is_plat("windows") then add_syslinks("ws2_32") +elseif is_plat("android") then add_syslinks("m", "c") else add_syslinks("pthread", "dl", "m", "c") end -- add requires add_requires("tbox", {debug = is_mode("debug")}) -- include project sources -includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") +includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") ${FAQ} diff --git a/xmake/templates/c/tbox.static/project/src/_demo/xmake.lua b/xmake/templates/c/tbox.static/project/src/_demo/xmake.lua index 145096668..bd1a59ed6 100644 --- a/xmake/templates/c/tbox.static/project/src/_demo/xmake.lua +++ b/xmake/templates/c/tbox.static/project/src/_demo/xmake.lua @@ -11,7 +11,7 @@ target("demo") add_defines("__tb_prefix__=\"demo\"") -- add files - add_files("*.c") + add_files("*.c") -- add packages add_packages("tbox") diff --git a/xmake/templates/c/tbox.static/project/src/_library/xmake.lua b/xmake/templates/c/tbox.static/project/src/_library/xmake.lua index bfc40162e..fecf32edb 100644 --- a/xmake/templates/c/tbox.static/project/src/_library/xmake.lua +++ b/xmake/templates/c/tbox.static/project/src/_library/xmake.lua @@ -17,5 +17,5 @@ target("${TARGETNAME}") add_packages("tbox") -- add files - add_files("*.c") + add_files("*.c") diff --git a/xmake/templates/c/tbox.static/project/xmake.lua b/xmake/templates/c/tbox.static/project/xmake.lua index 02a9271a3..f2dec7a83 100644 --- a/xmake/templates/c/tbox.static/project/xmake.lua +++ b/xmake/templates/c/tbox.static/project/xmake.lua @@ -44,13 +44,13 @@ if is_plat("windows") then if is_mode("release") then -- link libcmt.lib - add_cxflags("-MT") + add_cxflags("-MT") -- the debug mode elseif is_mode("debug") then -- link libcmtd.lib - add_cxflags("-MTd") + add_cxflags("-MTd") end -- no msvcrt.lib @@ -58,14 +58,14 @@ if is_plat("windows") then end -- add syslinks -if is_plat("windows") then add_syslinks("ws2_32") -elseif is_plat("android") then add_syslinks("m", "c") +if is_plat("windows") then add_syslinks("ws2_32") +elseif is_plat("android") then add_syslinks("m", "c") else add_syslinks("pthread", "dl", "m", "c") end -- add requires add_requires("tbox", {debug = is_mode("debug")}) -- include project sources -includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") +includes("src/${TARGETNAME}", "src/${TARGETNAME}_demo") ${FAQ} diff --git a/xmake/templates/dlang/console/project/xmake.lua b/xmake/templates/dlang/console/project/xmake.lua index 9f27dbf7f..5f522baf8 100644 --- a/xmake/templates/dlang/console/project/xmake.lua +++ b/xmake/templates/dlang/console/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,6 +8,6 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.d") + add_files("src/*.d") ${FAQ} diff --git a/xmake/templates/dlang/shared/project/xmake.lua b/xmake/templates/dlang/shared/project/xmake.lua index 7fe11f488..23fe35a70 100644 --- a/xmake/templates/dlang/shared/project/xmake.lua +++ b/xmake/templates/dlang/shared/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,7 +8,7 @@ target("${TARGETNAME}") set_kind("shared") -- add files - add_files("src/interfaces.d") + add_files("src/interfaces.d") -- add target target("${TARGETNAME}_demo") @@ -20,6 +20,6 @@ target("${TARGETNAME}_demo") add_deps("${TARGETNAME}") -- add files - add_files("src/main.d") + add_files("src/main.d") ${FAQ} diff --git a/xmake/templates/dlang/static/project/xmake.lua b/xmake/templates/dlang/static/project/xmake.lua index 6a3d805ad..281c63734 100644 --- a/xmake/templates/dlang/static/project/xmake.lua +++ b/xmake/templates/dlang/static/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,7 +8,7 @@ target("${TARGETNAME}") set_kind("static") -- add files - add_files("src/interfaces.d") + add_files("src/interfaces.d") -- add target target("${TARGETNAME}_demo") @@ -20,6 +20,6 @@ target("${TARGETNAME}_demo") add_deps("${TARGETNAME}") -- add files - add_files("src/main.d") + add_files("src/main.d") ${FAQ} diff --git a/xmake/templates/go/console/project/xmake.lua b/xmake/templates/go/console/project/xmake.lua index 35f458b68..e1c7a3735 100644 --- a/xmake/templates/go/console/project/xmake.lua +++ b/xmake/templates/go/console/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,6 +8,6 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.go") + add_files("src/*.go") ${FAQ} diff --git a/xmake/templates/go/static/project/xmake.lua b/xmake/templates/go/static/project/xmake.lua index 3c0f05209..96932450c 100644 --- a/xmake/templates/go/static/project/xmake.lua +++ b/xmake/templates/go/static/project/xmake.lua @@ -5,7 +5,7 @@ target("module") set_kind("static") -- add files - add_files("src/test/*.go") + add_files("src/test/*.go") -- add target target("${TARGETNAME}_demo") @@ -17,7 +17,7 @@ target("${TARGETNAME}_demo") add_deps("module") -- add files - add_files("src/*.go") + add_files("src/*.go") -- add link directory add_linkdirs("$(buildir)") diff --git a/xmake/templates/objc++/console/project/xmake.lua b/xmake/templates/objc++/console/project/xmake.lua index 736de146c..dda69c1f7 100644 --- a/xmake/templates/objc++/console/project/xmake.lua +++ b/xmake/templates/objc++/console/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,7 +8,7 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.mm") + add_files("src/*.mm") -- for macosx or ios if is_os("macosx", "ios") then diff --git a/xmake/templates/objc/console/project/xmake.lua b/xmake/templates/objc/console/project/xmake.lua index 199d79528..9658f9486 100644 --- a/xmake/templates/objc/console/project/xmake.lua +++ b/xmake/templates/objc/console/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,7 +8,7 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.m") + add_files("src/*.m") -- add frameworks add_frameworks("Foundation", "CoreFoundation") diff --git a/xmake/templates/rust/console/project/xmake.lua b/xmake/templates/rust/console/project/xmake.lua index 15fafa7f2..7a363c461 100644 --- a/xmake/templates/rust/console/project/xmake.lua +++ b/xmake/templates/rust/console/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,6 +8,6 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.rs") + add_files("src/*.rs") ${FAQ} diff --git a/xmake/templates/rust/static/project/xmake.lua b/xmake/templates/rust/static/project/xmake.lua index fcaaa55f7..cbe81addf 100644 --- a/xmake/templates/rust/static/project/xmake.lua +++ b/xmake/templates/rust/static/project/xmake.lua @@ -5,7 +5,7 @@ target("interfaces") set_kind("static") -- add files - add_files("src/interfaces.rs") + add_files("src/interfaces.rs") -- add target target("${TARGETNAME}_demo") @@ -17,7 +17,7 @@ target("${TARGETNAME}_demo") add_deps("interfaces") -- add files - add_files("src/main.rs") + add_files("src/main.rs") -- add link directory add_linkdirs("$(buildir)") diff --git a/xmake/templates/swift/console/project/xmake.lua b/xmake/templates/swift/console/project/xmake.lua index 4b8c614fa..f607b1127 100644 --- a/xmake/templates/swift/console/project/xmake.lua +++ b/xmake/templates/swift/console/project/xmake.lua @@ -1,4 +1,4 @@ --- add modes: debug and release +-- add modes: debug and release add_rules("mode.debug", "mode.release") -- add target @@ -8,6 +8,6 @@ target("${TARGETNAME}") set_kind("binary") -- add files - add_files("src/*.swift") + add_files("src/*.swift") ${FAQ} |