Merge branch 'dev' into FSM
This commit is contained in:
@@ -35,6 +35,3 @@ else
|
|||||||
echo ROGUE BUILD FAILED
|
echo ROGUE BUILD FAILED
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm ../libcc.so
|
|
||||||
cp librogue.so ../libcc.so
|
|
||||||
|
|||||||
@@ -34,7 +34,13 @@
|
|||||||
#include <boost/filesystem/path.hpp>
|
#include <boost/filesystem/path.hpp>
|
||||||
|
|
||||||
#ifdef BUILD_ROGUE
|
#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
|
#else
|
||||||
#include <db_cxx.h>
|
#include <db_cxx.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user