aboutsummaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt27
1 files changed, 20 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d5cf7d2c..f62a8626b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,6 +61,13 @@ configure_file(
)
set(common_SRCS
+ mapgen.cpp
+ content_inventory.cpp
+ content_nodemeta.cpp
+ content_craft.cpp
+ content_mapblock.cpp
+ content_mapnode.cpp
+ auth.cpp
collision.cpp
nodemetadata.cpp
serverobject.cpp
@@ -95,10 +102,11 @@ set(common_SRCS
# Client sources
set(minetest_SRCS
${common_SRCS}
+ mapblock_mesh.cpp
+ farmesh.cpp
keycode.cpp
clouds.cpp
clientobject.cpp
- guiFurnaceMenu.cpp
guiMainMenu.cpp
guiKeyChangeMenu.cpp
guiMessageMenu.cpp
@@ -125,6 +133,7 @@ include_directories(
${CMAKE_BUILD_TYPE}
${PNG_INCLUDE_DIR}
"${PROJECT_SOURCE_DIR}/jthread"
+ "${PROJECT_SOURCE_DIR}/sqlite"
)
set(EXECUTABLE_OUTPUT_PATH ../bin)
@@ -143,6 +152,7 @@ if(BUILD_CLIENT)
${PLATFORM_LIBS}
${CLIENT_PLATFORM_LIBS}
jthread
+ sqlite3
)
endif(BUILD_CLIENT)
@@ -153,6 +163,7 @@ if(BUILD_SERVER)
${ZLIB_LIBRARIES}
${PLATFORM_LIBS}
jthread
+ sqlite3
)
endif(BUILD_SERVER)
@@ -181,21 +192,22 @@ else()
# Probably GCC
if(WARN_ALL)
- set(WARNING_FLAGS "-Wall")
+ set(RELEASE_WARNING_FLAGS "-Wall")
else()
- set(WARNING_FLAGS "")
+ set(RELEASE_WARNING_FLAGS "")
endif()
-
+
if(NOT APPLE)
set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
endif()
+
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
set(ARCH i386)
endif()
-
- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
- set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall")
+
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")
if(USE_GPROF)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
@@ -242,5 +254,6 @@ endif(BUILD_SERVER)
# Subdirectories
add_subdirectory(jthread)
+add_subdirectory(sqlite)
#end