projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/master'
[oweals/minetest.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index f62a8626bef71ca8030934f285262eaaaf2b304f..dfe5b57532023b3eba631c42949d4ea7708f65d1 100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-61,6
+61,7
@@
configure_file(
)
set(common_SRCS
+ content_sao.cpp
mapgen.cpp
content_inventory.cpp
content_nodemeta.cpp
@@
-102,6
+103,7
@@
set(common_SRCS
# Client sources
set(minetest_SRCS
${common_SRCS}
+ content_cao.cpp
mapblock_mesh.cpp
farmesh.cpp
keycode.cpp