Browse Source

improve add_cincludes

ruki 2 years ago
parent
commit
dfdcd30c0f
2 changed files with 17 additions and 11 deletions
  1. 16 8
      configure
  2. 1 3
      src/xmake.sh

+ 16 - 8
configure

@@ -1155,8 +1155,10 @@ add_cincludes() {
     if ! ${_loading_options}; then
         return
     fi
-    local cincludes="${1}"
-    _add_option_item "${_xmake_sh_option_current}" "cincludes" "${cincludes}"
+    local cinclude=""
+    for cinclude in $@; do
+        _add_option_item "${_xmake_sh_option_current}" "cincludes" "${cinclude}"
+    done
 }
 
 # add cxxincludes in option
@@ -1164,8 +1166,10 @@ add_cxxincludes() {
     if ! ${_loading_options}; then
         return
     fi
-    local cxxincludes="${1}"
-    _add_option_item "${_xmake_sh_option_current}" "cxxincludes" "${cxxincludes}"
+    local cxxinclude=""
+    for cxxinclude in $@; do
+        _add_option_item "${_xmake_sh_option_current}" "cxxincludes" "${cxxinclude}"
+    done
 }
 
 # add ctypes in option
@@ -1173,8 +1177,10 @@ add_ctypes() {
     if ! ${_loading_options}; then
         return
     fi
-    local ctypes="${1}"
-    _add_option_item "${_xmake_sh_option_current}" "ctypes" "${ctypes}"
+    local ctype=""
+    for ctype in $@; do
+        _add_option_item "${_xmake_sh_option_current}" "ctypes" "${ctype}"
+    done
 }
 
 # add cxxtypes in option
@@ -1182,8 +1188,10 @@ add_cxxtypes() {
     if ! ${_loading_options}; then
         return
     fi
-    local cxxtypes="${1}"
-    _add_option_item "${_xmake_sh_option_current}" "cxxtypes" "${cxxtypes}"
+    local cxxtype=""
+    for cxxtype in $@; do
+        _add_option_item "${_xmake_sh_option_current}" "cxxtypes" "${cxxtype}"
+    done
 }
 
 # add csnippets in option

+ 1 - 3
src/xmake.sh

@@ -19,9 +19,7 @@ option_end
 
 option "lua"
     add_cfuncs "lua_pushstring"
-    add_cincludes "lua.h"
-    add_cincludes "lualib.h"
-    add_cincludes "lauxlib.h"
+    add_cincludes "lua.h" "lualib.h" "lauxlib.h"
     add_links "lua5.4"
     add_includedirs "/usr/include/lua5.4"
 option_end