Skip to content

Commit

Permalink
Merge from default.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidgiven committed Nov 5, 2016
2 parents 4fa2c94 + 7f64fe9 commit fee47b2
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 5 deletions.
3 changes: 2 additions & 1 deletion modules/src/alloc/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ clibrary {
hdrs = { "./alloc.h" },
deps = {
"modules+headers",
"modules/src/system+lib"
"modules/src/system+lib",
"./*.h"
},
}

3 changes: 2 additions & 1 deletion modules/src/flt_arith/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ clibrary {
},
hdrs = { "./flt_arith.h" },
deps = {
"modules+headers"
"modules+headers",
"./*.h",
}
}

Expand Down
1 change: 1 addition & 0 deletions modules/src/object/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ clibrary {
"modules+headers",
"h+local",
"h+emheaders",
"./*.h",
},
}

Expand Down
3 changes: 2 additions & 1 deletion modules/src/print/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ clibrary {
hdrs = { "./print.h" },
deps = {
"modules+headers",
"modules/src/system+lib"
"modules/src/system+lib",
"./*.h"
}
}

Expand Down
1 change: 1 addition & 0 deletions modules/src/read_em/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ local function variant(name, cflags)
"modules/src/em_code+headers",
"modules/src/em_data+lib",
"modules/src/system+lib",
"./*.h",
}
}
end
Expand Down
5 changes: 4 additions & 1 deletion modules/src/string/build.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
clibrary {
name = "lib",
srcs = { "./*.c" },
deps = { "modules+headers" },
deps = {
"modules+headers",
"./*.h"
},
}


5 changes: 4 additions & 1 deletion modules/src/system/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ clibrary {
name = "lib",
srcs = { "./*.c" },
hdrs = { "./system.h" },
deps = { "modules+headers" },
deps = {
"modules+headers",
"./*.h"
},
}


0 comments on commit fee47b2

Please sign in to comment.