Commit 592123ef authored by Andrew Dunstan's avatar Andrew Dunstan

Unify searchpath and do file logic in MSVC build scripts.

Commit f83419b7 failed to notice that mkvcbuild.pl and build.pl use
different searchpath and do-file logic, breaking the latter, so it is
adjusted to use the same logic as mkvcbuild.pl.
parent 171e0418
...@@ -4,19 +4,18 @@ ...@@ -4,19 +4,18 @@
use strict; use strict;
BEGIN use File::Basename;
{ use File::Spec;
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
chdir("../../..") if (-d "../msvc" && -d "../../../src");
}
use lib "src/tools/msvc";
use Cwd; use Cwd;
use Mkvcbuild; use Mkvcbuild;
chdir('..\..\..') if (-d '..\msvc' && -d '..\..\..\src');
die 'Must run from root or msvc directory'
unless (-d 'src\tools\msvc' && -d 'src');
# buildenv.pl is for specifying the build environment settings # buildenv.pl is for specifying the build environment settings
# it should contain lines like: # it should contain lines like:
# $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}"; # $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
...@@ -32,8 +31,8 @@ elsif (-e "./buildenv.pl") ...@@ -32,8 +31,8 @@ elsif (-e "./buildenv.pl")
# set up the project # set up the project
our $config; our $config;
do "./config_default.pl"; do "./src/tools/msvc/config_default.pl";
do "./config.pl" if (-f "src/tools/msvc/config.pl"); do "./src/tools/msvc/config.pl" if (-f "src/tools/msvc/config.pl");
my $vcver = Mkvcbuild::mkvcbuild($config); my $vcver = Mkvcbuild::mkvcbuild($config);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment