add_definitions ( -DRUN_IN_PLACE )
endif(RUN_IN_PLACE)
-set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
+if(NOT MSVC)
+ set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
+endif()
# Use cmake_config.h
add_definitions ( -DUSE_CMAKE_CONFIG_H )
set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
CACHE PATH "Zlib include directory")
set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.lib"
- CACHE PATH "Path to zlibwapi.lib")
+ CACHE FILEPATH "Path to zlibwapi.lib")
set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
- CACHE PATH "Path to zlibwapi.dll (for installation)")
+ CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
else()
# Unix probably
if(BUILD_CLIENT)
)
set(common_SRCS
+ collision.cpp
+ nodemetadata.cpp
+ serverobject.cpp
noise.cpp
mineral.cpp
porting.cpp
test.cpp
)
+# Client sources
set(minetest_SRCS
${common_SRCS}
+ keycode.cpp
+ clouds.cpp
+ clientobject.cpp
+ guiFurnaceMenu.cpp
guiMainMenu.cpp
guiMessageMenu.cpp
guiTextInputMenu.cpp
guiInventoryMenu.cpp
guiPauseMenu.cpp
- irrlichtwrapper.cpp
client.cpp
tile.cpp
+ game.cpp
main.cpp
)
+# Server sources
set(minetestserver_SRCS
${common_SRCS}
servermain.cpp
${IRRLICHT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${CMAKE_BUILD_TYPE}
- "${PROJECT_SOURCE_DIR}/jthread"
${PNG_INCLUDE_DIR}
+ "${PROJECT_SOURCE_DIR}/jthread"
)
set(EXECUTABLE_OUTPUT_PATH ../bin)
-set(JTHREAD_LIBRARIES "jthread")
-set(JTHREAD_SRCS "")
-
if(BUILD_CLIENT)
- add_executable(minetest ${minetest_SRCS} ${JTHREAD_SRCS})
+ add_executable(minetest ${minetest_SRCS})
target_link_libraries(
minetest
${ZLIB_LIBRARIES}
${BZIP2_LIBRARIES}
${PNG_LIBRARIES}
${X11_LIBRARIES}
- ${JTHREAD_LIBRARIES}
${PLATFORM_LIBS}
${CLIENT_PLATFORM_LIBS}
+ jthread
)
endif(BUILD_CLIENT)
if(BUILD_SERVER)
- add_executable(minetestserver ${minetestserver_SRCS} ${JTHREAD_SRCS})
+ add_executable(minetestserver ${minetestserver_SRCS})
target_link_libraries(
minetestserver
${ZLIB_LIBRARIES}
- ${JTHREAD_LIBRARIES}
${PLATFORM_LIBS}
+ jthread
)
endif(BUILD_SERVER)
# EHa enables SEH exceptions (used for catching segfaults)
set(CMAKE_CXX_FLAGS_RELEASE "/EHa /MD /O2 /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
- set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\"")
+ #set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"")
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG")
# Debug build doesn't catch exceptions by itself
# Add some optimizations because otherwise it's VERY slow
if(BUILD_SERVER)
set_target_properties(minetestserver PROPERTIES
- COMPILE_FLAGS "/D SERVER")
+ COMPILE_DEFINITIONS "SERVER")
endif(BUILD_SERVER)
else()
if(BUILD_SERVER)
set_target_properties(minetestserver PROPERTIES
- COMPILE_FLAGS "-DSERVER")
+ COMPILE_DEFINITIONS "SERVER")
endif(BUILD_SERVER)
endif()
# Installation
#
+# Example configuration file
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
+
if(BUILD_CLIENT)
install(TARGETS minetest DESTINATION ${BINDIR})