From e0c06464d234abb46992501baac67039373f27d2 Mon Sep 17 00:00:00 2001 From: def Date: Mon, 10 Aug 2020 23:43:10 +0200 Subject: [PATCH] Version 14.3.1 --- CMakeLists.txt | 1 + cmake/FindSQLite3.cmake | 7 +++++++ ddnet-libs | 2 +- other/ddnet.appdata.xml | 1 + src/game/version.h | 6 +++--- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6d69423f..103fdad0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1275,6 +1275,7 @@ set(COPY_FILES ${FREETYPE_COPY_FILES} ${OPUSFILE_COPY_FILES} ${SDL2_COPY_FILES} + ${SQLite3_COPY_FILES} ${FFMPEG_COPY_FILES} ) file(COPY ${COPY_FILES} DESTINATION .) diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake index 37e711bd3..77d28cf70 100644 --- a/cmake/FindSQLite3.cmake +++ b/cmake/FindSQLite3.cmake @@ -34,4 +34,11 @@ if(SQLite3_FOUND) is_bundled(SQLite3_BUNDLED "${SQLite3_LIBRARY}") set(SQLite3_LIBRARIES ${SQLite3_LIBRARY}) set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDEDIR}) + + is_bundled(SQLite3_BUNDLED "${SQLite3_LIBRARY}") + if(SQLite3_BUNDLED AND TARGET_OS STREQUAL "windows") + set(SQLite3_COPY_FILES "${EXTRA_SQLite3_LIBDIR}/sqlite3.dll") + else() + set(SQLite3_COPY_FILES) + endif() endif() diff --git a/ddnet-libs b/ddnet-libs index 0dcb70fb5..e78649088 160000 --- a/ddnet-libs +++ b/ddnet-libs @@ -1 +1 @@ -Subproject commit 0dcb70fb521ef86d1be6bc4a3dc3c137d0d28bca +Subproject commit e78649088d0c211c011086db65adf6d737733994 diff --git a/other/ddnet.appdata.xml b/other/ddnet.appdata.xml index f579f8167..28055de82 100644 --- a/other/ddnet.appdata.xml +++ b/other/ddnet.appdata.xml @@ -37,6 +37,7 @@ intense + diff --git a/src/game/version.h b/src/game/version.h index a3fb78530..3ab7b931f 100644 --- a/src/game/version.h +++ b/src/game/version.h @@ -2,10 +2,10 @@ /* If you are missing that file, acquire a complete release at teeworlds.com. */ #ifndef GAME_VERSION_H #define GAME_VERSION_H -#define GAME_VERSION "0.6.4, 14.3" +#define GAME_VERSION "0.6.4, 14.3.1" #define GAME_NETVERSION "0.6 626fce9a778df4d4" #define GAME_NAME "DDNet" -#define GAME_RELEASE_VERSION "14.3" -#define CLIENT_VERSIONNR 14030 +#define GAME_RELEASE_VERSION "14.3.1" +#define CLIENT_VERSIONNR 14031 extern const char *GIT_SHORTREV_HASH; #endif