diff options
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 6 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 3b07731db8..eb92c24f48 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1365,9 +1365,9 @@ my %targets = ( } push @ex_libs, '$(PORTSDK_LIBPATH)/portlib.lib' if (defined(env('PORTSDK_LIBPATH'))); - push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib' - if (env('TARGETCPU') eq "X86"); - return @ex_libs; + push @ex_libs, '/nodefaultlib coredll.lib corelibc.lib' + if (env('TARGETCPU') =~ /^X86|^ARMV4[IT]/); + return join(" ", @ex_libs); }), }, diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 8ef70b8699..9351149fe8 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -211,8 +211,8 @@ CNF_CPPFLAGS={- our $cppfags2 = join(' ', $target{cppflags} || (), (map { '-D'.quotify1($_) } @{$target{defines}}, @{$config{defines}}), - (map { '-I'.quotify1($_) } @{$target{includes}}, - @{$config{includes}}), + (map { '-I'.'"'.$_.'"' } @{$target{includes}}, + @{$config{includes}}), @{$config{cppflags}}) -} CNF_CFLAGS={- join(' ', $target{cflags} || (), @{$config{cflags}}) -} |