diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-03-18 23:31:17 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-03-21 11:27:57 +0100 |
| commit | acf1525966161dc5d0f875d92ae3def5df628245 (patch) | |
| tree | 2a044aae87eebddd8d226755904b550036fee06e /Configurations | |
| parent | d8292af423bffad00610ebe02d7a8868c7f95dfd (diff) | |
Windows build system: get uplink right.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/10-main.conf | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index c284af6934..5fe038cc02 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -125,7 +125,7 @@ template => 1, apps_aux_src => add("../ms/applink.c"), uplink_aux_src => add("../ms/uplink.c"), - shared_defines => add("OPENSSL_USE_APPLINK", { separator => undef }), + defines => add("OPENSSL_USE_APPLINK"), }, x86_uplink => { inherit_from => [ "uplink_common" ], diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 8909700510..459de9cd30 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1237,7 +1237,7 @@ sub vc_wince_info { dso_scheme => "win32", }, "VC-noCE-common" => { - inherit_from => [ "VC-common", "uplink_common" ], + inherit_from => [ "VC-common" ], cflags => add(picker(default => "-DUNICODE -D_UNICODE", debug => sub { @@ -1268,7 +1268,8 @@ sub vc_wince_info { build_scheme => add("VC-W64", { separator => undef }), }, "VC-WIN64I" => { - inherit_from => [ "VC-WIN64-common", asm("ia64_asm") ], + inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), + sub { $disabled{shared} ? () : "ia64_uplink" } ], as => "ias", asflags => "-d debug", asoutflag => "-o", @@ -1277,7 +1278,8 @@ sub vc_wince_info { perlasm_scheme => "ias", }, "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm") ], + inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), + sub { $disabled{shared} ? () : "x86_64_uplink" } ], as => sub { vc_win64a_info()->{as} }, asflags => sub { vc_win64a_info()->{asflags} }, asoutflag => sub { vc_win64a_info()->{asoutflag} }, @@ -1289,7 +1291,8 @@ sub vc_wince_info { "VC-WIN32" => { # x86 Win32 target defaults to ANSI API, if you want UNICODE, # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE' - inherit_from => [ "VC-noCE-common", asm("x86_asm") ], + inherit_from => [ "VC-noCE-common", asm("x86_asm"), + sub { $disabled{shared} ? () : "x86_uplink" } ], as => sub { my $ver=`nasm -v 2>NUL`; my $vew=`nasmw -v 2>NUL`; return $ver ge $vew ? "nasm" : "nasmw" }, |