diff options
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 77 |
1 files changed, 73 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 24f682f3f..17102e848 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,7 @@ cmake_minimum_required( VERSION 2.6 ) mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH) mark_as_advanced(JTHREAD_INCLUDE_DIR JTHREAD_LIBRARY) mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY) +mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY) option(ENABLE_CURL "Enable cURL support for fetching media" 1) @@ -93,6 +94,12 @@ if(USE_SOUND) ) endif() +option(ENABLE_FREETYPE "Enable freetype2 (truetype fonts and basic unicode support)" OFF) +set(USE_FREETYPE 0) +if(ENABLE_FREETYPE) + set(USE_FREETYPE 1) +endif(ENABLE_FREETYPE) + if(NOT MSVC) set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++") endif() @@ -117,6 +124,14 @@ if(WIN32) CACHE FILEPATH "Path to zlibwapi.dll (for installation)") set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2" CACHE PATH "irrlicht dir") + if(USE_FREETYPE) + set(FREETYPE_INCLUDE_DIR_ft2build "${PROJECT_SOURCE_DIR}/../../freetype2/include/" + CACHE PATH "freetype include dir") + set(FREETYPE_INCLUDE_DIR_freetype2 "${PROJECT_SOURCE_DIR}/../../freetype2/include/freetype" + CACHE PATH "freetype include dir") + set(FREETYPE_LIBRARY "${PROJECT_SOURCE_DIR}/../../freetype2/objs/win32/vc2005/freetype247.lib" + CACHE FILEPATH "Path to freetype247.lib") + endif(USE_FREETYPE) set(MINGWM10_DLL "" CACHE FILEPATH "Path to mingwm10.dll (for installation)") if(ENABLE_SOUND) @@ -156,6 +171,13 @@ endif() find_package(Jthread REQUIRED) find_package(Sqlite3 REQUIRED) +find_package(Json REQUIRED) + +if(USE_FREETYPE) + find_package(Freetype REQUIRED) + set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont") + set(CGUITTFONT_LIBRARY cguittfont) +endif(USE_FREETYPE) # Do not use system-wide installation of Lua, because it'll likely be a # different version and/or has different build options. @@ -188,6 +210,7 @@ set(common_SRCS log.cpp content_sao.cpp mapgen.cpp + mapgen_v6.cpp treegen.cpp content_nodemeta.cpp content_mapnode.cpp @@ -218,8 +241,10 @@ set(common_SRCS sha1.cpp base64.cpp ban.cpp + biome.cpp clientserver.cpp staticobject.cpp + serverlist.cpp util/serialize.cpp util/directiontables.cpp util/numeric.cpp @@ -275,6 +300,7 @@ set(minetest_SRCS guiDeathScreen.cpp guiChatConsole.cpp guiCreateWorld.cpp + guiConfigureWorld.cpp guiConfirmMenu.cpp client.cpp filecache.cpp @@ -284,6 +310,13 @@ set(minetest_SRCS main.cpp ) +if(USE_FREETYPE) + set(minetest_SRCS + ${minetest_SRCS} + intlGUIEditBox.cpp + ) +endif(USE_FREETYPE) + # Server sources set(minetestserver_SRCS ${common_SRCS} @@ -301,8 +334,22 @@ include_directories( ${JTHREAD_INCLUDE_DIR} ${SQLITE3_INCLUDE_DIR} ${LUA_INCLUDE_DIR} + ${JSON_INCLUDE_DIR} ) +if(USE_FREETYPE) + include_directories( + ${FREETYPE_INCLUDE_DIRS} + ${CGUITTFONT_INCLUDE_DIR} + ) +endif(USE_FREETYPE) + +if(USE_CURL) + include_directories( + ${CURL_INCLUDE_DIR} + ) +endif(USE_CURL) + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") if(BUILD_CLIENT) @@ -321,19 +368,23 @@ if(BUILD_CLIENT) ${JTHREAD_LIBRARY} ${SQLITE3_LIBRARY} ${LUA_LIBRARY} + ${JSON_LIBRARY} ${PLATFORM_LIBS} ${CLIENT_PLATFORM_LIBS} ) - if(USE_CURL) target_link_libraries( ${PROJECT_NAME} ${CURL_LIBRARY} ) - include_directories( - ${CURL_INCLUDE_DIR} - ) endif(USE_CURL) + if(USE_FREETYPE) + target_link_libraries( + ${PROJECT_NAME} + ${FREETYPE_LIBRARY} + ${CGUITTFONT_LIBRARY} + ) + endif(USE_FREETYPE) endif(BUILD_CLIENT) if(BUILD_SERVER) @@ -343,11 +394,20 @@ if(BUILD_SERVER) ${ZLIB_LIBRARIES} ${JTHREAD_LIBRARY} ${SQLITE3_LIBRARY} + ${JSON_LIBRARY} + ${GETTEXT_LIBRARY} ${LUA_LIBRARY} ${PLATFORM_LIBS} ) + if(USE_CURL) + target_link_libraries( + ${PROJECT_NAME}server + ${CURL_LIBRARY} + ) + endif(USE_CURL) endif(BUILD_SERVER) + # # Set some optimizations and tweaks # @@ -514,9 +574,18 @@ else (SQLITE3_FOUND) add_subdirectory(sqlite) endif (SQLITE3_FOUND) +if (BUILD_CLIENT AND USE_FREETYPE) + add_subdirectory(cguittfont) +endif (BUILD_CLIENT AND USE_FREETYPE) + if (LUA_FOUND) else (LUA_FOUND) add_subdirectory(lua) endif (LUA_FOUND) +if (JSON_FOUND) +else (JSON_FOUND) + add_subdirectory(json) +endif (JSON_FOUND) + #end |