ChangeLogTag: Tue Mar 8 07:21:11 2005 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 31 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 292bb71e..5f6b7b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Mar  8 07:21:11 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/ProjectCreator.pm:
+        * modules/TemplateParser.pm:
+        * modules/VC6ProjectCreator.pm:
+
+          vc6 and em3 do not deal with $(...) correctly when compiling
+          source into an alternate intermediate directory (it doesn't expand
+          $(...) inside the /Fo option).
+
 Mon Mar  7 10:01:34 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * README:
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 66a987d1..13e6d2e4 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -4039,6 +4039,12 @@ sub remove_non_custom_settings {
 # Virtual Methods To Be Overridden
 # ************************************************************
 
+sub validated_directory {
+  my($self) = shift;
+  my($dir)  = shift;
+  return $dir;
+}
+
 sub get_quote_symbol {
   #my($self) = shift;
   return '"';
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index 713cf75b..3b9bf272 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -105,7 +105,7 @@ sub tp_dirname {
   for(my $i = length($file) - 1; $i != 0; --$i) {
     my($ch) = substr($file, $i, 1);
     if ($ch eq '/' || $ch eq '\\') {
-      return substr($file, 0, $i);
+      return $self->{'prjc'}->validated_directory(substr($file, 0, $i));
     }
   }
   return '.';
diff --git a/modules/VC6ProjectCreator.pm b/modules/VC6ProjectCreator.pm
index 918a5b20..a9e5dbfb 100644
--- a/modules/VC6ProjectCreator.pm
+++ b/modules/VC6ProjectCreator.pm
@@ -22,6 +22,20 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
+sub validated_directory {
+  my($self) = shift;
+  my($dir)  = shift;
+
+  ## VC6 (and EM3) do not deal with $(...) correctly
+  if ($dir =~ /\$\(.*\)/) {
+    return '.';
+  }
+  else {
+    return $dir;
+  }
+}
+
+
 sub project_file_extension {
   #my($self) = shift;
   return '.dsp';