summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-04-24 11:07:07 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-04-24 11:07:07 +0000
commita93668dc5502fb07d5beaea2ba8686facb7391d7 (patch)
tree23f52577db07136f5741d0fd81d90f4d4ebb287b
parenta381ddb51d85388c62d31de2a09acf96f7b68a3c (diff)
downloadATCD-a93668dc5502fb07d5beaea2ba8686facb7391d7.tar.gz
ChangeLogTag: Thu Apr 24 11:05:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog8
-rwxr-xr-xbin/msvc_auto_compile.pl17
2 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 359d793b63a..971d1f3efb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 24 11:06:43 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/msvc_auto_compile.pl:
+ When the configuration name of the dsp file containers Library, DLL
+ or LIB it is build first. Previous spaces are DLL and LIB where
+ required. Also, previously, those projects where compiled twice,
+ now only once.
+
Thu Apr 24 08:50:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Service_Configurator/Misc/Timer_Service.h:
diff --git a/bin/msvc_auto_compile.pl b/bin/msvc_auto_compile.pl
index 706aee2d707..a161d3910c7 100755
--- a/bin/msvc_auto_compile.pl
+++ b/bin/msvc_auto_compile.pl
@@ -215,7 +215,7 @@ sub Build_All ()
{
my $Status = 0;
$Status = Build_Config ($c)
- if (($c =~ /Library/) || ($c =~ / DLL /) || ($c =~ / LIB /));
+ if (($c =~ /Library/) || ($c =~ /DLL/) || ($c =~ /LIB/));
return if ($Status != 0 && !$Ignore_errors);
}
}
@@ -227,11 +227,16 @@ sub Build_All ()
$count = 0;
foreach $c (@configurations) {
print STDERR "Configuration ".$count++." of ".$#configurations."\n" if ($print_status == 1);
- Build_Config ($c)
- if (($Build_DLL && $Build_Debug && $c =~ /Win32 Debug/)
- || ($Build_DLL && $Build_Release && $c =~ /Win32 Release/)
- || ($Build_LIB && $Build_Debug && $c =~ /Win32 Static Debug/)
- || ($Build_LIB && $Build_Release && $c =~ /Win32 Static Release/));
+ if (($Build_DLL && $Build_Debug && $c =~ /Win32 Debug/)
+ || ($Build_DLL && $Build_Release && $c =~ /Win32 Release/)
+ || ($Build_LIB && $Build_Debug && $c =~ /Win32 Static Debug/)
+ || ($Build_LIB && $Build_Release && $c =~ /Win32 Static Release/))
+ {
+ my $Status = 0;
+ $Status = Build_Config ($c)
+ if (!(($c =~ /Library/) || ($c =~ /DLL/) || ($c =~ /LIB/)));
+ return if ($Status != 0 && !$Ignore_errors);
+ }
}
}