X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c2b28832a19801093a06faf4483684d1a80ca9a6;hb=d6050bee5187d0d456e9d95406fc74ba163ea3aa;hp=7f779db10fe85ae6edc731a903ba151f298f3a77;hpb=29ab20c27229672c24a7699afbcd54caad903331;p=oweals%2Fminetest.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7f779db10..c2b28832a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -151,8 +151,6 @@ if(ENABLE_FREETYPE) if(FREETYPE_FOUND) message(STATUS "Freetype enabled.") set(USE_FREETYPE TRUE) - set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont") - set(CGUITTFONT_LIBRARY cguittfont) endif() endif(ENABLE_FREETYPE) @@ -254,6 +252,12 @@ if(NOT MSVC) set(USE_GPROF FALSE CACHE BOOL "Use -pg flag for g++") endif() +# Haiku endian support +if(HAIKU) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_BSD_SOURCE") +endif() + # Use cmake_config.h add_definitions(-DUSE_CMAKE_CONFIG_H) @@ -265,10 +269,12 @@ if(WIN32) add_definitions ( /D "_CRT_SECURE_NO_DEPRECATE" /W1 ) # Get M_PI to work add_definitions(/D "_USE_MATH_DEFINES") + # Dont define min/max macros in minwindef.h + add_definitions(/D "NOMINMAX") else() # Probably MinGW = GCC set(PLATFORM_LIBS "") endif() - set(PLATFORM_LIBS ws2_32.lib shlwapi.lib ${PLATFORM_LIBS}) + set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib ${PLATFORM_LIBS}) # Zlib stuff set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5" @@ -294,10 +300,15 @@ if(WIN32) set(VORBIS_DLL "" CACHE FILEPATH "Path to libvorbis.dll for installation (optional)") set(VORBISFILE_DLL "" CACHE FILEPATH "Path to libvorbisfile.dll for installation (optional)") endif() + if(USE_LUAJIT) + set(LUA_DLL "" CACHE FILEPATH "Path to lua51.dll for installation (optional)") + endif() else() # Unix probably if(BUILD_CLIENT) - find_package(X11 REQUIRED) + if(NOT HAIKU) + find_package(X11 REQUIRED) + endif(NOT HAIKU) find_package(OpenGL REQUIRED) find_package(JPEG REQUIRED) find_package(BZip2 REQUIRED) @@ -325,10 +336,12 @@ else() endif(HAVE_LIBRT) endif(APPLE) + if(NOT HAIKU) # This way Xxf86vm is found on OpenBSD too - find_library(XXF86VM_LIBRARY Xxf86vm) - mark_as_advanced(XXF86VM_LIBRARY) - set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY}) + find_library(XXF86VM_LIBRARY Xxf86vm) + mark_as_advanced(XXF86VM_LIBRARY) + set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY}) + endif(NOT HAIKU) # Prefer local iconv if installed find_library(ICONV_LIBRARY iconv) @@ -358,6 +371,9 @@ add_custom_target(GenerateVersion add_subdirectory(threading) +add_subdirectory(database) +add_subdirectory(gui) +add_subdirectory(mapgen) add_subdirectory(network) add_subdirectory(script) add_subdirectory(unittest) @@ -365,29 +381,22 @@ add_subdirectory(util) add_subdirectory(irrlicht_changes) set(common_SRCS + ${database_SRCS} + ${mapgen_SRCS} ban.cpp - cavegen.cpp chat.cpp clientiface.cpp collision.cpp - content_abm.cpp content_mapnode.cpp content_nodemeta.cpp content_sao.cpp convert_json.cpp craftdef.cpp - database-dummy.cpp - database-files.cpp - database-leveldb.cpp - database-postgresql.cpp - database-redis.cpp - database-sqlite3.cpp - database.cpp debug.cpp defaultsettings.cpp - dungeongen.cpp emerge.cpp environment.cpp + face_position_cache.cpp filesys.cpp genericobject.cpp gettext.cpp @@ -401,21 +410,10 @@ set(common_SRCS map.cpp map_settings_manager.cpp mapblock.cpp - mapgen.cpp - mapgen_flat.cpp - mapgen_fractal.cpp - mapgen_singlenode.cpp - mapgen_v5.cpp - mapgen_v6.cpp - mapgen_v7.cpp - mapgen_valleys.cpp mapnode.cpp mapsector.cpp metadata.cpp - mg_biome.cpp - mg_decoration.cpp - mg_ore.cpp - mg_schematic.cpp + modchannels.cpp mods.cpp nameidmapping.cpp nodedef.cpp @@ -429,9 +427,9 @@ set(common_SRCS porting.cpp profiler.cpp quicktune.cpp + raycast.cpp reflowscan.cpp remoteplayer.cpp - raycast.cpp rollback.cpp rollback_interface.cpp serialization.cpp @@ -440,17 +438,17 @@ set(common_SRCS serverlist.cpp serverobject.cpp settings.cpp - socket.cpp sound.cpp staticobject.cpp subgame.cpp terminal_chat_console.cpp tileanimation.cpp tool.cpp - treegen.cpp + translation.cpp version.cpp voxel.cpp voxelalgorithms.cpp + hud.cpp ${common_network_SRCS} ${JTHREAD_SRCS} ${common_SCRIPT_SRCS} @@ -488,6 +486,7 @@ endif(BUILD_CLIENT) set(client_SRCS ${client_SRCS} ${common_SRCS} + ${gui_SRCS} ${sound_SRCS} ${client_network_SRCS} ${client_irrlicht_changes_SRCS} @@ -502,22 +501,12 @@ set(client_SRCS content_cso.cpp content_mapblock.cpp convert_json.cpp - drawscene.cpp filecache.cpp fontengine.cpp game.cpp - guiChatConsole.cpp - guiEngine.cpp - guiFileSelectMenu.cpp - guiFormSpecMenu.cpp - guiKeyChangeMenu.cpp - guiPasswordChange.cpp guiscalingfilter.cpp - guiTable.cpp - guiVolumeChange.cpp hud.cpp imagefilters.cpp - intlGUIEditBox.cpp keycode.cpp localplayer.cpp main.cpp @@ -560,7 +549,7 @@ include_directories( if(USE_FREETYPE) - include_directories(${FREETYPE_INCLUDE_DIRS} ${CGUITTFONT_INCLUDE_DIR}) + include_directories(${FREETYPE_INCLUDE_DIRS}) endif() if(USE_CURL) @@ -619,7 +608,6 @@ if(BUILD_CLIENT) target_link_libraries( ${PROJECT_NAME} ${FREETYPE_LIBRARY} - ${CGUITTFONT_LIBRARY} ) endif() if (USE_CURSES) @@ -707,9 +695,12 @@ include(CheckCXXCompilerFlag) if(MSVC) # Visual Studio - + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D WIN32_LEAN_AND_MEAN /MP") # EHa enables SEH exceptions (used for catching segfaults) - set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MT /GS- /Zi /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP") + set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MT /GS- /Zi /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP") + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:SSE") + endif() #set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"") set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF") @@ -727,9 +718,10 @@ if(MSVC) # /MT = Link statically with standard library stuff set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT") else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # Probably GCC if(APPLE) - SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" ) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" ) endif() if(WARN_ALL) set(RELEASE_WARNING_FLAGS "-Wall") @@ -751,14 +743,15 @@ else() if(MINGW) set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_LEAN_AND_MEAN") endif() - set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -ffast-math -Wall -pipe -funroll-loops") - if(APPLE) + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops") + if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") else() - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer") - endif(APPLE) + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer") + endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}") @@ -807,6 +800,9 @@ if(WIN32) if(LEVELDB_DLL) install(FILES ${LEVELDB_DLL} DESTINATION ${BINDIR}) endif() + if(LUA_DLL) + install(FILES ${LUA_DLL} DESTINATION ${BINDIR}) + endif() endif() if(BUILD_CLIENT) @@ -877,10 +873,3 @@ if (USE_GETTEXT) add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES}) endif() - - -# Subdirectories - -if (BUILD_CLIENT AND USE_FREETYPE) - add_subdirectory(cguittfont) -endif()