diff options
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/Makefile | 8 | ||||
| -rw-r--r-- | openssl/crypto/opensslconf.h | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/openssl/Makefile b/openssl/Makefile index 57d742e4d..867001215 100644 --- a/openssl/Makefile +++ b/openssl/Makefile @@ -12,9 +12,9 @@ SHLIB_VERSION_HISTORY= SHLIB_MAJOR=0 SHLIB_MINOR=9.8 SHLIB_EXT= -PLATFORM=dist +PLATFORM=VC-WIN32 OPTIONS= no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic -CONFIGURE_ARGS=dist +CONFIGURE_ARGS=VC-WIN32 SHLIB_TARGET= # HERE indicates where this Makefile lives. This can be used to indicate @@ -59,8 +59,8 @@ OPENSSLDIR=/usr/local/ssl # equal 4. # PKCS1_CHECK - pkcs1 tests. -CC= cc -CFLAG= -O +CC= cl +CFLAG= -DOPENSSL_THREADS -DDSO_WIN32 DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED PEX_LIBS= EX_LIBS= diff --git a/openssl/crypto/opensslconf.h b/openssl/crypto/opensslconf.h index 60505327d..a9bfcc00c 100644 --- a/openssl/crypto/opensslconf.h +++ b/openssl/crypto/opensslconf.h @@ -2,6 +2,9 @@ /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ /* OpenSSL was configured with the following options: */ +#ifndef OPENSSL_SYSNAME_WIN32 +# define OPENSSL_SYSNAME_WIN32 +#endif #ifndef OPENSSL_DOING_MAKEDEPEND @@ -38,8 +41,8 @@ #endif /* OPENSSL_DOING_MAKEDEPEND */ -#ifndef OPENSSL_NO_DYNAMIC_ENGINE -# define OPENSSL_NO_DYNAMIC_ENGINE +#ifndef OPENSSL_THREADS +# define OPENSSL_THREADS #endif /* The OPENSSL_NO_* macros are also defined as NO_* if the application @@ -110,6 +113,7 @@ #define OPENSSL_UNISTD <unistd.h> #undef OPENSSL_EXPORT_VAR_AS_FUNCTION +#define OPENSSL_EXPORT_VAR_AS_FUNCTION #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) #define IDEA_INT unsigned int @@ -154,7 +158,7 @@ #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) #define CONFIG_HEADER_BN_H -#undef BN_LLONG +#define BN_LLONG /* Should we define BN_DIV2W here? */ @@ -173,7 +177,7 @@ #define CONFIG_HEADER_RC4_LOCL_H /* if this is defined data[i] is used instead of *data, this is a %20 * speedup on x86 */ -#undef RC4_INDEX +#define RC4_INDEX #endif #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) |