Fossil SCM
The resource compiler workaround in the previous check-in is only needed for MinGW, this check-in makes the MSVC build work again.
Commit
3d8431045399d973fe01629dd38233f27d421118
Parent
c8019598d47646d…
1 file changed
+5
+5
| --- win/fossil.rc | ||
| +++ win/fossil.rc | ||
| @@ -32,12 +32,17 @@ | ||
| 32 | 32 | #define _RC_COMPILE_ |
| 33 | 33 | #include "config.h" |
| 34 | 34 | #include "sqlite3.h" |
| 35 | 35 | |
| 36 | 36 | #if defined(FOSSIL_ENABLE_MINIZ) |
| 37 | +#if defined(__MINGW32__) | |
| 37 | 38 | #include "minizver.h" |
| 38 | 39 | #else |
| 40 | +#define MINIZ_HEADER_FILE_ONLY | |
| 41 | +#include "miniz.c" | |
| 42 | +#endif /* defined(__MINGW32__) */ | |
| 43 | +#else | |
| 39 | 44 | #include "zlib.h" |
| 40 | 45 | #endif /* defined(FOSSIL_ENABLE_MINIZ) */ |
| 41 | 46 | |
| 42 | 47 | #if defined(FOSSIL_ENABLE_SSL) |
| 43 | 48 | #include "openssl/opensslv.h" |
| 44 | 49 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -32,12 +32,17 @@ | |
| 32 | #define _RC_COMPILE_ |
| 33 | #include "config.h" |
| 34 | #include "sqlite3.h" |
| 35 | |
| 36 | #if defined(FOSSIL_ENABLE_MINIZ) |
| 37 | #include "minizver.h" |
| 38 | #else |
| 39 | #include "zlib.h" |
| 40 | #endif /* defined(FOSSIL_ENABLE_MINIZ) */ |
| 41 | |
| 42 | #if defined(FOSSIL_ENABLE_SSL) |
| 43 | #include "openssl/opensslv.h" |
| 44 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -32,12 +32,17 @@ | |
| 32 | #define _RC_COMPILE_ |
| 33 | #include "config.h" |
| 34 | #include "sqlite3.h" |
| 35 | |
| 36 | #if defined(FOSSIL_ENABLE_MINIZ) |
| 37 | #if defined(__MINGW32__) |
| 38 | #include "minizver.h" |
| 39 | #else |
| 40 | #define MINIZ_HEADER_FILE_ONLY |
| 41 | #include "miniz.c" |
| 42 | #endif /* defined(__MINGW32__) */ |
| 43 | #else |
| 44 | #include "zlib.h" |
| 45 | #endif /* defined(FOSSIL_ENABLE_MINIZ) */ |
| 46 | |
| 47 | #if defined(FOSSIL_ENABLE_SSL) |
| 48 | #include "openssl/opensslv.h" |
| 49 |