rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-30 11:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4572

Browse source 
e7f24850 Fix Windows build after epee dependency change (iDunk5400)
This commit is contained in:
Riccardo Spagni 2018-10-16 12:43:13 +02:00
commit 636153b205
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -880,7 +880,7 @@ endif()
include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
if(MINGW) if(MINGW)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32) set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
if(DEPENDS) if(DEPENDS)
set(ICU_LIBRARIES ${Boost_LOCALE_LIBRARY} sicuio sicuin sicuuc sicudt sicutu iconv) set(ICU_LIBRARIES ${Boost_LOCALE_LIBRARY} sicuio sicuin sicuuc sicudt sicutu iconv)
else() else()

1
src/daemonizer/windows_daemonizer.inl
View file

@ -31,6 +31,7 @@
#include "common/util.h" #include "common/util.h"
#include "daemonizer/windows_service.h" #include "daemonizer/windows_service.h"
#include "daemonizer/windows_service_runner.h" #include "daemonizer/windows_service_runner.h"
#include "cryptonote_core/cryptonote_core.h"
#include <shlobj.h> #include <shlobj.h>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>

4
tests/functional_tests/CMakeLists.txt
View file

@ -26,10 +26,6 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
if(WIN32)
set(EXTRA_LIBRARIES "${EXTRA_LIBRARIES};bcrypt")
endif()
set(functional_tests_sources set(functional_tests_sources
main.cpp main.cpp
transactions_flow_test.cpp transactions_flow_test.cpp