codinget/moonbuild
1
0
Fork 0
mirror of https://github.com/natnat-mc/moonbuild synced 2026-06-05 22:29:40 +02:00
Code Releases Activity

added findclib and used it in Build.moon

Browse Source
This commit is contained in:
Nathan DECHER
2020-09-13 01:04:41 +02:00
parent e989098eed
commit f91877089b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build.moon
+1 -1
View File
@@ -24,7 +24,7 @@ public target 'info', fn: =>
#echo "Binary:", BINARY #echo "Binary:", BINARY
default target BINARY, out: {BINARY, OUT_C}, from: OUT_LUA, fn: => default target BINARY, out: {BINARY, OUT_C}, from: OUT_LUA, fn: =>
-luastatic MAIN_LUA, OUT_LUA, '-I/usr/include/lua5.3', '-llua5.3' -luastatic MAIN_LUA, OUT_LUA, (findclib 'lua5.3', 'all')
target '%.lua', in: '%.moon', out: '%.lua', fn: => target '%.lua', in: '%.moon', out: '%.lua', fn: =>
-moonc @infile -moonc @infile
util.moon
+7 -1
View File
@@ -85,6 +85,12 @@ calccdeps= (infile, includesys=false) ->
rawdeps=data\gsub('\\\n', '')\match ':(.+)' rawdeps=data\gsub('\\\n', '')\match ':(.+)'
[dep for dep in rawdeps\gmatch '%S+' when dep!=infile] [dep for dep in rawdeps\gmatch '%S+' when dep!=infile]
findclib= (name, mode='all') ->
args={name}
insert args, '--cflags' if mode=='all' or mode=='cc'
insert args, '--libs' if mode=='all' or mode=='ld'
[arg for arg in (popen 'pkg-config', args)\read('*a')\gmatch '%S+']
-- file matcher -- file matcher
wildcard= (pattern) -> wildcard= (pattern) ->
prefix, suffix=pattern\match '^(.*)%*%*(.*)$' prefix, suffix=pattern\match '^(.*)%*%*(.*)$'
@@ -169,7 +175,7 @@ sortedpairs= (table, cmp) ->
-- command functions -- command functions
:run, :popen :run, :popen
:calccdeps :calccdeps, :findclib
-- string functions -- string functions
:patsubst, :match, :isglob :patsubst, :match, :isglob