From 12a7b440bda2aa9c34cc8810d842b163ed941c4f Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Thu, 9 Jan 2014 14:18:50 +0000 Subject: [PATCH] Misc. updates. Fixed MSVC warning and updated code for libgit2 v0.20.0 release. --- README.md | 16 +++++++++------- src/backend/helpers.cpp | 2 +- src/backend/network.cpp | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index dc47b6c6..dc26f3ca 100644 --- a/README.md +++ b/README.md @@ -25,18 +25,18 @@ This repository holds the source code and documentation for BOSS v3. The masterl BOSS uses [CMake](http://cmake.org) v2.8.9 or later for cross-platform building support, as though it is a Windows application, development has taken place on Windows and Linux. -BOSS requires the following libraries: +BOSS requires the following libraries (version numbers used in latest development revision given): * [Alphanum](http://www.davekoelle.com/files/alphanum.hpp) -* [Boost](http://www.boost.org) v1.54.0 or later. +* [Boost](http://www.boost.org) v1.55.0. * [Libespm](http://github.com/WrinklyNinja/libespm) -* [Libgit2](https://github.com/libgit2) v0.19.0. +* [Libgit2](https://github.com/libgit2) v0.20.0. * [Libloadorder](http://github.com/WrinklyNinja/libloadorder) * [OpenSSL](https://www.openssl.org) - only if HTTPS support in libgit2 is required using compilers other than MSVC. -* [PugiXML](http://code.google.com/p/pugixml/) v1.2 or later. -* [wxWidgets](http://www.wxwidgets.org) v3.0 RC 1 or later. -* [yaml-cpp](http://code.google.com/p/yaml-cpp/) v0.5.1 or later. -* [zlib](http://zlib.net) v1.2.7 or later. +* [PugiXML](http://code.google.com/p/pugixml/) v1.2. +* [wxWidgets](http://www.wxwidgets.org) v3.0.0. +* [yaml-cpp](http://github.com/WrinklyNinja/yaml-cpp). +* [zlib](http://zlib.net) v1.2.8. BOSS expects all libraries' folders to be present alongside the BOSS repository folder that contains this readme, or otherwise installed such that the compiler and linker used can find them without suppling additional paths. All paths below are relative to the folder(s) containing the libraries and BOSS. @@ -114,6 +114,8 @@ Follow the instructions in libloadorder's README.md to build it as a static libr 4. Generate a build system for Visual Studio 12. 5. Open the generated solution file, and build it. +You may need to make sure that the configuration properties for the Visual Studio project are set to use the multithreaded DLL runtime library (C/C++->Code Generation). + #### BOSS 1. Set CMake up so that it builds the binaries in the `build` subdirectory of the BOSS folder. diff --git a/src/backend/helpers.cpp b/src/backend/helpers.cpp index 06ae475c..7da4b30d 100644 --- a/src/backend/helpers.cpp +++ b/src/backend/helpers.cpp @@ -211,7 +211,7 @@ namespace boss { boost::filesystem::path GetLocalAppDataPath() { #if _WIN32 || _WIN64 - HWND owner = 0; + HWND owner; TCHAR path[MAX_PATH]; BOOST_LOG_TRIVIAL(trace) << "Getting path to %LOCALAPPDATA%."; diff --git a/src/backend/network.cpp b/src/backend/network.cpp index bf77f539..c7ef07c9 100644 --- a/src/backend/network.cpp +++ b/src/backend/network.cpp @@ -75,8 +75,9 @@ namespace boss { throw boss::error(boss::error::git_error, (boost::format(lc::translate("Git operation failed. Error: %1%")) % error_message).str()); } - void progress_cb(const char *str, int len, void *data) { + int progress_cb(const char *str, int len, void *data) { BOOST_LOG_TRIVIAL(info) << string(str, len); + return 0; } int update_cb(const char *refname, const git_oid *a, const git_oid *b, void *data) {