diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-12-17 14:21:25 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-12-17 14:21:25 +0000 |
| commit | 9b662dae54563a3387088043b00b5945b91e12e4 (patch) | |
| tree | 72d22219b709300da421ec4c06c353e951302b2b | |
| parent | 7f95a6ef58dadc5c094ae3ef6adaf9f8cb5c2cf8 (diff) | |
| download | ATCD-9b662dae54563a3387088043b00b5945b91e12e4.tar.gz | |
ChangeLogTag: Tue Dec 17 08:20:22 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm | 7 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/nmake.mpd | 4 |
4 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 1e6e4c7d40b..2107f197f69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Dec 17 08:20:22 2002 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: + + Fixed a problem with generated Makefiles where CFG is defaulted. + + * bin/MakeProjectCreator/templates/nmake.mpd: + + Modified the dependencies file name. + Tue Dec 17 07:03:40 2002 Chad Elliott <elliott_c@ociweb.com> * ace/Array_Base.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 1e6e4c7d40b..2107f197f69 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Tue Dec 17 08:20:22 2002 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: + + Fixed a problem with generated Makefiles where CFG is defaulted. + + * bin/MakeProjectCreator/templates/nmake.mpd: + + Modified the dependencies file name. + Tue Dec 17 07:03:40 2002 Chad Elliott <elliott_c@ociweb.com> * ace/Array_Base.h: diff --git a/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm index fea75097de3..8ba5b723e95 100644 --- a/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/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/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd index 99d56f4735e..f82943a32e8 100644 --- a/bin/MakeProjectCreator/templates/nmake.mpd +++ b/bin/MakeProjectCreator/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 |