From 17345404bad71989238d492ed2e23c97f5681065 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 29 Jul 2014 10:47:38 +0200 Subject: 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 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2050e57a6..5e234eedf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,7 +202,11 @@ if(WIN32) # install(FILES bin/minetestserver.exe DESTINATION bin) #endif() - set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win64") + else(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") + endif(CMAKE_SIZEOF_VOID_P EQUAL 8) set(CPACK_GENERATOR ZIP) -- cgit v1.2.3