Merged From Trunk 01-22-04unlabeled-1.6.16

1 files changed, 9 insertions, 23 deletions

diff --git a/modules/VC6ProjectCreator.pm b/modules/VC6ProjectCreator.pm
index fa0edd31..64d125cf 100644
--- a/modules/VC6ProjectCreator.pm
+++ b/modules/VC6ProjectCreator.pm
@@ -18,26 +18,18 @@ use vars qw(@ISA);
 @ISA = qw(ProjectCreator);
 
 # ************************************************************
-# Data Section
-# ************************************************************
-
-my($sname) = '_Static';
-
-# ************************************************************
 # Subroutine Section
 # ************************************************************
 
-sub base_project_name {
-  my($self) = shift;
-  return $self->transform_file_name(
-               $self->project_name() .
-               ($self->get_writing_type() == 1 ? $sname : ''));
+sub compare_output {
+  #my($self) = shift;
+  return 1;
 }
 
 
-sub get_static_append {
-  #my($self) = shift;
-  return $sname;
+sub base_project_name {
+  my($self) = shift;
+  return $self->transform_file_name($self->project_name());
 }
 
 
@@ -52,8 +44,7 @@ sub translate_value {
 
     ## Only write dependencies for non-static projects
     ## and static exe projects
-    my($wt) = $self->get_writing_type();
-    if ($wt == 0 || $self->exe_target()) {
+    if ($self->get_static() == 0 || $self->exe_target()) {
       foreach my $entry (@$arr) {
         $val .= "\"$entry\" ";
       }
@@ -99,13 +90,8 @@ sub separate_static_project {
 
 sub project_file_name {
   my($self) = shift;
-  return $self->project_name() . '.dsp';
-}
-
-
-sub static_project_file_name {
-  my($self) = shift;
-  return $self->project_name() . "$sname.dsp";
+  return $self->get_modified_project_file_name($self->project_name(),
+                                               '.dsp');
 }