summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevoskuil <eric@voskuil.org>2014-04-09 00:17:36 (GMT)
committer evoskuil <eric@voskuil.org>2014-04-09 00:17:36 (GMT)
commitd93eeeb25a64543f5a6bf5c34ab1f682fde312e3 (patch)
treecd9e8753c8a482a4ae711a0495061f1c8e4ca558
parentd3e58705d11e773d27cc8edfff83544271d81852 (diff)
Add define.hpp to VS project, modify public symbol names.refs/pull/43/head
-rw-r--r--builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj1
-rw-r--r--builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters3
-rw-r--r--include/bitcoin/define.hpp17
3 files changed, 11 insertions, 10 deletions
diff --git a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj
index 1482d5a..b7ff081 100644
--- a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj
+++ b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj
@@ -289,6 +289,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\blockchain\leveldb_blockchain.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\blockchain\organizer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\constants.hpp" />
+ <ClInclude Include="..\..\..\..\include\bitcoin\define.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\error.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\format.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\getx_responder.hpp" />
diff --git a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters
index 7a44d3d..d61a6f4 100644
--- a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters
+++ b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters
@@ -319,6 +319,9 @@
<ClInclude Include="..\..\..\..\src\blockchain\database\mman_win32.h">
<Filter>src\blockchain\database</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\..\include\bitcoin\define.hpp">
+ <Filter>include</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="readme.txt" />
diff --git a/include/bitcoin/define.hpp b/include/bitcoin/define.hpp
index 1d506a7..3c4b958 100644
--- a/include/bitcoin/define.hpp
+++ b/include/bitcoin/define.hpp
@@ -45,18 +45,15 @@
// DLL exports (or does nothing for static build)
// BC_INTERNAL is used for non-api symbols.
-#ifdef BC_DLL
- #ifdef BC_DLL_EXPORTS
- // Being compiled as a DLL (instead of using it)
- #define BC_API BC_HELPER_DLL_EXPORT
- #else
- #define BC_API BC_HELPER_DLL_IMPORT
- #endif
- #define BC_INTERNAL BC_HELPER_DLL_LOCAL
-#else
- // BC_DLL is not defined: this means this is a static lib.
+#if defined BC_STATIC
#define BC_API
#define BC_INTERNAL
+#elif defined BC_DLL
+ #define BC_API BC_HELPER_DLL_EXPORT
+ #define BC_INTERNAL BC_HELPER_DLL_LOCAL
+#else
+ #define BC_API BC_HELPER_DLL_IMPORT
+ #define BC_INTERNAL BC_HELPER_DLL_LOCAL
#endif
#endif