diff options
author | Ladislav Zezula <zezula-at-volny-dot-cz> | 2017-10-17 20:07:08 +0200 |
---|---|---|
committer | Ladislav Zezula <zezula-at-volny-dot-cz> | 2017-10-17 20:07:08 +0200 |
commit | 1de5fee2b69de899c9a1db96c90fa62db2214326 (patch) | |
tree | 3841f97ea608bc81c373101ecea69ee164c3f073 /src/StormLib.h | |
parent | 723099c90e2377af83594629d1670c1780ac5615 (diff) | |
parent | 17c1dd1a6af33cc95a1116237111417d5a3902c4 (diff) |
Merge branch 'master' of https://github.com/ladislav-zezula/StormLib
Diffstat (limited to 'src/StormLib.h')
-rw-r--r-- | src/StormLib.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/StormLib.h b/src/StormLib.h index f7512e5..45dda2e 100644 --- a/src/StormLib.h +++ b/src/StormLib.h @@ -99,8 +99,11 @@ extern "C" { // Z - S for static-linked CRT library, D for multithreaded DLL CRT library // -#if defined(_MSC_VER) && !defined(__STORMLIB_SELF__) - +#if defined(__STORMLIB_SELF__) && !defined(STORMLIB_NO_AUTO_LINK) +#define STORMLIB_NO_AUTO_LINK // Define this if you don't want to link using pragmas when using msvc +#endif + +#if defined(_MSC_VER) && !defined(STORMLIB_NO_AUTO_LINK) #ifdef _DEBUG // DEBUG VERSIONS #ifndef _UNICODE #ifdef _DLL |