diff options
| author | sfan5 <sfan5@live.de> | 2014-07-29 10:47:38 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2014-07-29 20:03:18 +0200 |
| commit | 17345404bad71989238d492ed2e23c97f5681065 (patch) | |
| tree | 6d688df0d1e9d4055187b233b76549e3956c30ea /src | |
| parent | 5884236046c4405eec7cfc12cdde0be9f48058b6 (diff) | |
| download | minetest-17345404bad71989238d492ed2e23c97f5681065.tar.gz minetest-17345404bad71989238d492ed2e23c97f5681065.tar.bz2 minetest-17345404bad71989238d492ed2e23c97f5681065.zip | |
Add ZLIBWAPI_DLL and LEVELDB_DLL CMake options Remove legacy MINGWM10_DLL CMake option Update 32-bit buildbot (OpenAL updated, zlib updated) Change build directory for buildbots to '_build' to prevent removal of Android build files Use -win64 suffix for 64-bit Windows builds Fixes #1476
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2800f361c..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)") @@ -664,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}) @@ -687,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) |