summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2002-12-17 14:21:25 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2002-12-17 14:21:25 +0000
commit60d470f5771f16defa1b56c5a6b06a9775dd31a2 (patch)
treee96a114fe720a713809d9eaf75d560e6c2cd4293
parent551214b8adc66b2d0c6f82d4f71aee193d75b403 (diff)
downloadMPC-60d470f5771f16defa1b56c5a6b06a9775dd31a2.tar.gz
ChangeLogTag: Tue Dec 17 08:20:22 2002 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--modules/NMakeWorkspaceCreator.pm7
-rw-r--r--templates/nmake.mpd4
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/NMakeWorkspaceCreator.pm b/modules/NMakeWorkspaceCreator.pm
index fea75097..8ba5b723 100644
--- a/modules/NMakeWorkspaceCreator.pm
+++ b/modules/NMakeWorkspaceCreator.pm
@@ -90,7 +90,12 @@ sub write_comps {
my(@list) = $self->sort_dependencies($projects, $pjs);
my($crlf) = $self->crlf();
- print $fh "ALL:$crlf";
+ print $fh '!IF "$(CFG)" == ""' . $crlf .
+ 'CFG=Win32 Debug' . $crlf .
+ '!MESSAGE No configuration specified. ' .
+ 'Defaulting to Win32 Debug.' . $crlf .
+ '!ENDIF' . $crlf . $crlf .
+ 'ALL:' . $crlf;
$self->write_project_targets($fh, 'CFG="$(CFG)"', \@list);
print $fh "$crlf" .
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 99d56f47..f82943a3 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -149,8 +149,8 @@ LINK32_OBJS= \
!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("<%dependency_file("project.dep")%>")
-!INCLUDE "<%dependency_file%>"
+!IF EXISTS("<%noextension(project_file)%>.dep")
+!INCLUDE "<%noextension(project_file)%>.dep"
!ELSE
!MESSAGE Warning: cannot find "<%dependency_file%>"
!ENDIF