diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-05-14 16:13:24 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-05-14 16:13:24 +0000 |
| commit | 879faef4d517698250a8ab24f4e4d9f6aca65b17 (patch) | |
| tree | 71e00c57fab1b65afb08519acfaa7c182d18e99b | |
| parent | 2102bbe15f350fd7432c97648c11f15acfc44fbf (diff) | |
| download | ATCD-879faef4d517698250a8ab24f4e4d9f6aca65b17.tar.gz | |
ChangeLogTag: Wed May 14 11:11:31 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/nmake.mpd | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 7ae601e0738..beea3e25f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,23 @@ +Wed May 14 11:11:31 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/nmake.mpd: + + Force the idl_stubs target to be processed before anything else. + In case an idl file is listed but not explicitly listed in the + source files, we still need to process the idl first. + Wed May 14 14:52:40 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/config-all.h: * ace/README: Added new macro, ACE_USES_ALLOCA. If it is not defined in the user's config.h, then turn off ACE_HAS_ALLOCA by default. - + Tue May 13 09:39:13 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/OS.i (last_error): Fixed this method so that it assigns errno - to the error value. This fixes an inconsistency reported by - Damien Dufour <damien.dufour@horanet.com>. + * ace/OS.i (last_error): Fixed this method so that it assigns errno + to the error value. This fixes an inconsistency reported by + Damien Dufour <damien.dufour@horanet.com>. Tue May 13 16:59:00 2003 Simon McQueen <sm@prismtechnologies.com> diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd index 9ce35527cbc..95e331445a7 100644 --- a/bin/MakeProjectCreator/templates/nmake.mpd +++ b/bin/MakeProjectCreator/templates/nmake.mpd @@ -48,7 +48,7 @@ OUTDIR=<%libout%> <%endif%> INTDIR=<%intermediate_dir%>\<%noextension(project_file)%> -ALL : <%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> ".\<%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%endif%><%custom_type->input_file->output_file%>"<%endfor%><%endfor%><%endfor%> +ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> ".\<%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%endif%><%custom_type->input_file->output_file%>"<%endfor%><%endfor%><%endfor%> DEPEND : depgen.pl<%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines)%> -D<%define%>=1<%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%> -D<%dllflag%>=1<%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%> -D<%libflag%>=1<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%>=1<%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%> @@ -201,7 +201,7 @@ SOURCE=.\<%pch_source%> CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c -"$(INTDIR)\<%basenoextension(pch_source)%>.obj" "$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"<%if(idl_files)%> IDL_STUBS<%endif%> +"$(INTDIR)\<%basenoextension(pch_source)%>.obj" "$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)" $(CPP) @<< $(CPP_SWITCHES) $(SOURCE) << |