diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index c902376..7740e80 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -38,7 +38,8 @@ sub Install my $target = shift; our $config; - require 'config.pl'; + require "config.pl.default"; + require "config.pl" if (-f "config.pl"); chdir("../../..") if (-f "../../../configure"); chdir("../../../..") if (-f "../../../../configure"); diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl index 2654c86..a4becf0 100644 --- a/src/tools/msvc/build.pl +++ b/src/tools/msvc/build.pl @@ -32,7 +32,8 @@ elsif (-e "./buildenv.pl" ) # set up the project our $config; -require "config.pl"; +require "config.pl.default"; +require "config.pl" if (-f "config.pl"); Mkvcbuild::mkvcbuild($config); diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl index 4d495da..3f7d817 100644 --- a/src/tools/msvc/mkvcbuild.pl +++ b/src/tools/msvc/mkvcbuild.pl @@ -12,9 +12,11 @@ use Mkvcbuild; chdir('..\..\..') if (-d '..\msvc' && -d '..\..\..\src'); die 'Must run from root or msvc directory' unless (-d 'src\tools\msvc' && -d 'src'); -die 'Could not find config.pl' unless (-f 'src/tools/msvc/config.pl'); +die 'Could not find config.pl.default' unless (-f 'src/tools/msvc/config.pl.default'); +print "Warning: no config.pl found, using default.\n" unless (-f 'src/tools/msvc/config.pl'); our $config; -require 'src/tools/msvc/config.pl'; +require 'src/tools/msvc/config.pl.default'; +require 'src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl'); Mkvcbuild::mkvcbuild($config);