diff options
| author | Kahrl <kahrl@gmx.net> | 2013-08-29 05:04:56 +0200 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2013-12-13 18:05:10 +0100 |
| commit | 0ea3e6dbe2288854d9d4a971fc6539c2e740a95a (patch) | |
| tree | 2bd1e8485e0fe14cc69fefb8cae66a76f1086aee /src/CMakeLists.txt | |
| parent | 67bf7130ce3f1780a432ae03eabdec3118ecab70 (diff) | |
| download | minetest-0ea3e6dbe2288854d9d4a971fc6539c2e740a95a.tar.gz minetest-0ea3e6dbe2288854d9d4a971fc6539c2e740a95a.tar.bz2 minetest-0ea3e6dbe2288854d9d4a971fc6539c2e740a95a.zip | |
Implement httpfetch module and initialize it from main()
Add curl_parallel_limit setting that will replace media_fetch_threads in
a later commit.
Fix a typo in MutexedQueue::pop_back() that made it impossible to compile
code that used this function. (Noticed this while implementing httpfetch.)
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a30dc9854..104e56406 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -188,7 +188,7 @@ message (STATUS "LuaJIT library: ${LUA_LIBRARY}") message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}") set(USE_LUAJIT 0) -if(LUA_LIBRARY AND LUA_INCLUDE_DIR) +if(LUA_LIBRARY AND LUA_INCLUDE_DIR) message (STATUS "LuaJIT found.") set(USE_LUAJIT 1) else(LUA_LIBRARY AND LUA_INCLUDE_DIR) @@ -307,6 +307,7 @@ set(common_SRCS pathfinder.cpp convert_json.cpp gettext.cpp + httpfetch.cpp ${JTHREAD_SRCS} ${common_SCRIPT_SRCS} ${UTIL_SRCS} @@ -500,7 +501,7 @@ if(MSVC) # Flags for C files (sqlite) # /MT = Link statically with standard library stuff set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT") - + if(BUILD_SERVER) set_target_properties(${PROJECT_NAME}server PROPERTIES COMPILE_DEFINITIONS "SERVER") @@ -508,13 +509,13 @@ if(MSVC) else() # Probably GCC - + if(WARN_ALL) set(RELEASE_WARNING_FLAGS "-Wall") else() set(RELEASE_WARNING_FLAGS "") endif() - + if(NOT APPLE AND NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") CHECK_CXX_COMPILER_FLAG("-Wno-unused-but-set-variable" HAS_UNUSED_BUT_SET_VARIABLE_WARNING) if(HAS_UNUSED_BUT_SET_VARIABLE_WARNING) @@ -537,7 +538,7 @@ else() if(USE_GPROF) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") endif() - + if(BUILD_SERVER) set_target_properties(${PROJECT_NAME}server PROPERTIES COMPILE_DEFINITIONS "SERVER") |