diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-12-19 13:21:40 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-12-19 13:21:40 +0000 |
| commit | db9e59318ff8a657d7df37fd95e95dac173d7311 (patch) | |
| tree | 97089ff7d9ce1f7d3d46b1d5bb89eb34a7731395 | |
| parent | 8a44795cb7ffb9c0940e1cddcd3f7594603d6f57 (diff) | |
| download | MPC-db9e59318ff8a657d7df37fd95e95dac173d7311.tar.gz | |
ChangeLogTag: Thu Dec 19 06:47:07 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | modules/Driver.pm | 11 | ||||
| -rw-r--r-- | templates/vc7.mpd | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/modules/Driver.pm b/modules/Driver.pm index 296bdc86..4599d325 100644 --- a/modules/Driver.pm +++ b/modules/Driver.pm @@ -344,15 +344,18 @@ sub run { ## Set up a hash that we can use to keep track of what ## has been 'required' my(%loaded) = (); + + ## Save the original directory outside of the loop + ## to avoid calling it multiple times. + my($orig_dir) = Cwd::getcwd(); + ## Generate the files foreach my $file (@input) { ## To correctly reference any pathnames in the input file, chdir to ## its directory if there's any directory component to the specified path. - my $orig_dir = Cwd::getcwd(); - my $dir = dirname($file); - my $base = basename($file); + my($base) = basename($file); if ($base ne $file) { - chdir($dir); + chdir(dirname($file)); $file = $base; } foreach my $name (@generators) { diff --git a/templates/vc7.mpd b/templates/vc7.mpd index 2deed199..6f3a9453 100644 --- a/templates/vc7.mpd +++ b/templates/vc7.mpd @@ -68,7 +68,7 @@ GenerateDebugInformation="TRUE" <%endif%> <%if(pdb)%> - ProgramDatabaseFile="<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%><%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%><%endif%><%if(type_is_static)%><%output_dir%>\<%staticdname%><%lib_modifier%><%endif%>.pdb" + ProgramDatabaseFile=".\<%intermediate_dir%>\<%if(type_is_dynamic)%><%sharedname%><%lib_modifier%><%endif%><%if(exename)%><%exename%><%endif%><%if(type_is_static)%><%staticname%><%lib_modifier%><%endif%>.pdb" <%endif%> <%if(type_is_dynamic)%> SubSystem="<%subsystem("2")%>" |