diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 11:48:15 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 11:48:15 +0000 |
| commit | fa6c2c99831e25b491e806421cfaa402bbfc7a93 (patch) | |
| tree | ad83996e8f1c40af49450acf5ffda1e11eb43b90 /openssl | |
| parent | 130545c28f950a752101b23a49493fa5aed40594 (diff) | |
INTEGRATION: CWS openssl01 (1.1.2); FILE MERGED
2007/11/21 10:17:31 tkr 1.1.2.1: #i83687# use CC on windows plattform
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/openssl.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 20172aeac273..b77308fd83ae 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -29,3 +29,58 @@ ($ssl,$crypto)=("ssl","crypto"); +--- misc/build/openssl-0.9.8e/util/pl/VC-32.pl 2006-01-15 14:46:20.000000000 +0100 ++++ misc/build/openssl-0.9.8e/util/pl/VC-32.pl 2007-11-21 10:05:05.156250000 +0100 +@@ -14,7 +14,7 @@ + $zlib_lib="zlib1.lib"; + + # C compiler stuff +-$cc='cl'; ++$cc=$ENV{'CC'}; + if ($FLAVOR =~ /WIN64/) + { + # Note that we currently don't have /WX on Win64! There is a lot of +@@ -83,19 +83,19 @@ + } + + $cc='$(CC)'; +- $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; ++ $base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; + $base_cflags.=" $wcecdefs"; +- $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... +- $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; ++ $opt_cflags=' -MC -O1i'; # optimize for space, but with intrinsics... ++ $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /opt:ref $wcelflag"; + } + else # Win32 + { +- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; ++ $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; + $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 + $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 +- $opt_cflags=' /MD /Ox /O2 /Ob2'; +- $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG'; ++ $opt_cflags=' -MD -Ox -O2 -Ob2'; ++ $dbg_cflags=' -MDd -Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /subsystem:console /opt:ref"; + } + $mlflags=''; +@@ -116,7 +116,7 @@ + } + + $obj='.obj'; +-$ofile="/Fo"; ++$ofile="-Fo.\\"; + + # EXE linking stuff + $link="link"; +@@ -234,7 +234,7 @@ + $tmp_def='tmp32dll_$(TARGETCPU)'; + } + +-$cflags.=" /Fd$out_def"; ++$cflags.=" -Fd$out_def"; + + sub do_lib_rule + { |