diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-27 06:45:16 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-27 06:45:16 +0000 |
| commit | 0673cde46a04601bf1142e70165b9100b71351bd (patch) | |
| tree | 7bcaaf0cdf62c806bc429dd8dcadf0fb78ef387d | |
| parent | 60e89cda46e37478c113b27da81be5d336e5b945 (diff) | |
| download | ATCD-0673cde46a04601bf1142e70165b9100b71351bd.tar.gz | |
ChangeLogTag: Fri Aug 27 08:44:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tests/Collocation/Collocation.bor | 9 | ||||
| -rw-r--r-- | TAO/tests/Collocation/Diamond.bor | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/TAO/tests/Collocation/Collocation.bor b/TAO/tests/Collocation/Collocation.bor index 80c6bde0aac..eb1b1a4e4ae 100644 --- a/TAO/tests/Collocation/Collocation.bor +++ b/TAO/tests/Collocation/Collocation.bor @@ -12,16 +12,17 @@ CFLAGS = \ $(ACE_CFLAGS) \ $(TAO_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ - -DDIAMOND_HAS_DLL=1 \ - -DMY_STUB_HAS_DLL=1 + $(TAO_STRATEGIES_CFLAGS) \ + -DDIAMOND_HAS_DLL=$(DLL_FLAG) \ + -DMY_STUB_HAS_DLL=$(DLL_FLAG) LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_STRATEGIES_LIB) \ - $(BINDIR)\Diamond$(LIB_DECORATOR).lib \ - $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib + $(BINDIR)\Diamond$(LIB_DECORATOR).lib \ + $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib CPPDIR = . diff --git a/TAO/tests/Collocation/Diamond.bor b/TAO/tests/Collocation/Diamond.bor index b632cc87ebe..c442bcffa4e 100644 --- a/TAO/tests/Collocation/Diamond.bor +++ b/TAO/tests/Collocation/Diamond.bor @@ -16,8 +16,8 @@ CFLAGS = \ $(ACE_CFLAGS) \ $(TAO_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ - -DDIAMOND_HAS_DLL=1 \ - -DDIAMOND_BUILD_DLL=1 + -DDIAMOND_HAS_DLL=$(DLL_FLAG) \ + -DDIAMOND_BUILD_DLL=$(DLL_FLAG) LIBFILES = \ $(ACE_LIB) \ |