summaryrefslogtreecommitdiff
path: root/TAO/IIOP
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/IIOP')
-rw-r--r--TAO/IIOP/test/test.mak15
-rw-r--r--TAO/IIOP/test/test.mdpbin42496 -> 43008 bytes
-rw-r--r--TAO/IIOP/tests/Cubit/TAO/test.mak15
-rw-r--r--TAO/IIOP/tests/Cubit/TAO/test.mdpbin42496 -> 43008 bytes
4 files changed, 22 insertions, 8 deletions
diff --git a/TAO/IIOP/test/test.mak b/TAO/IIOP/test/test.mak
index 136b00ac904..a27147d5f32 100644
--- a/TAO/IIOP/test/test.mak
+++ b/TAO/IIOP/test/test.mak
@@ -33,6 +33,7 @@ NULL=nul
!ENDIF
################################################################################
# Begin Project
+# PROP Target_Last_Scanned "server - Win32 Debug"
RSC=rc.exe
CPP=cl.exe
@@ -137,8 +138,8 @@ BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
+# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
/pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe"
@@ -255,8 +256,8 @@ BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
+# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
/pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe"
@@ -307,6 +308,7 @@ LINK32_OBJS= \
SOURCE=.\clnt.cpp
DEP_CPP_CLNT_=\
+ "..\..\..\ace\config-win32.h"\
".\cubitC.h"\
{$(INCLUDE)}"\ace\ACE.h"\
{$(INCLUDE)}"\ace\ACE.i"\
@@ -321,6 +323,8 @@ DEP_CPP_CLNT_=\
{$(INCLUDE)}"\ace\Log_Priority.h"\
{$(INCLUDE)}"\ace\Log_Record.h"\
{$(INCLUDE)}"\ace\Log_Record.i"\
+ {$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
{$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\SString.h"\
@@ -416,6 +420,7 @@ NODEP_CPP_CUBIT_=\
SOURCE=.\svr.cpp
DEP_CPP_SVR_C=\
+ "..\..\..\ace\config-win32.h"\
".\cubit_i.h"\
".\cubitC.h"\
".\cubitS.h"\
@@ -432,6 +437,8 @@ DEP_CPP_SVR_C=\
{$(INCLUDE)}"\ace\Log_Priority.h"\
{$(INCLUDE)}"\ace\Log_Record.h"\
{$(INCLUDE)}"\ace\Log_Record.i"\
+ {$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
{$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\SString.h"\
diff --git a/TAO/IIOP/test/test.mdp b/TAO/IIOP/test/test.mdp
index 21a6ca18114..dc1aea7d5be 100644
--- a/TAO/IIOP/test/test.mdp
+++ b/TAO/IIOP/test/test.mdp
Binary files differ
diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mak b/TAO/IIOP/tests/Cubit/TAO/test.mak
index 136b00ac904..58b77c28283 100644
--- a/TAO/IIOP/tests/Cubit/TAO/test.mak
+++ b/TAO/IIOP/tests/Cubit/TAO/test.mak
@@ -33,6 +33,7 @@ NULL=nul
!ENDIF
################################################################################
# Begin Project
+# PROP Target_Last_Scanned "server - Win32 Debug"
RSC=rc.exe
CPP=cl.exe
@@ -137,8 +138,8 @@ BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
+# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
/pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe"
@@ -255,8 +256,8 @@ BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
+# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
/pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe"
@@ -307,6 +308,7 @@ LINK32_OBJS= \
SOURCE=.\clnt.cpp
DEP_CPP_CLNT_=\
+ "..\..\..\..\..\ace\config-win32.h"\
".\cubitC.h"\
{$(INCLUDE)}"\ace\ACE.h"\
{$(INCLUDE)}"\ace\ACE.i"\
@@ -321,6 +323,8 @@ DEP_CPP_CLNT_=\
{$(INCLUDE)}"\ace\Log_Priority.h"\
{$(INCLUDE)}"\ace\Log_Record.h"\
{$(INCLUDE)}"\ace\Log_Record.i"\
+ {$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
{$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\SString.h"\
@@ -416,6 +420,7 @@ NODEP_CPP_CUBIT_=\
SOURCE=.\svr.cpp
DEP_CPP_SVR_C=\
+ "..\..\..\..\..\ace\config-win32.h"\
".\cubit_i.h"\
".\cubitC.h"\
".\cubitS.h"\
@@ -432,6 +437,8 @@ DEP_CPP_SVR_C=\
{$(INCLUDE)}"\ace\Log_Priority.h"\
{$(INCLUDE)}"\ace\Log_Record.h"\
{$(INCLUDE)}"\ace\Log_Record.i"\
+ {$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
{$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\SString.h"\
diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mdp b/TAO/IIOP/tests/Cubit/TAO/test.mdp
index 21a6ca18114..eccc5e94b69 100644
--- a/TAO/IIOP/tests/Cubit/TAO/test.mdp
+++ b/TAO/IIOP/tests/Cubit/TAO/test.mdp
Binary files differ
View Lorry Controller Status