diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-19 12:57:15 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-19 12:57:15 +0000 |
| commit | c9555d2cc9a1fad4d2718f1331824d900c4e7dcb (patch) | |
| tree | 25bd4c156ad9845de9daae78969965c81ef6fd62 | |
| parent | cb56ed49449c726b15c074234c6cd95c36c9ac7e (diff) | |
| download | ATCD-c9555d2cc9a1fad4d2718f1331824d900c4e7dcb.tar.gz | |
ChangeLogTag: Fri Nov 19 06:55:32 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/bor.mpd | 13 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 2 |
3 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 5c055218c81..a4beafa7737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Fri Nov 19 06:55:32 2004 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/bor.mpd: + + If there is no exe or lib target, don't include one of the *.bor + from include/makeinclude and create a dummy 'all' target. + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Added $(EXEEXT) to the end of the TAO_IDL_DEP assignment to + support windows builds. + Fri Nov 19 09:48:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/templates/bor.mpd: diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd index 9e3ede5c610..0a7613be9af 100644 --- a/bin/MakeProjectCreator/templates/bor.mpd +++ b/bin/MakeProjectCreator/templates/bor.mpd @@ -174,15 +174,14 @@ BASE_BINDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> <%else%> -<%if(dllout)%> -BINDIR = <%dllout%> -<%else%> -<%if(libout)%> -BINDIR = <%libout%> -<%endif%> -<%endif%> +<%if(sharedname || staticname)%> +BINDIR = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%> !include <$(ACE_ROOT)\include\makeinclude\build_library.bor> +<%else%> +all: + @-rem +<%endif%> <%endif%> <%if(header_files || template_files || inline_files || idl_files || pidl_files)%> diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 07c8ec51ff6..e7e68c6c2b8 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -84,7 +84,7 @@ ACE_SHLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_l TAO_IDL = <%tao_idl%> <%endif%> <%if(tao_idl_dep)%> -TAO_IDL_DEP = <%tao_idl%> +TAO_IDL_DEP = <%tao_idl%>$(EXEEXT) <%endif%> <%if(tao_idlflags)%> TAO_IDLFLAGS = <%tao_idlflags%> |