X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=de1ea2c28eaf0e0936df1127f62649eae4b5cd3c;hb=fa427d641b687dd8585adced708510b94588cf51;hp=611824ec10b930ab35ac2cd586068023da64a073;hpb=c39992e42928623f8ee357b001bc87af9faa9286;p=oweals%2Fminetest.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 611824ec1..de1ea2c28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -133,8 +133,6 @@ if(WIN32) 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) set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)") set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)") @@ -357,9 +355,7 @@ set(common_SRCS mapgen.cpp mapgen_v6.cpp mapgen_v7.cpp - mapgen_indev.cpp mapgen_singlenode.cpp - mapgen_math.cpp treegen.cpp dungeongen.cpp cavegen.cpp @@ -666,12 +662,6 @@ endif() # 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(USE_SOUND) if(OPENAL_DLL) install(FILES ${OPENAL_DLL} DESTINATION ${BINDIR}) @@ -689,12 +679,18 @@ if(WIN32) if(CURL_DLL) install(FILES ${CURL_DLL} DESTINATION ${BINDIR}) endif() - if (ZLIB_DLL) + if(ZLIB_DLL) install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR}) endif() + if(ZLIBWAPI_DLL) + install(FILES ${ZLIBWAPI_DLL} DESTINATION ${BINDIR}) + endif() if(FREETYPE_DLL) install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR}) endif() + if(LEVELDB_DLL) + install(FILES ${LEVELDB_DLL} DESTINATION ${BINDIR}) + endif() endif() if(BUILD_CLIENT)