diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-24 14:25:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 08:25:18 +0200 |
| commit | de54c5b749b3eefb75d420840c889533a58aa342 (patch) | |
| tree | 6502771c9dd5a0d455388734060469b18f2e4011 /openssl/util | |
| parent | 0606cba5be2dab08f0b4de540d7b278fa6273daf (diff) | |
| download | vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.gz vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.bz2 vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.zip | |
64-bit compilation now compiles and runs
Diffstat (limited to 'openssl/util')
| -rw-r--r-- | openssl/util/mk1mf.pl | 18 | ||||
| -rwxr-xr-x | openssl/util/pl/VC-32.pl | 14 |
2 files changed, 27 insertions, 5 deletions
diff --git a/openssl/util/mk1mf.pl b/openssl/util/mk1mf.pl index 21e85539e..e7534c75e 100644 --- a/openssl/util/mk1mf.pl +++ b/openssl/util/mk1mf.pl @@ -486,6 +486,22 @@ $defs.= <<"EOF"; INSTALLTOP=$INSTALLTOP OPENSSLDIR=$OPENSSLDIR +!ifdef IS64 + +!ifdef DEBUG +# The output directory for everything intersting +OUT_D=out64_d +# The output directory for all the temporary muck +TMP_D=tmp64_d +!else +# The output directory for everything intersting +OUT_D=out64 +# The output directory for all the temporary muck +TMP_D=tmp64 +!endif + +!else + !ifdef DEBUG # The output directory for everything intersting OUT_D=out32_d @@ -498,6 +514,8 @@ OUT_D=out32 TMP_D=tmp32 !endif +!endif + # Set your compiler options PLATFORM=$platform CC=$bin_dir${cc} diff --git a/openssl/util/pl/VC-32.pl b/openssl/util/pl/VC-32.pl index e6e185e89..ed5fea90d 100755 --- a/openssl/util/pl/VC-32.pl +++ b/openssl/util/pl/VC-32.pl @@ -16,7 +16,7 @@ else $crypto="libeay32"; } -$o='\\'; +$o='/'; $cp='$(PERL) util/copy.pl'; $mkdir='$(PERL) util/mkdir-p.pl'; $rm='del /Q'; @@ -43,10 +43,10 @@ if ($FLAVOR =~ /WIN64/) # considered safe to ignore. # $base_cflags= " $mf_cflag"; - my $f = $shlib || $fips ?' /MD':' /MT'; + my $f = ' /MD'; $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib - $opt_cflags=$f.' /Ox'; - $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; + $opt_cflags=$f.' /O2 /Ob2 /Oi /Ox /Oy /Ot /GL /Gy /GF /Zi'; + $dbg_cflags=$f.'d /RTCc /RTC1 /Od /GS /GR /Gy /GF /Zi'; $lflags="/NOLOGO /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG:STATUS"; $lflagsd="/NOLOGO /SUBSYSTEM:CONSOLE"; @@ -244,7 +244,11 @@ if (!$no_asm) win32_import_asm($mf_wp_asm, "whrlpool", \$whirlpool_asm_obj, \$whirlpool_asm_src); win32_import_asm($mf_cpuid_asm, "", \$cpuid_asm_obj, \$cpuid_asm_src); $perl_asm = 1; - $cdflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; + if ($FLAVOR =~ /WIN64A/) { + $cdflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_MONT -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; + } else { + $cdflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; + } } if ($shlib && $FLAVOR !~ /CE/) |