diff options
| author | Steve Huston <shuston@riverace.com> | 1999-07-13 20:15:58 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 1999-07-13 20:15:58 +0000 |
| commit | a7fb417ac5bc07475e3a9a41f985cd3efdf9b248 (patch) | |
| tree | 5fc2de39f3c5ab9b2567ca597232ed157b3b6f4c | |
| parent | 0bd71d536d38e848b8be111d9430665e498b3c2e (diff) | |
| download | ATCD-a7fb417ac5bc07475e3a9a41f985cd3efdf9b248.tar.gz | |
Corrected set of sources; builds (with some warnings) on AIX also.
| -rw-r--r-- | ace/ace-dll.icc | 48 | ||||
| -rw-r--r-- | ace/ace-lib.icc | 11 |
2 files changed, 23 insertions, 36 deletions
diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc index 2a084e896ae..67f5e97e22f 100644 --- a/ace/ace-dll.icc +++ b/ace/ace-dll.icc @@ -1,28 +1,28 @@ if $__TOS_WIN__ { - option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"), - define ("WIN32","1"), - define ("_WINDOWS","1") - TARG = "aced.dll" + option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"), + define ("WIN32","1"), + define ("_WINDOWS","1") + TARG = "aced.dll" } if $__TOS_AIX__ { - option PlatformOptions = null - TARG = "aced.shr.a" + option PlatformOptions = null + TARG = "libACEshr.a" + option report(disable, "CPPC1125") } option - PlatformOptions, - incl(searchPath,'H:\ACE_wrappers'), - define ("__ACE_INLINE__","0"), + PlatformOptions, + define ("__ACE_INLINE__","0"), define("ACE_HAS_DLL","0"), link(exportAll), link(linkwithsharedlib), - link(linkWithMultiThreadLib,yes) + link(linkWithMultiThreadLib,yes), + incl(searchpath, "..") { target type (dll) TARG { option macros(global) { - source type(cpp) "ACE.h" source type(cpp) "OS.h" } source type(cpp) "Log_Msg.cpp" @@ -188,17 +188,12 @@ option source type(cpp) "WIN32_Proactor.cpp" source type(cpp) "XtReactor.cpp" source type(cpp) "Active_Map_Manager_T.cpp" - source type(cpp) "Cache_Hash_T.cpp" - source type(cpp) "Cache_Heap_T.cpp" - source type(cpp) "Cache_Manager_T.cpp" source type(cpp) "Containers_T.cpp" source type(cpp) "Dump_T.cpp" source type(cpp) "Env_Value_T.cpp" source type(cpp) "Event_Handler_T.cpp" source type(cpp) "Functor_T.cpp" - source type(cpp) "Hash_Bucket_T.cpp" source type(cpp) "Hash_Map_Manager_T.cpp" - source type(cpp) "Hash_Purgable_Map_Manager_T.cpp" source type(cpp) "IOStream_T.cpp" source type(cpp) "Local_Name_Space_T.cpp" source type(cpp) "Malloc_T.cpp" @@ -232,7 +227,6 @@ option source type (cpp) "Functor_T.cpp" source type (cpp) "Future.cpp" source type (cpp) "Hash_Map_Manager_T.cpp" - source type (cpp) "Hash_Purgable_Map_Manager_T.cpp" source type (cpp) "IOStream_T.cpp" source type (cpp) "LOCK_SOCK_Acceptor.cpp" source type (cpp) "Local_Name_Space_T.cpp" @@ -262,19 +256,19 @@ option source type (cpp) "Typed_SV_Message.cpp" source type (cpp) "Typed_SV_Message_Queue.cpp" - // Libraries needed during linking - if $__TOS_WIN__ { - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - if $__TOS_AIX__ { + // Libraries needed during linking + if $__TOS_WIN__ { + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + if $__TOS_AIX__ { source type (lib) "libtli_r.a" source type (lib) "libpthreads.a" source type (lib) "libc_r.a" source type (lib) "libdl.a" - } + } } } diff --git a/ace/ace-lib.icc b/ace/ace-lib.icc index 4552416ede5..6911c45e6c1 100644 --- a/ace/ace-lib.icc +++ b/ace/ace-lib.icc @@ -6,12 +6,12 @@ if $__TOS_WIN__ { } if $__TOS_AIX__ { option PlatformOptions = null - TARG = "aced.a" + TARG = "libACE.a" } option PlatformOptions, - incl(searchPath,'H:\ACE_wrappers'), + incl(searchPath,'..'), define ("__ACE_INLINE__","0"), define("ACE_HAS_DLL","0"), link(exportAll), @@ -22,7 +22,6 @@ option { option macros(global) { - source type(cpp) "ACE.h" source type(cpp) "OS.h" } source type(cpp) "Log_Msg.cpp" @@ -188,17 +187,12 @@ option source type(cpp) "WIN32_Proactor.cpp" source type(cpp) "XtReactor.cpp" source type(cpp) "Active_Map_Manager_T.cpp" - source type(cpp) "Cache_Hash_T.cpp" - source type(cpp) "Cache_Heap_T.cpp" - source type(cpp) "Cache_Manager_T.cpp" source type(cpp) "Containers_T.cpp" source type(cpp) "Dump_T.cpp" source type(cpp) "Env_Value_T.cpp" source type(cpp) "Event_Handler_T.cpp" source type(cpp) "Functor_T.cpp" - source type(cpp) "Hash_Bucket_T.cpp" source type(cpp) "Hash_Map_Manager_T.cpp" - source type(cpp) "Hash_Purgable_Map_Manager_T.cpp" source type(cpp) "IOStream_T.cpp" source type(cpp) "Local_Name_Space_T.cpp" source type(cpp) "Malloc_T.cpp" @@ -232,7 +226,6 @@ option source type (cpp) "Functor_T.cpp" source type (cpp) "Future.cpp" source type (cpp) "Hash_Map_Manager_T.cpp" - source type (cpp) "ace/Hash_Purgable_Map_Manager_T.cpp" source type (cpp) "IOStream_T.cpp" source type (cpp) "LOCK_SOCK_Acceptor.cpp" source type (cpp) "Local_Name_Space_T.cpp" |