diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-23 00:47:26 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-23 00:47:26 +0000 |
| commit | 3ca6b8da976e51a0496f4baf03dfcf77aee92f7d (patch) | |
| tree | 08c8d95be856a8ddb5a39724f93d1347baa32869 | |
| parent | dfcf08096c8ef30917cd285af764c7ccdf54e3d8 (diff) | |
| download | ATCD-3ca6b8da976e51a0496f4baf03dfcf77aee92f7d.tar.gz | |
ChangeLogTag:Fri Dec 22 16:45:42 2000 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp | 4 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b8681b7ba0c..cf75bd4ef3c 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Dec 22 16:45:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * performance-tests/Cubit/TAO/IDL_Cubit/client.dsp: + * performance-tests/Cubit/TAO/IDL_Cubit/server.dsp: + + Fixed the Static Release configurations. + Fri Dec 22 15:11:00 2000 Priyanka Gontla <pgontla@ece.uci.edu> * tao/ORB_Core.cpp: diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp index e661e3afec2..99edc4177c7 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp @@ -123,7 +123,7 @@ LINK32=link.exe # PROP Target_Dir "client"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,7 +132,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
-# ADD LINK32 aces.lib TAOs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 aces.lib TAOs.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp index 1632772536a..85d13f91001 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp @@ -123,7 +123,7 @@ LINK32=link.exe # PROP Target_Dir "server"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
|