diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-05 21:23:07 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-05 21:23:07 +0000 |
| commit | 6f26a7a9b311675480443232525ae1bbf30f3a02 (patch) | |
| tree | 04884f6c8a6cffafe07119576e215216ec19cb9b /TAO | |
| parent | 54f0dd1a0238399cd4c951b157a035e811bf4185 (diff) | |
| download | ATCD-6f26a7a9b311675480443232525ae1bbf30f3a02.tar.gz | |
Updated the Release version of this project.
Diffstat (limited to 'TAO')
42 files changed, 981 insertions, 315 deletions
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp index 7ba754983f9..cdc47bf74dd 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp index 972d7c4227d..197c49e6a35 100644 --- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp +++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp @@ -55,11 +55,6 @@ BSC32=bscmake.exe 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:windows /dll /machine:I386
# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Copying DLL to $TAO_ROOT/tao
-PostBuild_Cmds=copy orbsvcs.dll ..\..\tao
-# End Special Build Tool
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
@@ -684,17 +679,26 @@ SOURCE=.\Sched\Strategy_Scheduler.i # Begin Source File
SOURCE=.\CosConcurrencyControl.idl
-USERDEP__COSCO="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__COSCO="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\CosConcurrencyControl.idl
InputName=CosConcurrencyControl
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -705,25 +709,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__COSCO="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\CosConcurrencyControl.idl
InputName=CosConcurrencyControl
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -750,17 +755,26 @@ BuildCmds= \ # Begin Source File
SOURCE=.\CosLifeCycle.idl
-USERDEP__COSLI="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__COSLI="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\CosLifeCycle.idl
InputName=CosLifeCycle
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -771,25 +785,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__COSLI="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\CosLifeCycle.idl
InputName=CosLifeCycle
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -816,17 +831,26 @@ BuildCmds= \ # Begin Source File
SOURCE=.\CosNaming.idl
-USERDEP__COSNA="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__COSNA="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\CosNaming.idl
InputName=CosNaming
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -837,25 +861,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__COSNA="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\CosNaming.idl
InputName=CosNaming
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -882,17 +907,26 @@ BuildCmds= \ # Begin Source File
SOURCE=.\CosTimeBase.idl
-USERDEP__COSTI="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__COSTI="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\CosTimeBase.idl
InputName=CosTimeBase
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -903,25 +937,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__COSTI="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\CosTimeBase.idl
InputName=CosTimeBase
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -948,19 +983,56 @@ BuildCmds= \ # Begin Source File
SOURCE=.\CosTrading.idl
-USERDEP__COSTR="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
+USERDEP__COSTR="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\CosTrading.idl
+InputName=CosTrading
+
+BuildCmds= \
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__COSTR="..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\CosTrading.idl
InputName=CosTrading
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -996,17 +1068,26 @@ BuildCmds= \ # Begin Source File
SOURCE=.\LifeCycleService.idl
-USERDEP__LIFEC="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__LIFEC="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\LifeCycleService.idl
InputName=LifeCycleService
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1017,25 +1098,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__LIFEC="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\LifeCycleService.idl
InputName=LifeCycleService
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1062,17 +1144,26 @@ BuildCmds= \ # Begin Source File
SOURCE=.\Logger.idl
-USERDEP__LOGGE="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__LOGGE="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Logger.idl
InputName=Logger
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1083,25 +1174,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__LOGGE="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Logger.idl
InputName=Logger
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1131,14 +1223,23 @@ SOURCE=.\RtecEventChannelAdmin.idl !IF "$(CFG)" == "orbsvcs - Win32 Release"
-USERDEP__RTECE="..\..\TAO_IDL\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__RTECE="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\RtecEventChannelAdmin.idl
InputName=RtecEventChannelAdmin
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1149,13 +1250,13 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -1169,7 +1270,7 @@ InputName=RtecEventChannelAdmin BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1196,17 +1297,26 @@ BuildCmds= \ # Begin Source File
SOURCE=.\RtecEventComm.idl
-USERDEP__RTECEV="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__RTECEV="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\RtecEventComm.idl
InputName=RtecEventComm
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1217,25 +1327,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__RTECEV="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\RtecEventComm.idl
InputName=RtecEventComm
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1262,17 +1373,26 @@ BuildCmds= \ # Begin Source File
SOURCE=.\RtecScheduler.idl
-USERDEP__RTECS="..\..\TAO_IDL\tao_idl.exe"
!IF "$(CFG)" == "orbsvcs - Win32 Release"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__RTECS="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\RtecScheduler.idl
InputName=RtecScheduler
BuildCmds= \
- ..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1283,25 +1403,26 @@ BuildCmds= \ "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "orbsvcs - Win32 Debug"
+USERDEP__RTECS="..\..\TAO_IDL\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\RtecScheduler.idl
InputName=RtecScheduler
BuildCmds= \
..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\
- -Wb,export_include=orbsvcs_export.h $(InputName).idl
+ -Wb,export_include=orbsvcs_export.h $(InputName).idl
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/CDR/basic_types.dsp b/TAO/tests/CDR/basic_types.dsp index adfe0a83e66..b2cbcf0f2bf 100644 --- a/TAO/tests/CDR/basic_types.dsp +++ b/TAO/tests/CDR/basic_types.dsp @@ -38,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/TAO/tests/CDR/growth.dsp b/TAO/tests/CDR/growth.dsp index 42e76a41e0a..32f52f9ca72 100644 --- a/TAO/tests/CDR/growth.dsp +++ b/TAO/tests/CDR/growth.dsp @@ -17,8 +17,10 @@ CFG=CDR Growth - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "CDR Growth - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR Growth - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR Growth - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "CDR Growth - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,9 +40,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -48,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 /machine:I386
+# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
!ELSEIF "$(CFG)" == "CDR Growth - Win32 Debug"
diff --git a/TAO/tests/CDR/tc.dsp b/TAO/tests/CDR/tc.dsp index 97038ee6655..516a925b395 100644 --- a/TAO/tests/CDR/tc.dsp +++ b/TAO/tests/CDR/tc.dsp @@ -13,7 +13,7 @@ CFG=CDR TC - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "tc.mak" CFG="CDR TC Win32 Debug"
+!MESSAGE NMAKE /f "tc.mak" CFG="CDR TC - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -36,12 +36,13 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp b/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp index d934d38493b..49fe74ff051 100644 --- a/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp +++ b/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp @@ -13,12 +13,14 @@ CFG=DII_Cubit Client - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "client.mak" CFG="DII_Cubit Client - Win32 Release"
+!MESSAGE NMAKE /f "client.mak" CFG="DII_Cubit Client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "DII_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DII_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "DII_Cubit Client - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "DII_Cubit Client - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -36,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ".\client"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\client"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\IDL_Cubit" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\IDL_Cubit" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 TAO.lib ace.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\\" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO.lib ace.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "DII_Cubit Client - Win32 Debug"
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp index 321f4a76226..fbd41369826 100644 --- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp +++ b/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp @@ -13,12 +13,14 @@ CFG=IDL_Cubit Client - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "client.mak" CFG="IDL_Cubit Client - Win32 Release"
+!MESSAGE NMAKE /f "client.mak" CFG="IDL_Cubit Client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IDL_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IDL_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Client - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Client - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -36,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ".\client"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\client"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -131,20 +134,39 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "IDL_Cubit Client - Win32 Release"
-# Begin Custom Build
+USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp b/TAO/tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp index cfe9c2afd02..85bba56fd6c 100644 --- a/TAO/tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp +++ b/TAO/tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp @@ -13,7 +13,8 @@ CFG=IDL_Cubit Collocation Test - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "collocation_test.mak" CFG="IDL_Cubit Collocation Test - Win32 Debug"
+!MESSAGE NMAKE /f "collocation_test.mak"\
+ CFG="IDL_Cubit Collocation Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -38,12 +39,13 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -63,7 +65,7 @@ LINK32=link.exe # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir ".\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -145,20 +147,39 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "IDL_Cubit Collocation Test - Win32 Release"
-# Begin Custom Build
+USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp index 245191120bd..689f518acf6 100644 --- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp +++ b/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp @@ -17,8 +17,10 @@ CFG=IDL_Cubit Server - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IDL_Cubit Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IDL_Cubit Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Server - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Server - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -36,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ".\server"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\server"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -135,29 +138,39 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "IDL_Cubit Server - Win32 Release"
-# Begin Custom Build
+USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp index 00bcf501ef9..748988ba624 100644 --- a/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp +++ b/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /D TAO_ORBSVCS_HAS_DLL=1 /FD /I /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /FD /I /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -142,28 +142,39 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "MT_Cubit Client - Win32 Release"
-# Begin Custom Build
+USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
+InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl cubit.idl
+ ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
-"cubitC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp index 93acc0e6f55..de1274f6bf5 100644 --- a/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp +++ b/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -150,28 +150,39 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "MT_Cubit Server - Win32 Release"
-# Begin Custom Build
+USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
+InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl cubit.idl
+ ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
-"cubitC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"cubitS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp index b67232a6e74..d74bf9a691b 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp @@ -40,9 +40,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 /machine:I386
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "NU MT_Client_Test Client - Win32 Debug"
@@ -66,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /I "..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -133,12 +135,48 @@ SOURCE=.\MT_Object_Impl.h # Begin Source File
SOURCE=.\MT_Client_Test.idl
-USERDEP__MT_CL="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "NU MT_Client_Test Client - Win32 Release"
+USERDEP__MT_CL="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\MT_Client_Test.idl
+InputName=MT_Client_Test
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NU MT_Client_Test Client - Win32 Debug"
+USERDEP__MT_CL="..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\MT_Client_Test.idl
InputName=MT_Client_Test
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp index ff66473b385..38a6ccd96e3 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 tao.lib aced.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"server.exe"
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "NU MT_Client_Test Server - Win32 Debug"
@@ -67,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /I "..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -130,12 +131,48 @@ SOURCE=.\server.h # Begin Source File
SOURCE=.\MT_Client_Test.idl
-USERDEP__MT_CL="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "NU MT_Client_Test Server - Win32 Release"
+USERDEP__MT_CL="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\MT_Client_Test.idl
+InputName=MT_Client_Test
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NU MT_Client_Test Server - Win32 Debug"
+USERDEP__MT_CL="..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\MT_Client_Test.idl
InputName=MT_Client_Test
diff --git a/TAO/tests/NestedUpcall/Reactor/client.dsp b/TAO/tests/NestedUpcall/Reactor/client.dsp index 38830610e78..4cffb3ac784 100644 --- a/TAO/tests/NestedUpcall/Reactor/client.dsp +++ b/TAO/tests/NestedUpcall/Reactor/client.dsp @@ -38,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "NU Reactor Client - Win32 Debug"
@@ -67,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /I "..\..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,13 +135,49 @@ SOURCE=.\ReactorS_T.h # Begin Source File
SOURCE=.\Reactor.idl
-USERDEP__REACT="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "NU Reactor Client - Win32 Release"
+USERDEP__REACT="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\Reactor.idl
+InputName=Reactor
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NU Reactor Client - Win32 Debug"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+USERDEP__REACT="..\..\..\tao_idl\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Reactor.idl
InputName=Reactor
diff --git a/TAO/tests/NestedUpcall/Reactor/server.dsp b/TAO/tests/NestedUpcall/Reactor/server.dsp index 587c4a57e8c..d90f8859f3a 100644 --- a/TAO/tests/NestedUpcall/Reactor/server.dsp +++ b/TAO/tests/NestedUpcall/Reactor/server.dsp @@ -38,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 TAO.lib ace.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "NU Reactor Server - Win32 Debug"
@@ -67,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /I "..\..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,13 +135,49 @@ SOURCE=.\server.h # Begin Source File
SOURCE=.\Reactor.idl
-USERDEP__REACT="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "NU Reactor Server - Win32 Release"
+USERDEP__REACT="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\Reactor.idl
+InputName=Reactor
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NU Reactor Server - Win32 Debug"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+USERDEP__REACT="..\..\..\tao_idl\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Reactor.idl
InputName=Reactor
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp index b0333b3be03..4192b226281 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp @@ -19,7 +19,8 @@ CFG=NU Triangle Initiator - Win32 Debug !MESSAGE
!MESSAGE "NU Triangle Initiator - Win32 Release" (based on\
"Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Initiator - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Initiator - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -42,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 tao.lib aced.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"initiator.exe"
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "NU Triangle Initiator - Win32 Debug"
@@ -66,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -129,12 +131,48 @@ SOURCE=.\Triangle_TestS.h # Begin Source File
SOURCE=.\Triangle_Test.idl
-USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "NU Triangle Initiator - Win32 Release"
+USERDEP__TRIAN="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\Triangle_Test.idl
+InputName=Triangle_Test
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NU Triangle Initiator - Win32 Debug"
+USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp index a7d3fb15286..b1e3a56f915 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp @@ -19,7 +19,8 @@ CFG=NU Triangle Server_A - Win32 Debug !MESSAGE
!MESSAGE "NU Triangle Server_A - Win32 Release" (based on\
"Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Server_A - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Server_A - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -42,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 tao.lib aced.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"server_A.exe"
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "NU Triangle Server_A - Win32 Debug"
@@ -66,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /I "..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -129,12 +131,48 @@ SOURCE=.\Triangle_TestS.h # Begin Source File
SOURCE=.\Triangle_Test.idl
-USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "NU Triangle Server_A - Win32 Release"
+USERDEP__TRIAN="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\Triangle_Test.idl
+InputName=Triangle_Test
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NU Triangle Server_A - Win32 Debug"
+USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp index 307d31f779c..fc386187ab7 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp @@ -19,7 +19,8 @@ CFG=NU Triangle Server_B - Win32 Debug !MESSAGE
!MESSAGE "NU Triangle Server_B - Win32 Release" (based on\
"Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Server_B - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Server_B - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -42,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 tao.lib aced.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"server_B.exe"
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "NU Triangle Server_B - Win32 Debug"
@@ -66,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /I "..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -129,12 +131,48 @@ SOURCE=.\Triangle_TestS.h # Begin Source File
SOURCE=.\Triangle_Test.idl
-USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "NU Triangle Server_B - Win32 Release"
+USERDEP__TRIAN="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\Triangle_Test.idl
+InputName=Triangle_Test
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NU Triangle Server_B - Win32 Debug"
+USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
diff --git a/TAO/tests/OctetSeq/OctetSeq.dsp b/TAO/tests/OctetSeq/OctetSeq.dsp index 796f2c2c233..f0b62dea4da 100644 --- a/TAO/tests/OctetSeq/OctetSeq.dsp +++ b/TAO/tests/OctetSeq/OctetSeq.dsp @@ -39,9 +39,10 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -50,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 /machine:I386
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ELSEIF "$(CFG)" == "OctetSeq - Win32 Debug"
@@ -63,6 +64,7 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
diff --git a/TAO/tests/POA/DSI/client.dsp b/TAO/tests/POA/DSI/client.dsp index ab6cf70a4f5..d4afbe9fcc9 100644 --- a/TAO/tests/POA/DSI/client.dsp +++ b/TAO/tests/POA/DSI/client.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -124,18 +125,54 @@ SOURCE=.\DatabaseS_T.h # Begin Source File
SOURCE=.\Database.idl
-USERDEP__DATAB="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "POA DSI Client - Win32 Release"
+USERDEP__DATAB="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
+InputPath=.\Database.idl
+InputName=Database
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "POA DSI Client - Win32 Debug"
-# Begin Custom Build - Invoking the TAO_IDL compiler
+USERDEP__DATAB="..\..\..\tao_idl\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Database.idl
InputName=Database
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\..\tao_idl\tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/POA/DSI/server.dsp b/TAO/tests/POA/DSI/server.dsp index 97fa2a1eb39..d1874ff6f05 100644 --- a/TAO/tests/POA/DSI/server.dsp +++ b/TAO/tests/POA/DSI/server.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -120,18 +121,54 @@ SOURCE=.\Database_i.h # Begin Source File
SOURCE=.\Database.idl
-USERDEP__DATAB="..\..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "POA DSI Server - Win32 Release"
+USERDEP__DATAB="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
+InputPath=.\Database.idl
+InputName=Database
+
+BuildCmds= \
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "POA DSI Server - Win32 Debug"
-# Begin Custom Build - Invoking the TAO_IDL compiler
+USERDEP__DATAB="..\..\..\tao_idl\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Database.idl
InputName=Database
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\..\tao_idl\tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/POA/Default_Servant/client.dsp b/TAO/tests/POA/Default_Servant/client.dsp index 14a0431edbe..09bcf71ecb0 100644 --- a/TAO/tests/POA/Default_Servant/client.dsp +++ b/TAO/tests/POA/Default_Servant/client.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -127,35 +128,46 @@ SOURCE=.\File.idl !IF "$(CFG)" == "POA Default Servant Client - Win32 Release"
-# Begin Custom Build
+USERDEP__FILE_="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\File.idl
+InputName=File
BuildCmds= \
- ..\..\..\tao_idl\tao_idl File.idl
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "POA Default Servant Client - Win32 Debug"
USERDEP__FILE_="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\File.idl
InputName=File
diff --git a/TAO/tests/POA/Default_Servant/server.dsp b/TAO/tests/POA/Default_Servant/server.dsp index 11fbe9000a0..8e1fe3c835c 100644 --- a/TAO/tests/POA/Default_Servant/server.dsp +++ b/TAO/tests/POA/Default_Servant/server.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -135,35 +136,46 @@ SOURCE=.\File.idl !IF "$(CFG)" == "POA Default Servant Server - Win32 Release"
-# Begin Custom Build
+USERDEP__FILE_="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\File.idl
+InputName=File
BuildCmds= \
- ..\..\..\tao_idl\tao_idl File.idl
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "POA Default Servant Server - Win32 Debug"
USERDEP__FILE_="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\File.idl
InputName=File
diff --git a/TAO/tests/POA/Explicit_Activation/server.dsp b/TAO/tests/POA/Explicit_Activation/server.dsp index 763f3b161f0..882214a432e 100644 --- a/TAO/tests/POA/Explicit_Activation/server.dsp +++ b/TAO/tests/POA/Explicit_Activation/server.dsp @@ -44,7 +44,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -52,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\Generic_Servant.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "POA Explicit Activation Server - Win32 Debug"
diff --git a/TAO/tests/POA/FindPOA/FindPOA.dsp b/TAO/tests/POA/FindPOA/FindPOA.dsp index 274b63515d7..e92a984de2b 100644 --- a/TAO/tests/POA/FindPOA/FindPOA.dsp +++ b/TAO/tests/POA/FindPOA/FindPOA.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/TAO/tests/POA/Forwarding/client.dsp b/TAO/tests/POA/Forwarding/client.dsp index f9e442fda86..b4c4a9fe819 100644 --- a/TAO/tests/POA/Forwarding/client.dsp +++ b/TAO/tests/POA/Forwarding/client.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -127,42 +128,51 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA Forwarding Client - Win32 Release"
-# Begin Custom Build
+USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "POA Forwarding Client - Win32 Debug"
USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -I..\..\..\tao $(InputName).idl
+ ..\..\..\tao_idl\tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/POA/Forwarding/server.dsp b/TAO/tests/POA/Forwarding/server.dsp index 7a3f0562eba..dfacbbcca09 100644 --- a/TAO/tests/POA/Forwarding/server.dsp +++ b/TAO/tests/POA/Forwarding/server.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\Generic_Servant.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "POA Forwarding Server - Win32 Debug"
@@ -143,42 +144,51 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA Forwarding Server - Win32 Release"
-# Begin Custom Build
+USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "POA Forwarding Server - Win32 Debug"
USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -I..\..\..\tao $(InputName).idl
+ ..\..\..\tao_idl\tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp index c785e0e3746..602c5d68182 100644 --- a/TAO/tests/POA/Generic_Servant/server.dsp +++ b/TAO/tests/POA/Generic_Servant/server.dsp @@ -39,7 +39,7 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
@@ -54,14 +54,14 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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:windows /dll /machine:I386
-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Generic_Servant.lib" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Generic_Servant.dll" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE=$(InputPath)
PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
- ..\On_Demand_Activation
+ ..\On_Demand_Activation
PostBuild_Cmds=copy Generic_Servant.dll ..\Explicit_Activation copy\
- Generic_Servant.dll ..\On_Demand_Activation
+ Generic_Servant.dll ..\On_Demand_Activation
# End Special Build Tool
!ELSEIF "$(CFG)" == "POA Generic Servant DLL - Win32 Debug"
@@ -95,7 +95,7 @@ LINK32=link.exe SOURCE=$(InputPath)
PostBuild_Desc=Copying DLL to destinations
PostBuild_Cmds=copy Generic_Servantd.dll ..\Explicit_Activation copy\
- Generic_Servantd.dll ..\On_Demand_Activation
+ Generic_Servantd.dll ..\On_Demand_Activation
# End Special Build Tool
!ENDIF
@@ -149,13 +149,14 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA Generic Servant DLL - Win32 Release"
-# Begin Custom Build
+USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ ..\..\..\tao_idl\Release\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -185,7 +186,7 @@ InputName=Foo BuildCmds= \
..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/POA/NewPOA/NewPOA.dsp b/TAO/tests/POA/NewPOA/NewPOA.dsp index 29153afcc74..511d4d616c9 100644 --- a/TAO/tests/POA/NewPOA/NewPOA.dsp +++ b/TAO/tests/POA/NewPOA/NewPOA.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/TAO/tests/POA/On_Demand_Activation/server.dsp b/TAO/tests/POA/On_Demand_Activation/server.dsp index 79a46cf5d99..d037514009b 100644 --- a/TAO/tests/POA/On_Demand_Activation/server.dsp +++ b/TAO/tests/POA/On_Demand_Activation/server.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\Generic_Servant.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "POA On_Demand Server - Win32 Debug"
diff --git a/TAO/tests/POA/RootPOA/RootPOA.dsp b/TAO/tests/POA/RootPOA/RootPOA.dsp index abefe8ad279..52256b2a144 100644 --- a/TAO/tests/POA/RootPOA/RootPOA.dsp +++ b/TAO/tests/POA/RootPOA/RootPOA.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/TAO/tests/POA/TIE/client.dsp b/TAO/tests/POA/TIE/client.dsp index 06bf7a3b8de..81d8f56f15a 100644 --- a/TAO/tests/POA/TIE/client.dsp +++ b/TAO/tests/POA/TIE/client.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -127,37 +128,46 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA TIE Client - Win32 Release"
-# Begin Custom Build
+USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "POA TIE Client - Win32 Debug"
USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
diff --git a/TAO/tests/POA/TIE/server.dsp b/TAO/tests/POA/TIE/server.dsp index d1dc08495b7..00bd5b1e71f 100644 --- a/TAO/tests/POA/TIE/server.dsp +++ b/TAO/tests/POA/TIE/server.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -135,37 +136,46 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA TIE Server - Win32 Release"
-# Begin Custom Build
+USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputPath)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputPath)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "POA TIE Server - Win32 Debug"
USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL Compiler
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
diff --git a/TAO/tests/POA/locking/locking.dsp b/TAO/tests/POA/locking/locking.dsp index 08ab3c4f8ce..70162f65421 100644 --- a/TAO/tests/POA/locking/locking.dsp +++ b/TAO/tests/POA/locking/locking.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp index 20491d23926..82b72739b8c 100644 --- a/TAO/tests/Param_Test/client.dsp +++ b/TAO/tests/Param_Test/client.dsp @@ -17,8 +17,10 @@ CFG=Param_Test Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Param_Test Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Param_Test Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Param_Test Client - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Param_Test Client - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -36,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ELSEIF "$(CFG)" == "Param_Test Client - Win32 Debug"
@@ -332,16 +335,16 @@ SOURCE=.\Param_TestS.i # Begin Source File
SOURCE=.\param_test.idl
-USERDEP__PARAM="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "Param_Test Client - Win32 Release"
+USERDEP__PARAM="..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -373,6 +376,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Param_Test Client - Win32 Debug"
+USERDEP__PARAM="..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
diff --git a/TAO/tests/Param_Test/server.dsp b/TAO/tests/Param_Test/server.dsp index 58818be914f..3b32108eed9 100644 --- a/TAO/tests/Param_Test/server.dsp +++ b/TAO/tests/Param_Test/server.dsp @@ -17,8 +17,10 @@ CFG=Param_Test Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Param_Test Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Param_Test Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Param_Test Server - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Param_Test Server - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -36,12 +38,13 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ELSEIF "$(CFG)" == "Param_Test Server - Win32 Debug"
@@ -140,16 +143,16 @@ SOURCE=.\Param_TestS.i # Begin Source File
SOURCE=.\param_test.idl
-USERDEP__PARAM="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "Param_Test Server - Win32 Release"
+USERDEP__PARAM="..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -181,6 +184,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Param_Test Server - Win32 Debug"
+USERDEP__PARAM="..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
diff --git a/TAO/tests/Quoter/Factory_Finder.dsp b/TAO/tests/Quoter/Factory_Finder.dsp index 5223bb60a1d..246cff947af 100644 --- a/TAO/tests/Quoter/Factory_Finder.dsp +++ b/TAO/tests/Quoter/Factory_Finder.dsp @@ -41,9 +41,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 /machine:I386
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "Quoter Factory Finder - Win32 Debug"
@@ -142,16 +144,16 @@ SOURCE=.\QuoterS.i # Begin Source File
SOURCE=.\Quoter.idl
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "Quoter Factory Finder - Win32 Release"
+USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -183,6 +185,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Factory Finder - Win32 Debug"
+USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
diff --git a/TAO/tests/Quoter/Generic_Factory.dsp b/TAO/tests/Quoter/Generic_Factory.dsp index 473b93ee5bb..f7b6393f003 100644 --- a/TAO/tests/Quoter/Generic_Factory.dsp +++ b/TAO/tests/Quoter/Generic_Factory.dsp @@ -41,9 +41,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 /machine:I386
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "Quoter Generic Factory - Win32 Debug"
@@ -142,16 +144,16 @@ SOURCE=.\QuoterS.i # Begin Source File
SOURCE=.\Quoter.idl
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "Quoter Generic Factory - Win32 Release"
+USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -183,6 +185,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Generic Factory - Win32 Debug"
+USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
diff --git a/TAO/tests/Quoter/client.dsp b/TAO/tests/Quoter/client.dsp index 6adf67eb9d6..a3cbbb318d2 100644 --- a/TAO/tests/Quoter/client.dsp +++ b/TAO/tests/Quoter/client.dsp @@ -40,9 +40,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD 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 /machine:I386
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "Quoter Client - Win32 Debug"
@@ -133,16 +135,16 @@ SOURCE=.\QuoterS.i # Begin Source File
SOURCE=.\Quoter.idl
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "Quoter Client - Win32 Release"
+USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -174,6 +176,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Client - Win32 Debug"
+USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
diff --git a/TAO/tests/Quoter/server.dsp b/TAO/tests/Quoter/server.dsp index 5f08a89f498..b8caf2ca862 100644 --- a/TAO/tests/Quoter/server.dsp +++ b/TAO/tests/Quoter/server.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -52,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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 /machine:I386
-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "Quoter Server - Win32 Debug"
@@ -144,16 +144,16 @@ SOURCE=.\QuoterS.i # Begin Source File
SOURCE=.\Quoter.idl
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "Quoter Server - Win32 Release"
+USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -185,6 +185,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Server - Win32 Debug"
+USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
diff --git a/TAO/tests/Simple/client.dsp b/TAO/tests/Simple/client.dsp index 89051739755..61fd206e544 100644 --- a/TAO/tests/Simple/client.dsp +++ b/TAO/tests/Simple/client.dsp @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir ".\client"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\client"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
@@ -134,12 +134,13 @@ SOURCE=.\Simple_Object.idl !IF "$(CFG)" == "Simple Client - Win32 Release"
-# Begin Custom Build
+USERDEP__SIMPL="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Simple_Object.idl
InputName=Simple_Object
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -149,12 +150,30 @@ BuildCmds= \ "$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "Simple Client - Win32 Debug"
USERDEP__SIMPL="..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Simple_Object.idl
InputName=Simple_Object
diff --git a/TAO/tests/Simple/server.dsp b/TAO/tests/Simple/server.dsp index ff3a98fba3f..ecc95b6a16d 100644 --- a/TAO/tests/Simple/server.dsp +++ b/TAO/tests/Simple/server.dsp @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir ".\server"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\server"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
@@ -134,12 +134,22 @@ SOURCE=.\Simple_Object.idl !IF "$(CFG)" == "Simple Server - Win32 Release"
-# Begin Custom Build
+USERDEP__SIMPL="..\..\tao_idl\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Simple_Object.idl
InputName=Simple_Object
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl
+ ..\..\tao_idl\Release\tao_idl $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -163,7 +173,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Simple Server - Win32 Debug"
USERDEP__SIMPL="..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build
+# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Simple_Object.idl
InputName=Simple_Object
|