diff options
| author | Josh Blum | 2012-11-26 02:43:29 -0800 |
|---|---|---|
| committer | Josh Blum | 2012-11-26 02:43:29 -0800 |
| commit | a10cd5cedee2eb30e49980f9136d6844ceb7ace1 (patch) | |
| tree | ca5d14154c082b5772ce7ece57d767b5ab5a5918 /include | |
| parent | 4aa91c001ed4dbcae1c517672b39581c9ffd7e23 (diff) | |
| download | sandhi-a10cd5cedee2eb30e49980f9136d6844ceb7ace1.tar.gz sandhi-a10cd5cedee2eb30e49980f9136d6844ceb7ace1.tar.bz2 sandhi-a10cd5cedee2eb30e49980f9136d6844ceb7ace1.zip | |
various tweaks for submodule building and msvc
Diffstat (limited to 'include')
| -rw-r--r-- | include/gras/gras.hpp | 3 | ||||
| -rw-r--r-- | include/gras/io_signature.hpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/gras/gras.hpp b/include/gras/gras.hpp index 18c0fa9..fefc35d 100644 --- a/include/gras/gras.hpp +++ b/include/gras/gras.hpp @@ -32,13 +32,16 @@ #ifdef GRAS_DLL // defined if GRAS is compiled as a DLL #ifdef GRAS_DLL_EXPORTS // defined if we are building the GRAS DLL (instead of using it) #define GRAS_API GRAS_HELPER_DLL_EXPORT + #define GRAS_EXTERN #else #define GRAS_API GRAS_HELPER_DLL_IMPORT + #define GRAS_EXTERN extern #endif // GRAS_DLL_EXPORTS #define GRAS_LOCAL GRAS_HELPER_DLL_LOCAL #else // GRAS_DLL is not defined: this means GRAS is a static lib. #define GRAS_API #define GRAS_LOCAL + #define GRAS_EXTERN #endif // GRAS_DLL #define GRAS_MAX_ALIGNMENT 32 diff --git a/include/gras/io_signature.hpp b/include/gras/io_signature.hpp index 002f79a..1d102e4 100644 --- a/include/gras/io_signature.hpp +++ b/include/gras/io_signature.hpp @@ -3,6 +3,7 @@ #ifndef INCLUDED_GRAS_IO_SIGNATURE_HPP #define INCLUDED_GRAS_IO_SIGNATURE_HPP +#include <gras/gras.hpp> #include <vector> #include <stdexcept> |