Pantyhose-X/freeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fixes

Browse Source
This commit is contained in:
proller 2018-09-22 15:20:25 +03:00
parent 708623a4fc
commit 0f5535d69f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/windows_vs2017/build.py
View File

@ -62,7 +62,7 @@ CRC32C_VERSION = "1.1.0"
SNAPPY_VERSION = "1.1.1.7"
irrlicht = "irrlicht-1.8.4"
curl = "curl-7.53.1"
openal = "openal-soft-1.17.2"
openal = "openal-soft-1.19.0"
libogg = "libogg-{}".format(LIBOGG_VERSION)
libvorbis = "libvorbis-1.3.5"
zlib = "zlib-1.2.11"
@ -361,13 +361,15 @@ def main():
snappy_external = os.path.join("..", "..", "..", "src", "external", "snappy")
if not os.path.exists(snappy_external):
os.system("git clone --recursive --depth 1 https://github.com/google/snappy {snappy_external}".format(snappy_external=snappy_external))
download("https://raw.githubusercontent.com/adasworks/snappy-cmake/master/CMakeLists.txt", os.path.join(snappy_external, "CMakeLists.txt"))
#download("https://raw.githubusercontent.com/adasworks/snappy-cmake/master/CMakeLists.txt", os.path.join(snappy_external, "CMakeLists.txt"))
leveldb_external = os.path.join("..", "..", "..", "src", "external", "leveldb")
if not os.path.exists(leveldb_external):
os.system("git clone --recursive --depth 1 https://github.com/google/leveldb {leveldb_external}".format(leveldb_external=leveldb_external))
download("https://raw.githubusercontent.com/proller/leveldb/patch-2/CMakeLists.txt", os.path.join(leveldb_external, "CMakeLists.txt"))
download("https://raw.githubusercontent.com/tamaskenez/leveldb-cmake-win/native_windows_port_1_18/leveldbConfig.cmake.in", os.path.join(leveldb_external, "leveldbConfig.cmake.in"))
#download("https://raw.githubusercontent.com/tamaskenez/leveldb-cmake-win/native_windows_port_1_18/leveldbConfig.cmake.in", os.path.join(leveldb_external, "leveldbConfig.cmake.in"))
if not os.path.exists(os.path.join(leveldb_external, "include", "dirent.h")):
download("https://github.com/tronkko/dirent/raw/master/include/dirent.h", os.path.join(leveldb_external, "include", "dirent.h"))
os.chdir("..")

13
src/CMakeLists.txt
View File

@ -480,11 +480,11 @@ set(USE_LEVELDB FALSE)
if(ENABLE_LEVELDB)
find_library(LEVELDB_LIBRARY leveldb)
find_path(LEVELDB_INCLUDE_DIR db.h PATH_SUFFIXES leveldb)
find_path(LEVELDB_INCLUDE_DIR leveldb/db.h)
find_library(SNAPPY_LIBRARY snappy)
find_path(SNAPPY_INCLUDE_DIR snappy.h PATH_SUFFIXES snappy)
message (STATUS "Snappy library: ${SNAPPY_LIBRARY}")
message (STATUS "Snappy headers: ${SNAPPY_INCLUDE_DIR}")
message (STATUS "Snappy library: ${SNAPPY_LIBRARY} : ${SNAPPY_INCLUDE_DIR}")
message (STATUS "Leveldb library: ${LEVELDB_LIBRARY} : ${LEVELDB_INCLUDE_DIR}")
if (NOT SNAPPY_INCLUDE_DIR)
find_path(SNAPPY_INCLUDE_DIR leveldb/db.h ${PROJECT_SOURCE_DIR}/external/leveldb/include NO_DEFAULT_PATH)
@ -495,7 +495,7 @@ if(ENABLE_LEVELDB)
# wget -O src/external/snappy/CMakeLists.txt https://raw.githubusercontent.com/adasworks/snappy-cmake/master/CMakeLists.txt
add_subdirectory(${PROJECT_SOURCE_DIR}/external/snappy)
set(SNAPPY_LIBRARY snappy)
message(STATUS "Using bundled snappy ${SNAPPY_INCLUDE_DIR} ${SNAPPY_LIBRARY}")
message(STATUS "Using bundled snappy ${SNAPPY_LIBRARY} : ${SNAPPY_INCLUDE_DIR}")
endif()
endif()
@ -515,6 +515,9 @@ if(ENABLE_LEVELDB)
# But we can collect something from pulls
# wget -O src/external/leveldb/CMakeLists.txt https://raw.githubusercontent.com/proller/leveldb/patch-2/CMakeLists.txt
# wget -O src/external/leveldb/leveldbConfig.cmake.in https://raw.githubusercontent.com/tamaskenez/leveldb-cmake-win/native_windows_port_1_18/leveldbConfig.cmake.in
set(LEVELDB_BUILD_TESTS 0 CACHE INTERNAL "")
set(LEVELDB_BUILD_BENCHMARKS 0 CACHE INTERNAL "")
set(LEVELDB_INSTALL 0 CACHE INTERNAL "")
add_subdirectory(${PROJECT_SOURCE_DIR}/external/leveldb)
set(LEVELDB_LIBRARY leveldb)
message(STATUS "Using bundled leveldb ${LEVELDB_INCLUDE_DIR} ${LEVELDB_LIBRARY}")
@ -527,7 +530,7 @@ if(ENABLE_LEVELDB)
if(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR)
set(USE_LEVELDB TRUE)
message(STATUS "LevelDB backend enabled. ${LEVELDB_INCLUDE_DIR}")
message(STATUS "LevelDB backend enabled. ${LEVELDB_LIBRARY} : ${LEVELDB_INCLUDE_DIR}")
include_directories(${LEVELDB_INCLUDE_DIR})
elseif (NOT FORCE_LEVELDB)
message(WARNING "LevelDB not found! Player data cannot be saved in singleplayer or server")