Merge pull request #182

1795c38 fixed unit tests (Riccardo Spagni) bc537ac miniupnpc static define change (Riccardo Spagni)
2014-10-23 16:43:34 +02:00
parent 8eb2375799 1795c381c0
commit 699d932461
7 changed files with 46 additions and 34 deletions
@@ -29,6 +29,8 @@
 # Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers

 add_definitions(-DSTATICLIB)
+# miniupnp changed their static define
+add_definitions(-DMINIUPNP_STATICLIB)

 add_subdirectory(gtest)
 include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})