project(minetest)
cmake_minimum_required( VERSION 2.6 )
-if(RUN_IN_PLACE)
- add_definitions ( -DRUN_IN_PLACE )
-endif(RUN_IN_PLACE)
-
# Set some random things default to not being visible in the GUI
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)
+option(ENABLE_CURL "Enable cURL support for fetching media" 1)
+
+if (NOT ENABLE_CURL)
+ mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
+endif(NOT ENABLE_CURL)
+
+if( ENABLE_CURL )
+ find_package(CURL)
+endif( ENABLE_CURL )
+set(USE_CURL 0)
+if (CURL_FOUND AND ENABLE_CURL)
+ message(STATUS "cURL support enabled")
+ set(USE_CURL 1)
+endif(CURL_FOUND AND ENABLE_CURL)
+
# user-visible option to enable/disable gettext usage
OPTION(ENABLE_GETTEXT "Use GetText for internationalization" 0)
if(SOUND_PROBLEM)
message(FATAL_ERROR "Sound enabled, but cannot be used.\n"
- "To continue, either fill in the required paths or disable sound.")
+ "To continue, either fill in the required paths or disable sound. (-DENABLE_SOUND=0)")
endif()
if(USE_SOUND)
set(sound_SRCS sound_openal.cpp)
CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
CACHE PATH "irrlicht dir")
+ set(MINGWM10_DLL ""
+ CACHE FILEPATH "Path to mingwm10.dll (for installation)")
if(ENABLE_SOUND)
set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
# 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})
endif()
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
-# TODO: Create proper find script for Lua
+# Do not use system-wide installation of Lua, because it'll likely be a
+# different version and/or has different build options.
set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
set(LUA_LIBRARY "lua")
)
set(common_SRCS
+ rollback_interface.cpp
+ rollback.cpp
+ genericobject.cpp
voxelalgorithms.cpp
sound.cpp
quicktune.cpp
nameidmapping.cpp
itemdef.cpp
nodedef.cpp
- luaentity_common.cpp
+ object_properties.cpp
scriptapi.cpp
script.cpp
log.cpp
mapgen.cpp
content_nodemeta.cpp
content_mapnode.cpp
- auth.cpp
collision.cpp
nodemetadata.cpp
+ nodetimer.cpp
serverobject.cpp
noise.cpp
porting.cpp
connection.cpp
environment.cpp
server.cpp
- servercommand.cpp
socket.cpp
mapblock.cpp
mapsector.cpp
map.cpp
player.cpp
- utility.cpp
test.cpp
sha1.cpp
base64.cpp
ban.cpp
+ clientserver.cpp
+ staticobject.cpp
+ util/serialize.cpp
+ util/directiontables.cpp
+ util/numeric.cpp
+ util/pointedthing.cpp
+ util/string.cpp
+ util/timetaker.cpp
)
# This gives us the icon
if(WIN32)
+ set(WINRESOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc)
if(MINGW)
+ if(NOT CMAKE_RC_COMPILER)
+ set(CMAKE_RC_COMPILER "windres.exe")
+ endif()
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
- COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR}
- -i${CMAKE_CURRENT_SOURCE_DIR}/winresource.rc
- -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
+ COMMAND ${CMAKE_RC_COMPILER} -I${CMAKE_CURRENT_SOURCE_DIR}
+ -i${WINRESOURCE_FILE}
+ -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
else(MINGW) # Probably MSVC
- set(common_SRCS ${common_SRCS} winresource.rc)
+ set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE})
endif(MINGW)
endif()
set(minetest_SRCS
${common_SRCS}
${sound_SRCS}
+ localplayer.cpp
sky.cpp
clientmap.cpp
content_cso.cpp
guiKeyChangeMenu.cpp
guiMessageMenu.cpp
guiTextInputMenu.cpp
- guiInventoryMenu.cpp
+ guiFormSpecMenu.cpp
guiPauseMenu.cpp
guiPasswordChange.cpp
guiDeathScreen.cpp
client.cpp
filecache.cpp
tile.cpp
+ shader.cpp
game.cpp
main.cpp
)
${PLATFORM_LIBS}
${CLIENT_PLATFORM_LIBS}
)
+
+ if(USE_CURL)
+ target_link_libraries(
+ ${PROJECT_NAME}
+ ${CURL_LIBRARY}
+ )
+ include_directories(
+ ${CURL_INCLUDE_DIR}
+ )
+ endif(USE_CURL)
endif(BUILD_CLIENT)
if(BUILD_SERVER)
set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
endif()
-
+
+ if(MINGW)
+ set(OTHER_FLAGS "-mthreads -fexceptions")
+ 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 ${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}")
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
if(USE_GPROF)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
# Installation
#
if(WIN32)
+ if(MINGWM10_DLL)
+ install(FILES ${MINGWM10_DLL} DESTINATION ${BINDIR})
+ endif()
if(DEFINED ZLIB_DLL)
install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
endif()
if(VORBISFILE_DLL)
install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR})
endif()
+ if(CURL_DLL)
+ install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
+ endif()
endif()
endif()
projects / minetest.git / blobdiff