Changes to OpenSSL Project Files

Release/x86

--- "a/openssl\\ms\\ntdll.mak.orig"
+++ "b/openssl\\ms\\ntdll.mak"
@@ -32,7 +32,7 @@ EX_LIBS=ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib
 SRC_D=.

 LINK=link
-LFLAGS=/nologo /subsystem:console /opt:ref /debug
+LFLAGS=/nologo /subsystem:console /opt:ref /debug /release
 RSC=rc

 # The output directory for everything interesting
@@ -49,7 +49,7 @@ RM=del /Q
 RANLIB=
 MKDIR=$(PERL) util/mkdir-p.pl
 MKLIB=lib /nologo
-MLFLAGS= /nologo /subsystem:console /opt:ref /debug /dll
+MLFLAGS= /nologo /subsystem:console /opt:ref /debug /release /dll
 ASM=ml /nologo /Cp /coff /c /Cx /Zi

 # FIPS validated module and support file locations

Debug/x86

--- "a/openssl\\ms\\ntdll.mak.orig"
+++ "b/openssl\\ms\\ntdll.mak"
@@ -12,13 +12,13 @@
 # The one monster makefile better suits building in non-unix
 # environments.

-INSTALLTOP=C:\Temp\openssl-1.0.2a
-OPENSSLDIR=C:\Temp\openssl-1.0.2a\ssl
+INSTALLTOP=c:\src\sdks\openssl-1.0.2a-debug
+OPENSSLDIR=c:\src\sdks\openssl-1.0.2a-debug\ssl

 # Set your compiler options
 PLATFORM=VC-WIN32
 CC=cl
-CFLAG= /MD /Ox /O2 /Ob2 -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE
+CFLAG= /MDd /Od -DDEBUG -D_DEBUG -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE
 APP_CFLAG= /Zi /Fd$(TMP_D)/app
 LIB_CFLAG= /Zi /Fd$(TMP_D)/lib -D_WINDLL
 SHLIB_CFLAG=
@@ -32,13 +32,13 @@ EX_LIBS=ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib
 SRC_D=.

 LINK=link
-LFLAGS=/nologo /subsystem:console /opt:ref /debug
+LFLAGS=/nologo /subsystem:console /opt:ref /debug /release
 RSC=rc

 # The output directory for everything interesting
-OUT_D=out32dll
+OUT_D=out32dll.dbg
 # The output directory for all the temporary muck
-TMP_D=tmp32dll
+TMP_D=tmp32dll.dbg
 # The output directory for the header files
 INC_D=inc32
 INCO_D=inc32\openssl
@@ -49,7 +49,7 @@ RM=del /Q
 RANLIB=
 MKDIR=$(PERL) util/mkdir-p.pl
 MKLIB=lib /nologo
-MLFLAGS= /nologo /subsystem:console /opt:ref /debug /dll
+MLFLAGS= /nologo /subsystem:console /opt:ref /debug /release /dll
 ASM=ml /nologo /Cp /coff /c /Cx /Zi

 # FIPS validated module and support file locations

Release/x64

--- "a/openssl\\ms\\ntdll.mak.orig"
+++ "b/openssl\\ms\\ntdll.mak"
@@ -12,13 +12,13 @@
 # The one monster makefile better suits building in non-unix
 # environments.

-INSTALLTOP=C:\Temp\openssl-1.0.2a
-OPENSSLDIR=C:\Temp\openssl-1.0.2a\ssl
+INSTALLTOP=c:\src\sdks\openssl-1.0.2ax64
+OPENSSLDIR=c:\src\sdks\openssl-1.0.2ax64\ssl

 # Set your compiler options
-PLATFORM=VC-WIN32
+PLATFORM=VC-WIN64A
 CC=cl
-CFLAG= /MD /Ox /O2 /Ob2 -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE
+CFLAG= /MD /Ox -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE
 APP_CFLAG= /Zi /Fd$(TMP_D)/app
 LIB_CFLAG= /Zi /Fd$(TMP_D)/lib -D_WINDLL
 SHLIB_CFLAG=
@@ -32,7 +32,7 @@ EX_LIBS=ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib
 SRC_D=.

 LINK=link
-LFLAGS=/nologo /subsystem:console /opt:ref /debug
+LFLAGS=/nologo /subsystem:console /opt:ref /debug /release
 RSC=rc

 # The output directory for everything interesting
@@ -49,8 +49,8 @@ RM=del /Q
 RANLIB=
 MKDIR=$(PERL) util/mkdir-p.pl
 MKLIB=lib /nologo
-MLFLAGS= /nologo /subsystem:console /opt:ref /debug /dll
-ASM=ml /nologo /Cp /coff /c /Cx /Zi
+MLFLAGS= /nologo /subsystem:console /opt:ref /debug /release /dll
+ASM=ml64 /c /Cp /Cx /Zi

 # FIPS validated module and support file locations

