make sure windows build uses same settings as unix for default

This commit is contained in:
Todd A Ouska
2011-05-16 10:31:35 -07:00
parent 4d14afa9ae
commit 3b95996022
10 changed files with 18 additions and 18 deletions

View File

@@ -1,4 +1,4 @@
AC_INIT(cyassl,2.0.0rc1,http://www.yassl.com) # !!! also change in ssl.h !!! AC_INIT(cyassl,2.0.0rc2,http://www.yassl.com) # !!! also change in ssl.h !!!
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(ctaocrypt/include/config.h) AM_CONFIG_HEADER(ctaocrypt/include/config.h)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

View File

@@ -100,7 +100,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="include" AdditionalIncludeDirectories="include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENSSL_EXTRA"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@@ -61,13 +61,13 @@
#define PACKAGE_NAME "cyassl" #define PACKAGE_NAME "cyassl"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "cyassl 2.0.0rc1" #define PACKAGE_STRING "cyassl 2.0.0rc2"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "cyassl" #define PACKAGE_TARNAME "cyassl"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "2.0.0rc1" #define PACKAGE_VERSION "2.0.0rc2"
/* Define to necessary symbol if this constant uses a non-standard name on /* Define to necessary symbol if this constant uses a non-standard name on
your system. */ your system. */
@@ -83,7 +83,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Version number of package */ /* Version number of package */
#define VERSION "2.0.0rc1" #define VERSION "2.0.0rc2"
/* Define to 1 if your processor stores words with the most significant byte /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl" AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512" PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -106,7 +106,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl" AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512" PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -117,7 +117,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -117,7 +117,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="USE_ANY_ADDR" PreprocessorDefinitions="USE_ANY_ADDR;OPENSSL_EXTRA;NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -117,7 +117,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="USE_ANY_ADDR" PreprocessorDefinitions="USE_ANY_ADDR;OPENSSL_EXTRA;NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -117,7 +117,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@@ -39,7 +39,7 @@
#include "prefix_ssl.h" #include "prefix_ssl.h"
#endif #endif
#define CYASSL_VERSION "2.0.0rc1" #define CYASSL_VERSION "2.0.0rc2"
#ifdef _WIN32 #ifdef _WIN32
/* wincrypt.h clashes */ /* wincrypt.h clashes */

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl" AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512" PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -117,7 +117,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl" AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512" PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"