Merge branch 'dev' into FSM

2019-06-09 21:46:59 -11:00
parent 839f2b5959 929990301e
commit 94c7bec747
2 changed files with 7 additions and 4 deletions
--- a/src/cc/makerogue
+++ b/src/cc/makerogue
@@ -35,6 +35,3 @@ else
  echo ROGUE BUILD FAILED
  exit 1
 fi
-
-rm ../libcc.so 
-cp librogue.so ../libcc.so
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -34,7 +34,13 @@
 #include <boost/filesystem/path.hpp>

 #ifdef BUILD_ROGUE
-    #include "../depends/x86_64-unknown-linux-gnu/include/db_cxx.h"
+    #ifdef __APPLE__
+        #include "../depends/x86_64-apple-darwin18.6.0/include/db_cxx.h"
+    #elif defined(_WIN32)
+        #include "../depends/x86_64-w64-mingw32/include/db_cxx.h"
+    #else
+        #include "../depends/x86_64-unknown-linux-gnu/include/db_cxx.h"
+    #endif
 #else
    #include <db_cxx.h>
 #endif