@@ -455,6 +455,7 @@ EXHEADER= $(EXHEADER) $(INCO_D)\applink.c

 LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj
 CRYPTOOBJ=$(OBJ_D)\uplink.obj $(CRYPTOOBJ)
+CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ)


 $(TMP_D):
@@ -1429,7 +1430,7 @@ $(OBJ_D)\mem_dbg.obj: $(SRC_D)\crypto\mem_dbg.c
 	$(CC) /Fo$(OBJ_D)\mem_dbg.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -c $(SRC_D)\crypto\mem_dbg.c

 $(OBJ_D)\cversion.obj: $(SRC_D)\crypto\cversion.c
-	$(CC) /Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -DMK1MF_BUILD -DMK1MF_PLATFORM_VC_WIN32 -c $(SRC_D)\crypto\cversion.c
+	$(CC) /Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -DMK1MF_BUILD -DMK1MF_PLATFORM_VC_WIN64A -c $(SRC_D)\crypto\cversion.c

 $(OBJ_D)\ex_data.obj: $(SRC_D)\crypto\ex_data.c
 	$(CC) /Fo$(OBJ_D)\ex_data.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -c $(SRC_D)\crypto\ex_data.c

Debug/x64

--- "a/openssl\\ms\\ntdll.mak.orig"
+++ "b/openssl\\ms\\ntdll.mak"
@@ -12,13 +12,13 @@
 # The one monster makefile better suits building in non-unix
 # environments.

-INSTALLTOP=C:\Temp\openssl-1.0.2a
-OPENSSLDIR=C:\Temp\openssl-1.0.2a\ssl
+INSTALLTOP=c:\src\sdks\openssl-1.0.2ax64-debug
+OPENSSLDIR=c:\src\sdks\openssl-1.0.2ax64-debug\ssl

 # Set your compiler options
-PLATFORM=VC-WIN32
+PLATFORM=VC-WIN64A
 CC=cl
-CFLAG= /MD /Ox /O2 /Ob2 -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE
+CFLAG= /MDd /Od -DDEBUG -D_DEBUG -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE
 APP_CFLAG= /Zi /Fd$(TMP_D)/app
 LIB_CFLAG= /Zi /Fd$(TMP_D)/lib -D_WINDLL
 SHLIB_CFLAG=
@@ -32,13 +32,13 @@ EX_LIBS=ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib
 SRC_D=.

 LINK=link
-LFLAGS=/nologo /subsystem:console /opt:ref /debug
+LFLAGS=/nologo /subsystem:console /opt:ref /debug /release
 RSC=rc

 # The output directory for everything interesting
-OUT_D=out32dll
+OUT_D=out32dll.dbg
 # The output directory for all the temporary muck
-TMP_D=tmp32dll
+TMP_D=tmp32dll.dbg
 # The output directory for the header files
 INC_D=inc32
 INCO_D=inc32\openssl
@@ -49,8 +49,8 @@ RM=del /Q
 RANLIB=
 MKDIR=$(PERL) util/mkdir-p.pl
 MKLIB=lib /nologo
-MLFLAGS= /nologo /subsystem:console /opt:ref /debug /dll
-ASM=ml /nologo /Cp /coff /c /Cx /Zi
+MLFLAGS= /nologo /subsystem:console /opt:ref /debug /release /dll
+ASM=ml64 /c /Cp /Cx /Zi

 # FIPS validated module and support file locations

@@ -455,6 +455,7 @@ EXHEADER= $(EXHEADER) $(INCO_D)\applink.c

 LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj
 CRYPTOOBJ=$(OBJ_D)\uplink.obj $(CRYPTOOBJ)
+CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ)


 $(TMP_D):
@@ -1429,7 +1430,7 @@ $(OBJ_D)\mem_dbg.obj: $(SRC_D)\crypto\mem_dbg.c
 	$(CC) /Fo$(OBJ_D)\mem_dbg.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -c $(SRC_D)\crypto\mem_dbg.c

 $(OBJ_D)\cversion.obj: $(SRC_D)\crypto\cversion.c
-	$(CC) /Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -DMK1MF_BUILD -DMK1MF_PLATFORM_VC_WIN32 -c $(SRC_D)\crypto\cversion.c
+	$(CC) /Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -DMK1MF_BUILD -DMK1MF_PLATFORM_VC_WIN64A -c $(SRC_D)\crypto\cversion.c

 $(OBJ_D)\ex_data.obj: $(SRC_D)\crypto\ex_data.c
 	$(CC) /Fo$(OBJ_D)\ex_data.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -c $(SRC_D)\crypto\ex_data.c

Home