diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2003-05-13 16:08:33 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2003-05-13 16:08:33 +0000 |
| commit | c252e5189ac6319e1d30747a0639047a667af4dd (patch) | |
| tree | 14f279c7e677752aa134536eaf2dfed313db99c2 | |
| parent | 0497d521a2bf57cce02e5ecfda919fb95a66299f (diff) | |
| download | ATCD-c252e5189ac6319e1d30747a0639047a667af4dd.tar.gz | |
ChangeLogTag: Tue May 13 16:59:00 2003 Simon McQueen <sm@prismtechnologies.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/makeinclude/ace_flags.bor | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0950fb9fccb..2b59ec8ff0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue May 13 16:59:00 2003 Simon McQueen <sm@prismtechnologies.com> + + * include/makeinclude/ace_flags.bor: + + Made TAO_PORTABLESERVER_CFLAGS and TAO_PORTABLESERVER_LIB into + the aggregation of themselves and TAO_VALUETYPE/TAO_IORINTERCEPTOR/ + TAO_ORT - CFLAGS and LIB respectively. Should fix link errors on + the static build. + Tue May 13 09:04:18 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/README: diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index bb21b23551a..88e6577b2b4 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -34,7 +34,7 @@ TAO_BIDIRGIOP_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_BIDIRGIOP_HAS_DLL=$(DLL_FLAG) TAO_IFR_CLIENT_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IFR_CLIENT_HAS_DLL=$(DLL_FLAG) TAO_STRATEGIES_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_STRATEGIES_HAS_DLL=$(DLL_FLAG) TAO_MESSAGING_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_MESSAGING_HAS_DLL=$(DLL_FLAG) -TAO_PORTABLESERVER_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_PORTABLESERVER_HAS_DLL=$(DLL_FLAG) +TAO_PORTABLESERVER_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_PORTABLESERVER_HAS_DLL=$(DLL_FLAG) -DTAO_VALUETYPE_HAS_DLL=$(DLL_FLAG) -DTAO_IORINTERCEPTOR_HAS_DLL=$(DLL_FLAG) -DTAO_ORT_HAS_DLL=$(DLL_FLAG) -DTAO_VALUETYPE_HAS_DLL=$(DLL_FLAG) TAO_IORINTERCEPTOR_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IORINTERCEPTOR_HAS_DLL=$(DLL_FLAG) TAO_IORMANIP_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IORMANIP_HAS_DLL=$(DLL_FLAG) TAO_IORTABLE_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IORTABLE_HAS_DLL=$(DLL_FLAG) @@ -92,7 +92,7 @@ TAO_DYNAMICANY_LIB = $(CORE_BINDIR)\TAO_DynamicAny$(LIB_DECORATOR).lib TAO_DYNAMICINTERFACE_LIB = $(CORE_BINDIR)\TAO_DynamicInterface$(LIB_DECORATOR).lib TAO_BIDIRGIOP_LIB = $(CORE_BINDIR)\TAO_BiDirGIOP$(LIB_DECORATOR).lib TAO_IFR_CLIENT_LIB = $(CORE_BINDIR)\TAO_IFR_Client$(LIB_DECORATOR).lib -TAO_PORTABLESERVER_LIB = $(CORE_BINDIR)\TAO_PortableServer$(LIB_DECORATOR).lib +TAO_PORTABLESERVER_LIB = $(CORE_BINDIR)\TAO_PortableServer$(LIB_DECORATOR).lib $(CORE_BINDIR)\TAO_ObjRefTemplate$(LIB_DECORATOR).lib $(CORE_BINDIR)\TAO_IORInterceptor$(LIB_DECORATOR).lib $(CORE_BINDIR)\TAO_Valuetype$(LIB_DECORATOR).lib TAO_STRATEGIES_LIB = $(CORE_BINDIR)\TAO_Strategies$(LIB_DECORATOR).lib TAO_MESSAGING_LIB = $(CORE_BINDIR)\TAO_Messaging$(LIB_DECORATOR).lib TAO_IORMANIP_LIB = $(CORE_BINDIR)\TAO_IORManip$(LIB_DECORATOR).lib |