diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-02 07:01:09 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-02 07:01:09 +0000 |
| commit | 0f3105ad3cc4a8ecdafc9ccd93d554662d68a7e8 (patch) | |
| tree | 0068c4246786602409c08642c489e67baa2cc1c2 | |
| parent | d9a6e9f0535a9cc3a019ab287b4496d814966019 (diff) | |
| download | ATCD-0f3105ad3cc4a8ecdafc9ccd93d554662d68a7e8.tar.gz | |
ChangeLogTag: Mon Jun 2 02:00:04 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
35 files changed, 739 insertions, 1007 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index b58d10dad31..0c18f23bc8a 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,43 @@ +Mon Jun 2 02:00:04 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * examples/OEP/BasicSP/BasicSP.dsw: + * examples/OEP/BasicSP/BasicSP_stub.dsp: + * examples/OEP/BasicSP/BasicSP_svnt.dsp: + * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.dsp: + * examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp: + * examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp: + * examples/OEP/BasicSP/BMDevice/BMDevice_exec.dsp: + * examples/OEP/BasicSP/BMDevice/BMDevice_stub.dsp: + * examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp: + * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.dsp: + * examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp: + * examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp: + * examples/OEP/BasicSP/EC/EC_client.dsp: + * examples/OEP/BasicSP/EC/EC_exec.dsp: + * examples/OEP/BasicSP/EC/EC_stub.dsp: + * examples/OEP/BasicSP/EC/EC_svnt.dsp: + * examples/OEP/BasicSP/EC/controller.dsp: + * examples/OEP/Display/Display.dsw: + * examples/OEP/Display/HUDisplay_stub.dsp: + * examples/OEP/Display/HUDisplay_svnt.dsp: + * examples/OEP/Display/GPS/GPS_exec.dsp: + * examples/OEP/Display/GPS/GPS_stub.dsp: + * examples/OEP/Display/GPS/GPS_svnt.dsp: + * examples/OEP/Display/GPS/GPS_tracing_exec.dsp: + * examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp: + * examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp: + * examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp: + * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp: + * examples/OEP/Display/NavDisplayGUI_exec/README + * examples/OEP/Display/RateGen/RateGen_client.dsp: + * examples/OEP/Display/RateGen/RateGen_exec.dsp: + * examples/OEP/Display/RateGen/RateGen_stub.dsp: + * examples/OEP/Display/RateGen/RateGen_svnt.dsp: + * examples/OEP/Display/RateGen/controller.dsp: + + Fixed project and workspace settings for the generated + version of the HUDisplay and BasicSP examples. + Sun Jun 1 23:00:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * Makefile: Added the path to the RELEASE_FILES diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.dsp index 36b7c262a0f..e29b8f3dd6e 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.dsp @@ -6,27 +6,27 @@ CFG=BMClosedED_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "BMClosedED_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "BMClosedED_exec.mak" CFG="BMClosedED_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "BMClosedED_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "BMClosedED_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "BMClosedED_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\BMClosedED_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMCLOSEDED_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMCLOSEDED_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\BMClosedED_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO BMClosedED_stub.lib BMClosedED_svnt.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\BMClosedED_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 BMClosedED_stub.lib BMClosedED_svnt.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMClosedED_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMClosedED_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\BMClosedED_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMCLOSEDED_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMCLOSEDED_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\BMClosedED_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO BMClosedED_stubd.lib BMClosedED_svntd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\BMClosedED_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 BMClosedED_stubd.lib BMClosedED_svntd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMClosedED_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -109,66 +115,30 @@ SOURCE=.\BMClosedEDEI.idl !IF "$(CFG)" == "BMClosedED_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMCLO="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMClosedEDEI.idl
InputName=BMClosedEDEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMCLOSEDED_EXEC_Export -Wb,export_include=BMClosedED_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
!ELSEIF "$(CFG)" == "BMClosedED_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMCLO="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMClosedEDEI.idl
InputName=BMClosedEDEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMCLOSEDED_EXEC_Export -Wb,export_include=BMClosedED_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp index 90dd1043cef..9f77f30b585 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\BMClosedED_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMCLOSEDED_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMCLOSEDED_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMClosedED_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_stub.dll" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMClosedED_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_stub.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMClosedED_stub DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMClosedED_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_stubd.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMClosedED_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_stubd.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -107,59 +107,27 @@ SOURCE=.\BMClosedED.idl !IF "$(CFG)" == "BMClosedED_stub DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMCLO="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAOI IDL Compiler on $(InputPath)
InputPath=.\BMClosedED.idl
InputName=BMClosedED
-BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
# End Custom Build
!ELSEIF "$(CFG)" == "BMClosedED_stub DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMCLO="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAOI IDL Compiler on $(InputPath)
InputPath=.\BMClosedED.idl
InputName=BMClosedED
-BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-".\$(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)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
# End Custom Build
!ENDIF
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp index 79e6c675da1..998657fa307 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BMClosedED_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMClosedED_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BMClosedED_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMClosedED_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMClosedED_svnt DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BMClosedED_stubd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMClosedED_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BMClosedED_stubd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMClosedED_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMClosedED_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -126,6 +126,24 @@ SOURCE=.\BMClosedED.cidl !IF "$(CFG)" == "BMClosedED_svnt DLL - Win32 Release"
+USERDEP__BMCLO="..\..\..\..\..\..\bin\cidlc.exe"
+# Begin Custom Build - Invoking CIAO CIDL Compiler on $(InputPath)
+InputPath=.\BMClosedED.cidl
+InputName=BMClosedED
+
+BuildCmds= \
+ ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" -- $(InputName).cidl
+
+"$(InputName)E.idl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "BMClosedED_svnt DLL - Win32 Debug"
USERDEP__BMCLO="..\..\..\..\..\..\bin\cidlc.exe"
@@ -156,59 +174,27 @@ SOURCE=.\BMClosedEDE.idl !IF "$(CFG)" == "BMClosedED_svnt DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMCLOS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMClosedEDE.idl
InputName=BMClosedEDE
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
# End Custom Build
!ELSEIF "$(CFG)" == "BMClosedED_svnt DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMCLOS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMClosedEDE.idl
InputName=BMClosedEDE
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
# End Custom Build
!ENDIF
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.dsp index f93ba5c398f..6035bdab37f 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.dsp @@ -6,27 +6,27 @@ CFG=BMDevice_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "BMDevice_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "BMDevice_exec.mak" CFG="BMDevice_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "BMDevice_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "BMDevice_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "BMDevice_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\BMDevice_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDEVICE_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDEVICE_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\BMDevice_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO BMDevice_stub.lib BMDevice_svnt.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\BMDevice_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib BMDevice_stub.lib BMDevice_svnt.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDevice_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMDevice_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\BMDevice_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDEVICE_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDEVICE_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\BMDevice_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO BMDevice_stubd.lib BMDevice_svntd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\BMDevice_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib BMDevice_stubd.lib BMDevice_svntd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMDevice_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -80,10 +86,6 @@ SOURCE=.\BMDeviceEIC.cpp # End Source File
# Begin Source File
-SOURCE=.\BMDeviceEIS.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\BMDeviceES.cpp
# End Source File
# End Group
@@ -100,10 +102,6 @@ SOURCE=.\BMDeviceEIC.h # End Source File
# Begin Source File
-SOURCE=.\BMDeviceEIS.h
-# End Source File
-# Begin Source File
-
SOURCE=.\BMDeviceES.h
# End Source File
# End Group
@@ -116,11 +114,7 @@ SOURCE=.\BMDeviceEIC.i # End Source File
# Begin Source File
-SOURCE=.\BMDeviceEIS.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\BMDeviceES.i
+SOURCE=.\BMDeviceS.i
# End Source File
# End Group
# Begin Group "IDL Files"
@@ -133,66 +127,30 @@ SOURCE=.\BMDeviceEI.idl !IF "$(CFG)" == "BMDevice_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMDEV="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMDeviceEI.idl
InputName=BMDeviceEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDevice_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
!ELSEIF "$(CFG)" == "BMDevice_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMDEV="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMDeviceEI.idl
InputName=BMDeviceEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDevice_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_stub.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_stub.dsp index 132fedf2e16..bb99d3f33e5 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_stub.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\BMDevice_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDEVICE_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDEVICE_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BasicSP_stub.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDevice_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_stub.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BasicSP_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDevice_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_stub.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMDevice_stub DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BasicSP_stubd.lib TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMDevice_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_stubd.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BasicSP_stubd.lib TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMDevice_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_stubd.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -112,7 +112,7 @@ InputPath=.\BMDevice.idl InputName=BMDevice
BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp index a3d6a515ade..4a8e73cbc0e 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BMDevice_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDevice_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BMDevice_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDevice_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDevice_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMDevice_svnt DLL - Win32 Debug"
@@ -126,8 +126,28 @@ SOURCE=.\BMDevice.cidl !IF "$(CFG)" == "BMDevice_svnt DLL - Win32 Release"
+# PROP Ignore_Default_Tool 1
+USERDEP__BMDEV="..\..\..\..\..\..\bin\cidlc.exe"
+# Begin Custom Build - Invoking CIAO CIDL Compiler on $(InputPath)
+InputPath=.\BMDevice.cidl
+InputName=BMDevice
+
+BuildCmds= \
+ ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" -- $(InputName).cidl
+
+"$(InputName)E.idl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "BMDevice_svnt DLL - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__BMDEV="..\..\..\..\..\..\bin\cidlc.exe"
# Begin Custom Build - Invoking CIAO CIDL Compiler on $(InputPath)
InputPath=.\BMDevice.cidl
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.dsp index d17bedf58e2..67023308608 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.dsp @@ -6,27 +6,27 @@ CFG=BMDisplay_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "BMDisplay_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "BMDisplay_exec.mak" CFG="BMDisplay_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "BMDisplay_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "BMDisplay_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "BMDisplay_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\BMDisplay_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDISPLAY_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDISPLAY_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\BMDisplay_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO BMDisplay_stub.lib BMDisplay_svnt.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\BMDisplay_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib BMDisplay_stub.lib BMDisplay_svnt.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDisplay_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMDisplay_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\BMDisplay_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDISPLAY_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDISPLAY_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\BMDisplay_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO BMDisplay_stubd.lib BMDisplay_svntd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\BMDisplay_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib BMDisplay_stubd.lib BMDisplay_svntd.lib BasicSP_stubd.lib BasicSP_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\BMDisplay_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -109,66 +115,30 @@ SOURCE=.\BMDisplayEI.idl !IF "$(CFG)" == "BMDisplay_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMDIS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMDisplayEI.idl
InputName=BMDisplayEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMDISPLAY_EXEC_Export -Wb,export_include=BMDisplay_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
!ELSEIF "$(CFG)" == "BMDisplay_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMDIS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMDisplayEI.idl
InputName=BMDisplayEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=BMDISPLAY_EXEC_Export -Wb,export_include=BMDisplay_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp index 3bc3b02e056..8c1056cbdc8 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\BMDisplay_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDISPLAY_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BMDISPLAY_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDisplay_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_stub.dll" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDisplay_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_stub.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMDisplay_stub DLL - Win32 Debug"
@@ -107,59 +107,27 @@ SOURCE=.\BMDisplay.idl !IF "$(CFG)" == "BMDisplay_stub DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMDIS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMDisplay.idl
InputName=BMDisplay
-BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
# End Custom Build
!ELSEIF "$(CFG)" == "BMDisplay_stub DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BMDIS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BMDisplay.idl
InputName=BMDisplay
-BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-".\$(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)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
# End Custom Build
!ENDIF
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp index c7e0de7c978..ab57da10d31 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BMDisplay_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDisplay_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BMDisplay_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\BMDisplay_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\BMDisplay_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BMDisplay_svnt DLL - Win32 Debug"
@@ -126,6 +126,24 @@ SOURCE=.\BMDisplay.cidl !IF "$(CFG)" == "BMDisplay_svnt DLL - Win32 Release"
+USERDEP__BMDIS="..\..\..\..\..\..\bin\cidlc.exe"
+# Begin Custom Build - Invoking CIAO CIDL Compiler on $(InputPath)
+InputPath=.\BMDisplay.cidl
+InputName=BMDisplay
+
+BuildCmds= \
+ ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" -- $(InputName).cidl
+
+"$(InputName)E.idl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "BMDisplay_svnt DLL - Win32 Debug"
USERDEP__BMDIS="..\..\..\..\..\..\bin\cidlc.exe"
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BasicSP.dsw b/TAO/CIAO/examples/OEP/BasicSP/BasicSP.dsw index c88df11e7d6..4825dde3e3e 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BasicSP.dsw +++ b/TAO/CIAO/examples/OEP/BasicSP/BasicSP.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "EC_stub DLL"=EC\EC_stub.dsp - Package Owner=<4>
+Project: "BMClosedED_exec DLL"=.\BMClosedED\BMClosedED_exec.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -12,13 +12,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_stub DLL
+ Project_Dep_Name BMClosedED_svnt DLL
End Project Dependency
}}}
###############################################################################
-Project: "EC_svnt DLL"=EC\EC_svnt.dsp - Package Owner=<4>
+Project: "BMClosedED_stub DLL"=.\BMClosedED\BMClosedED_stub.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -27,16 +27,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_svnt DLL
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name EC_stub DLL
+ Project_Dep_Name BasicSP_stub DLL
End Project Dependency
}}}
###############################################################################
-Project: "EC_exec DLL"=EC\EC_exec.dsp - Package Owner=<4>
+Project: "BMClosedED_svnt DLL"=.\BMClosedED\BMClosedED_svnt.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -45,13 +42,16 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name EC_svnt DLL
+ Project_Dep_Name BMClosedED_stub DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name BasicSP_svnt DLL
End Project Dependency
}}}
###############################################################################
-Project: "EC_client EXE"=EC\EC_client.dsp - Package Owner=<4>
+Project: "BMDevice_exec DLL"=.\BMDevice\BMDevice_exec.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -60,13 +60,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name EC_stub DLL
+ Project_Dep_Name BMDevice_svnt DLL
End Project Dependency
}}}
###############################################################################
-Project: "controller EXE"=EC\controller.dsp - Package Owner=<4>
+Project: "BMDevice_stub DLL"=.\BMDevice\BMDevice_stub.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -75,13 +75,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name EC_stub DLL
+ Project_Dep_Name BasicSP_stub DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMDisplay_stub DLL"=BMDisplay\BMDisplay_stub.dsp - Package Owner=<4>
+Project: "BMDevice_svnt DLL"=.\BMDevice\BMDevice_svnt.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -90,13 +90,16 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_stub DLL
+ Project_Dep_Name BMDevice_stub DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name BasicSP_svnt DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMDisplay_svnt DLL"=BMDisplay\BMDisplay_svnt.dsp - Package Owner=<4>
+Project: "BMDisplay_exec DLL"=.\BMDisplay\BMDisplay_exec.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -105,16 +108,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_svnt DLL
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name BMDisplay_stub DLL
+ Project_Dep_Name BMDisplay_svnt DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMDisplay_exec DLL"=BMDisplay\BMDisplay_exec.dsp - Package Owner=<4>
+Project: "BMDisplay_stub DLL"=.\BMDisplay\BMDisplay_stub.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -123,13 +123,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BMDisplay_svnt DLL
+ Project_Dep_Name BasicSP_stub DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMDevice_stub DLL"=BMDevice\BMDevice_stub.dsp - Package Owner=<4>
+Project: "BMDisplay_svnt DLL"=.\BMDisplay\BMDisplay_svnt.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -138,13 +138,16 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_stub DLL
+ Project_Dep_Name BMDisplay_stub DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name BasicSP_svnt DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMDevice_svnt DLL"=BMDevice\BMDevice_svnt.dsp - Package Owner=<4>
+Project: "BasicSP_stub DLL"=.\BasicSP_stub.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -152,17 +155,11 @@ Package=<5> Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name BMDevice_stub DLL
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name BasicSP_stub DLL
- End Project Dependency
}}}
###############################################################################
-Project: "BMDevice_exec DLL"=BMDevice\BMDevice_exec.dsp - Package Owner=<4>
+Project: "BasicSP_svnt DLL"=.\BasicSP_svnt.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -171,13 +168,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BMDevice_svnt DLL
+ Project_Dep_Name BasicSP_stub DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMClosedED_stub DLL"=BMClosedED\BMClosedED_stub.dsp - Package Owner=<4>
+Project: "EC_client EXE"=.\EC\EC_client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -186,13 +183,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_stub DLL
+ Project_Dep_Name EC_exec DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMClosedED_svnt DLL"=BMClosedED\BMClosedED_svnt.dsp - Package Owner=<4>
+Project: "EC_exec DLL"=.\EC\EC_exec.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -201,16 +198,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_svnt DLL
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name BMClosedED_stub DLL
+ Project_Dep_Name EC_svnt DLL
End Project Dependency
}}}
###############################################################################
-Project: "BMClosedED_exec DLL"=BMClosedED\BMClosedED_exec.dsp - Package Owner=<4>
+Project: "EC_stub DLL"=.\EC\EC_stub.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -219,13 +213,13 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BMClosedED_svnt DLL
+ Project_Dep_Name BasicSP_stub DLL
End Project Dependency
}}}
###############################################################################
-Project: "BasicSP_stub DLL"=BasicSP_stub.dsp - Package Owner=<4>
+Project: "EC_svnt DLL"=.\EC\EC_svnt.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -233,11 +227,17 @@ Package=<5> Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name EC_stub DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name BasicSP_svnt DLL
+ End Project Dependency
}}}
###############################################################################
-Project: "BasicSP_svnt DLL"=BasicSP_svnt.dsp - Package Owner=<4>
+Project: "controller EXE"=.\EC\controller.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -246,7 +246,7 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name BasicSP_stub DLL
+ Project_Dep_Name EC_exec DLL
End Project Dependency
}}}
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BasicSP_stub.dsp b/TAO/CIAO/examples/OEP/BasicSP/BasicSP_stub.dsp index c24fe7a0531..b54f2c8c5c4 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BasicSP_stub.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BasicSP_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\BasicSP_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BASICSP_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BASICSP_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\BasicSP_stub.pdb" /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_stub.dll" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\BasicSP_stub.pdb" /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_stub.dll" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BasicSP_stub DLL - Win32 Debug"
@@ -56,7 +56,7 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\BasicSP_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BASICSP_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D BASICSP_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\bin\BasicSP_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_stubd.dll" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\bin\BasicSP_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_stubd.dll" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -102,6 +102,10 @@ SOURCE=.\BasicSPC.i # PROP Default_Filter ""
# Begin Source File
+SOURCE=.\NOTE.txt
+# End Source File
+# Begin Source File
+
SOURCE=.\README
# End Source File
# End Group
@@ -115,59 +119,27 @@ SOURCE=.\BasicSP.idl !IF "$(CFG)" == "BasicSP_stub DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BASIC="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BasicSP.idl
InputName=BasicSP
-BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-".\$(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)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\ciao -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "BasicSP_stub DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__BASIC="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\BasicSP.idl
InputName=BasicSP
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\ciao -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
# End Custom Build
!ENDIF
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BasicSP_svnt.dsp b/TAO/CIAO/examples/OEP/BasicSP/BasicSP_svnt.dsp index 8817dad59c0..20bd41f5d5a 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BasicSP_svnt.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/BasicSP_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BasicSP_stub.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\BasicSP_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_svnt.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BasicSP_stub.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\BasicSP_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_svnt.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "BasicSP_svnt DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib BasicSP_stubd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\bin\BasicSP_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_svntd.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 BasicSP_stubd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\bin\BasicSP_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\bin\BasicSP_svntd.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -102,8 +102,49 @@ SOURCE=.\BasicSPS.i # PROP Default_Filter ""
# Begin Source File
+SOURCE=.\NOTE.txt
+# End Source File
+# Begin Source File
+
SOURCE=.\README
# End Source File
# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\BasicSP.idl
+
+!IF "$(CFG)" == "BasicSP_svnt DLL - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__BASIC="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
+InputPath=.\BasicSP.idl
+InputName=BasicSP
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\ciao -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "BasicSP_svnt DLL - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__BASIC="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
+InputPath=.\BasicSP.idl
+InputName=BasicSP
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\ciao -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
# End Target
# End Project
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_client.dsp b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_client.dsp index 80a9e1aac0b..a4769a94dd7 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_client.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_client.dsp @@ -35,7 +35,7 @@ RSC=rc.exe # PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release\EC_client"
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -43,7 +43,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib EC_stub.lib BasicSP_stub.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\client.exe" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 EC_stub.lib BasicSP_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\client.exe" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "EC_client EXE - Win32 Debug"
@@ -61,7 +61,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib EC_stubd.lib BasicSP_stubd.lib TAO_Securityd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\client.exe" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 EC_stubd.lib BasicSP_stubd.lib TAO_Securityd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\client.exe" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.dsp b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.dsp index ca5df7a1135..f9379903393 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.dsp @@ -6,27 +6,27 @@ CFG=EC_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "EC_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "EC_exec.mak" CFG="EC_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "EC_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "EC_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "EC_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\EC_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D EC_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D EC_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\EC_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO EC_stub.lib BasicSP_stub.lib EC_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\EC_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\EC_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib EC_stub.lib BasicSP_stub.lib EC_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\EC_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\EC_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "EC_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\EC_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D EC_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D EC_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\EC_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO EC_stubd.lib BasicSP_stubd.lib EC_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\EC_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\EC_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib EC_stubd.lib BasicSP_stubd.lib EC_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\EC_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\EC_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -120,7 +126,6 @@ SOURCE=.\ECEI.idl # Begin Custom Build - Invoking IDL Compiler on $(InputPath)
InputPath=.\ECEI.idl
InputName=ECEI
-InputDir=.
BuildCmds= \
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
@@ -142,7 +147,6 @@ BuildCmds= \ ".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-
# End Custom Build
!ELSEIF "$(CFG)" == "EC_exec DLL - Win32 Debug"
@@ -151,7 +155,6 @@ BuildCmds= \ # Begin Custom Build - Invoking IDL Compiler on $(InputPath)
InputPath=.\ECEI.idl
InputName=ECEI
-InputDir=.
BuildCmds= \
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
@@ -173,10 +176,9 @@ BuildCmds= \ ".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_stub.dsp b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_stub.dsp index e40a8c0a169..ac72e2944fd 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_stub.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\EC_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D EC_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D EC_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\EC_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\EC_stub.dll" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\EC_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\EC_stub.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "EC_stub DLL - Win32 Debug"
@@ -120,7 +120,7 @@ InputPath=.\EC.idl InputName=EC
BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_svnt.dsp b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_svnt.dsp index 0d5fefdd4a8..88ec6b0e8ee 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_svnt.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib EC_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\EC_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\EC_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 EC_stub.lib BasicSP_stub.lib BasicSP_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\EC_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\EC_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "EC_svnt DLL - Win32 Debug"
@@ -89,22 +89,6 @@ SOURCE=.\ECEC.cpp SOURCE=.\ECS.cpp
# End Source File
# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hh"
-# Begin Source File
-
-SOURCE=.\EC_svnt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ECEC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ECS.h
-# End Source File
-# End Group
# Begin Group "Inline Files"
# PROP Default_Filter "i;inl"
@@ -134,6 +118,24 @@ SOURCE=.\EC.cidl !IF "$(CFG)" == "EC_svnt DLL - Win32 Release"
+USERDEP__EC_CI="..\..\..\..\..\..\bin\cidlc.exe"
+# Begin Custom Build - Invoking CIAO CIDL Compiler on $(InputPath)
+InputPath=.\EC.cidl
+InputName=EC
+
+BuildCmds= \
+ ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" -- $(InputName).cidl
+
+"$(InputName)E.idl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "EC_svnt DLL - Win32 Debug"
USERDEP__EC_CI="..\..\..\..\..\..\bin\cidlc.exe"
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.dsp b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.dsp index 57404f8991c..eafa52fdfa4 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.dsp +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.dsp @@ -35,7 +35,7 @@ RSC=rc.exe # PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release\controller"
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -43,7 +43,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib EC_stub.lib BasicSP_stub.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 EC_stub.lib BasicSP_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "controller EXE - Win32 Debug"
@@ -61,7 +61,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib EC_stubd.lib BasicSP_stubd.lib TAO_Securityd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 EC_stubd.lib BasicSP_stubd.lib TAO_Securityd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/CIAO/examples/OEP/Display/Display.dsw b/TAO/CIAO/examples/OEP/Display/Display.dsw index dc520cf2f34..f2e236f181a 100644 --- a/TAO/CIAO/examples/OEP/Display/Display.dsw +++ b/TAO/CIAO/examples/OEP/Display/Display.dsw @@ -42,10 +42,10 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name HUDisplay_svnt DLL
+ Project_Dep_Name GPS_stub DLL
End Project Dependency
Begin Project Dependency
- Project_Dep_Name GPS_stub DLL
+ Project_Dep_Name HUDisplay_svnt DLL
End Project Dependency
}}}
@@ -101,6 +101,9 @@ Package=<5> Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name NavDisplay_svnt DLL
+ End Project Dependency
}}}
###############################################################################
@@ -162,7 +165,7 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name RateGen_stub DLL
+ Project_Dep_Name RateGen_exec DLL
End Project Dependency
}}}
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.dsp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.dsp index 7e965287148..9db2c42fbbf 100644 --- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.dsp +++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.dsp @@ -6,27 +6,27 @@ CFG=GPS_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "GPS_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "GPS_exec.mak" CFG="GPS_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "GPS_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "GPS_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "GPS_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\GPS_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\GPS_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO GPS_stub.lib GPS_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\GPS_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 GPS_stub.lib GPS_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\GPS_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "GPS_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\GPS_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\GPS_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO GPS_stubd.lib GPS_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\GPS_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 GPS_stubd.lib GPS_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\GPS_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -109,66 +115,30 @@ SOURCE=.\GPSEI.idl !IF "$(CFG)" == "GPS_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPSEI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPSEI.idl
InputName=GPSEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
!ELSEIF "$(CFG)" == "GPS_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPSEI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPSEI.idl
InputName=GPSEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_stub.dsp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_stub.dsp index a4d4b2e7686..c7746ae7595 100644 --- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_stub.dsp +++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\GPS_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\GPS_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_stub.dll" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\GPS_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_stub.dll" /libpath:".." /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "GPS_stub DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\GPS_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_stubd.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stubd.lib TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\GPS_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_stubd.dll" /libpath:".." /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -107,14 +107,15 @@ SOURCE=.\GPS.idl !IF "$(CFG)" == "GPS_stub DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPS_I="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPS.idl
InputName=GPS
BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -136,7 +137,8 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "GPS_stub DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPS_I="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPS.idl
InputName=GPS
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_svnt.dsp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_svnt.dsp index 9cf9e8fa0ed..8b8dd175716 100644 --- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_svnt.dsp +++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib GPS_stub.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\GPS_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 GPS_stub.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\GPS_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "GPS_svnt DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib GPS_stubd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\GPS_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 GPS_stubd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\GPS_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -126,6 +126,24 @@ SOURCE=.\GPS.cidl !IF "$(CFG)" == "GPS_svnt DLL - Win32 Release"
+USERDEP__GPS_C="..\..\..\..\..\..\bin\cidlc.exe"
+# Begin Custom Build - Invoking CIAO CIDL Compiler on $(InputPath)
+InputPath=.\GPS.cidl
+InputName=GPS
+
+BuildCmds= \
+ ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" -- $(InputName).cidl
+
+"$(InputName)E.idl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "GPS_svnt DLL - Win32 Debug"
USERDEP__GPS_C="..\..\..\..\..\..\bin\cidlc.exe"
@@ -156,7 +174,8 @@ SOURCE=.\GPSE.idl !IF "$(CFG)" == "GPS_svnt DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPSE_="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPSE.idl
InputName=GPSE
@@ -185,7 +204,8 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "GPS_svnt DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPSE_="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPSE.idl
InputName=GPSE
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.dsp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.dsp index 142b035faca..b59fbfb7431 100644 --- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.dsp +++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.dsp @@ -6,27 +6,27 @@ CFG=GPS_tracing_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "GPS_tracing_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "GPS_tracing_exec.mak" CFG="GPS_tracing_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "GPS_tracing_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "GPS_tracing_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "GPS_tracing_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\GPS_tracing_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\GPS_tracing_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO GPS_stub.lib GPS_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\GPS_tracing_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_tracing_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 GPS_stub.lib GPS_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\GPS_tracing_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_tracing_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "GPS_tracing_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\GPS_tracing_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D GPS_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\GPS_tracing_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO GPS_stubd.lib GPS_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\GPS_tracing_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_tracing_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 GPS_stubd.lib GPS_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\GPS_tracing_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\GPS_tracing_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -109,66 +115,30 @@ SOURCE=.\GPSEI.idl !IF "$(CFG)" == "GPS_tracing_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPSEI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPSEI.idl
InputName=GPSEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
!ELSEIF "$(CFG)" == "GPS_tracing_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__GPSEI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\GPSEI.idl
InputName=GPSEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/Display/HUDisplay_stub.dsp b/TAO/CIAO/examples/OEP/Display/HUDisplay_stub.dsp index 640c8d1032c..3a35126125e 100644 --- a/TAO/CIAO/examples/OEP/Display/HUDisplay_stub.dsp +++ b/TAO/CIAO/examples/OEP/Display/HUDisplay_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\HUDisplay_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D HUDISPLAY_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D "HUDISPLAY_STUB_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\HUDisplay_stub.pdb" /machine:I386 /out:"..\..\..\..\..\bin\HUDisplay_stub.dll" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\HUDisplay_stub.pdb" /machine:I386 /out:"..\..\..\..\..\bin\HUDisplay_stub.dll" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "HUDisplay_stub DLL - Win32 Debug"
@@ -56,7 +56,7 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\HUDisplay_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D HUDISPLAY_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D "HUDISPLAY_STUB_BUILD_DLL" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1
@@ -86,6 +86,10 @@ SOURCE=.\HUDisplayC.cpp # PROP Default_Filter "h;hpp;hxx;hh"
# Begin Source File
+SOURCE=.\HUDisplay_stub_export.h
+# End Source File
+# Begin Source File
+
SOURCE=.\HUDisplayC.h
# End Source File
# End Group
@@ -115,59 +119,27 @@ SOURCE=.\HUDisplay.idl !IF "$(CFG)" == "HUDisplay_stub DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__HUDIS="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\HUDisplay.idl
InputName=HUDisplay
-BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-".\$(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)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I..\..\..\ciao -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "HUDisplay_stub DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__HUDIS="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\HUDisplay.idl
InputName=HUDisplay
-BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\ciao -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-".\$(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)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I..\..\..\ciao -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
# End Custom Build
!ENDIF
diff --git a/TAO/CIAO/examples/OEP/Display/HUDisplay_svnt.dsp b/TAO/CIAO/examples/OEP/Display/HUDisplay_svnt.dsp index ddf2c50d681..d18edc68f9d 100644 --- a/TAO/CIAO/examples/OEP/Display/HUDisplay_svnt.dsp +++ b/TAO/CIAO/examples/OEP/Display/HUDisplay_svnt.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\HUDisplay_svnt"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D HUDISPLAY_SVNT_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D "HUDISPLAY_SVNT_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib HUDisplay_stub.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\HUDisplay_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\bin\HUDisplay_svnt.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stub.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\bin\HUDisplay_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\bin\HUDisplay_svnt.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "HUDisplay_svnt DLL - Win32 Debug"
@@ -56,7 +56,7 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\HUDisplay_svnt"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D HUDISPLAY_SVNT_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\.." /I "..\..\..\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D "HUDISPLAY_SVNT_BUILD_DLL" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\.." /i "..\..\..\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 HUDisplay_stubd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\bin\HUDisplay_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\bin\HUDisplay_svntd.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stubd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\bin\HUDisplay_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\bin\HUDisplay_svntd.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -86,6 +86,10 @@ SOURCE=.\HUDisplayS.cpp # PROP Default_Filter "h;hpp;hxx;hh"
# Begin Source File
+SOURCE=.\HUDisplay_svnt_export.h
+# End Source File
+# Begin Source File
+
SOURCE=.\HUDisplayS.h
# End Source File
# End Group
@@ -105,5 +109,75 @@ SOURCE=.\HUDisplayS.i SOURCE=.\README
# End Source File
# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\HUDisplay.idl
+
+!IF "$(CFG)" == "HUDisplay_svnt DLL - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+InputPath=.\HUDisplay.idl
+InputName=HUDisplay
+
+BuildCmds= \
+ ..\..\..\..\..\bin\tao_idl -o . -I..\..\..\.. -I..\..\..\..\CIAO\ciao -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include="HUDisplay_svnt_export.h" -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+
+".\$(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)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "HUDisplay_svnt DLL - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__HUDIS="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
+InputPath=.\HUDisplay.idl
+InputName=HUDisplay
+
+BuildCmds= \
+ ..\..\..\..\..\bin\tao_idl -o . -I..\..\..\.. -I..\..\..\..\CIAO\ciao -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include="HUDisplay_svnt_export.h" -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\.. -I ..\..\..\.. -I ..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+
+".\$(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)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
# End Target
# End Project
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp index edea207e79c..24d1d9178ae 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp +++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp @@ -6,27 +6,27 @@ CFG=NavDisplay_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "NavDisplay_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "NavDisplay_exec.mak" CFG="NavDisplay_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "NavDisplay_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "NavDisplay_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "NavDisplay_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\NavDisplay_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\NavDisplay_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO NavDisplay_stub.lib NavDisplay_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\NavDisplay_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 NavDisplay_stub.lib NavDisplay_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\NavDisplay_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "NavDisplay_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\NavDisplay_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\NavDisplay_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO NavDisplay_stubd.lib NavDisplay_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\NavDisplay_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 NavDisplay_stubd.lib NavDisplay_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\NavDisplay_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -109,66 +115,30 @@ SOURCE=.\NavDisplayEI.idl !IF "$(CFG)" == "NavDisplay_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__NAVDI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\NavDisplayEI.idl
InputName=NavDisplayEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
!ELSEIF "$(CFG)" == "NavDisplay_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__NAVDI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\NavDisplayEI.idl
InputName=NavDisplayEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp index fc67a444bbb..5a19026dc98 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp +++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\NavDisplay_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\NavDisplay_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_stub.dll" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\NavDisplay_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_stub.dll" /libpath:".." /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "NavDisplay_stub DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\NavDisplay_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_stubd.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stubd.lib TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\NavDisplay_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_stubd.dll" /libpath:".." /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -107,14 +107,15 @@ SOURCE=.\NavDisplay.idl !IF "$(CFG)" == "NavDisplay_stub DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__NAVDI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\NavDisplay.idl
InputName=NavDisplay
BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -136,7 +137,8 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NavDisplay_stub DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__NAVDI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\NavDisplay.idl
InputName=NavDisplay
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp index 283452d4c3c..7059a902d2f 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp +++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib NavDisplay_stub.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\NavDisplay_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 NavDisplay_stub.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\NavDisplay_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "NavDisplay_svnt DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib NavDisplay_stubd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\NavDisplay_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 NavDisplay_stubd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\NavDisplay_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplay_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -126,6 +126,24 @@ SOURCE=.\NavDisplay.cidl !IF "$(CFG)" == "NavDisplay_svnt DLL - Win32 Release"
+USERDEP__NAVDI="..\..\..\..\..\..\bin\cidlc.exe"
+# Begin Custom Build - Invoking CIAO CIDL Compiler on $(InputPath)
+InputPath=.\NavDisplay.cidl
+InputName=NavDisplay
+
+BuildCmds= \
+ ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" -- $(InputName).cidl
+
+"$(InputName)E.idl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "NavDisplay_svnt DLL - Win32 Debug"
USERDEP__NAVDI="..\..\..\..\..\..\bin\cidlc.exe"
@@ -156,14 +174,15 @@ SOURCE=.\NavDisplayE.idl !IF "$(CFG)" == "NavDisplay_svnt DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__NAVDIS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\NavDisplayE.idl
InputName=NavDisplayE
BuildCmds= \
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -185,7 +204,8 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NavDisplay_svnt DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__NAVDIS="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\NavDisplayE.idl
InputName=NavDisplayE
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp index 134d9025ce8..41e1f27f3e2 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp +++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp @@ -6,27 +6,27 @@ CFG=NavDisplayGUI_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "NavDisplayGUI_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "NavDisplayGUI_exec.mak" CFG="NavDisplayGUI_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "NavDisplayGUI_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "NavDisplayGUI_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\NavDisplayGUI_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\NavDisplay" /I "$(QTDIR)\include" /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /D QT_DLL=1 /D QT_THREAD_SUPPORT=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\NavDisplay" /I "$(QTDIR)\include" /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /D QT_DLL=1 /D QT_THREAD_SUPPORT=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\NavDisplay" /i "$(QTDIR)\include" /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\NavDisplay" /i "$(QTDIR)\include" /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\NavDisplayGUI_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO qt-mt.lib NavDisplay_stub.lib NavDisplay_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\NavDisplay" /libpath:"$(QTDIR)\lib" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\NavDisplayGUI_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplayGUI_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 qt-mt.lib NavDisplay_stub.lib NavDisplay_svnt.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\NavDisplayGUI_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplayGUI_exec.dll" /libpath:".." /libpath:"..\NavDisplay" /libpath:"$(QTDIR)\lib" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\NavDisplayGUI_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\NavDisplay" /I "$(QTDIR)\include" /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /D QT_DLL=1 /D QT_THREAD_SUPPORT=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\NavDisplay" /I "$(QTDIR)\include" /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D NAVDISPLAY_EXEC_BUILD_DLL=1 /D QT_DLL=1 /D QT_THREAD_SUPPORT=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\NavDisplay" /i "$(QTDIR)\include" /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\NavDisplay" /i "$(QTDIR)\include" /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\NavDisplayGUI_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO qt-mt.lib NavDisplay_stubd.lib NavDisplay_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\NavDisplay" /libpath:"$(QTDIR)\lib" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\NavDisplayGUI_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplayGUI_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 qt-mt.lib NavDisplay_stubd.lib NavDisplay_svntd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\NavDisplayGUI_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\NavDisplayGUI_execd.dll" /libpath:".." /libpath:"..\NavDisplay" /libpath:"$(QTDIR)\lib" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -80,18 +86,10 @@ SOURCE=.\DetailView.cpp # End Source File
# Begin Source File
-SOURCE=.\DetailView_moc.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\MapView.cpp
# End Source File
# Begin Source File
-SOURCE=.\MapView_moc.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\NavDisplayEIC.cpp
# End Source File
# Begin Source File
@@ -108,10 +106,6 @@ SOURCE=.\NodeItem.cpp # End Source File
# Begin Source File
-SOURCE=.\NodeItem_moc.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\QuitCmd.cpp
# End Source File
# Begin Source File
@@ -120,10 +114,6 @@ SOURCE=.\RootPanel.cpp # End Source File
# Begin Source File
-SOURCE=.\RootPanel_moc.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\UpdatePositionCmd.cpp
# End Source File
# Begin Source File
@@ -140,6 +130,10 @@ SOURCE=.\AddNavUnitCmd.h # End Source File
# Begin Source File
+SOURCE=.\Command.h
+# End Source File
+# Begin Source File
+
SOURCE=.\DetailView.h
# End Source File
# Begin Source File
@@ -200,209 +194,41 @@ SOURCE=.\README # PROP Default_Filter "idl"
# Begin Source File
-SOURCE=.\..\NavDisplay\NavDisplayEI.idl
+SOURCE=..\NavDisplay\NavDisplayEI.idl
!IF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
-InputPath=.\..\NavDisplay\NavDisplayEI.idl
+USERDEP__NAVDI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
+InputPath=..\NavDisplay\NavDisplayEI.idl
InputName=NavDisplayEI
-InputDir=..\NavDisplay
-
-BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o .\ -I ..\NavDisplay -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-
-".\\$(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)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
-InputPath=.\..\NavDisplay\NavDisplayEI.idl
+USERDEP__NAVDI="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
+InputPath=..\NavDisplay\NavDisplayEI.idl
InputName=NavDisplayEI
-InputDir=..\NavDisplay
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o .\ -I ..\NavDisplay -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
# Begin Group "moc_files"
# PROP Default_Filter "h"
-# Begin Source File
-
-SOURCE=.\DetailView.h
-
-!IF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\DetailView.h
-InputName=DetailView
-InputDir=.
-
-".\DetailView_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o DetailView_moc.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\DetailView.h
-InputName=DetailView
-InputDir=.
-
-".\DetailView_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o DetailView_moc.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\MapView.h
-
-!IF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\MapView.h
-InputName=MapView
-InputDir=.
-
-".\MapView_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o MapView_moc.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\MapView.h
-InputName=MapView
-InputDir=.
-
-".\MapView_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o MapView_moc.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\NodeItem.h
-
-!IF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\NodeItem.h
-InputName=NodeItem
-InputDir=.
-
-".\NodeItem_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o NodeItem_moc.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\NodeItem.h
-InputName=NodeItem
-InputDir=.
-
-".\NodeItem_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o NodeItem_moc.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\RootPanel.h
-
-!IF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\RootPanel.h
-InputName=RootPanel
-InputDir=.
-
-".\RootPanel_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o RootPanel_moc.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "NavDisplayGUI_exec DLL - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking $(QTDIR)\bin\moc on $(InputPath)
-InputPath=.\RootPanel.h
-InputName=RootPanel
-InputDir=.
-
-".\RootPanel_moc.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(QTDIR)\bin\moc $(InputPath) -o RootPanel_moc.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
# End Group
# End Target
# End Project
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README index cb10cbe5cd2..b7b8aa96c59 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README +++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README @@ -4,4 +4,4 @@ It is NOT necessary to compile ACE/TAO/CIAO with Qt support, i.e. ACE_HAS_QT since this example does not relyes on Qt Reactor and communicates with GUI part using QApplication::postMessage() and simple Command Pattern based framework. But be sure that QTDIR -environment variable is pointed to your Qt instalation directory. +environment variable is pointed to your Qt installation directory. diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_client.dsp b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_client.dsp index 1fecf7e6e38..54f98aa0e8e 100644 --- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_client.dsp +++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_client.dsp @@ -35,7 +35,7 @@ RSC=rc.exe # PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release\RateGen_client"
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -43,7 +43,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib RateGen_stub.lib HUDisplay_stub.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\client.exe" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 RateGen_stub.lib HUDisplay_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\client.exe" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "RateGen_client EXE - Win32 Debug"
@@ -131,10 +131,6 @@ SOURCE=.\RateGenS.h # PROP Default_Filter "i;inl"
# Begin Source File
-SOURCE=.\RateGen_svnt.inl
-# End Source File
-# Begin Source File
-
SOURCE=.\RateGenC.i
# End Source File
# Begin Source File
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.dsp b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.dsp index 7f8cf328bb2..e617cd497c4 100644 --- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.dsp +++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.dsp @@ -6,27 +6,27 @@ CFG=RateGen_exec DLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "RateGen_exec.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "RateGen_exec.mak" CFG="RateGen_exec DLL - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "RateGen_exec DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "RateGen_exec DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "RateGen_exec DLL - Win32 Release"
@@ -37,13 +37,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\RateGen_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /GR /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D RATEGEN_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D RATEGEN_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\RateGen_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO RateGen_stub.lib HUDisplay_stub.lib RateGen_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\RateGen_exec.pdb" /dll /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_exec.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 RateGen_stub.lib HUDisplay_stub.lib RateGen_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\RateGen_exec.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_exec.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "RateGen_exec DLL - Win32 Debug"
@@ -53,15 +56,18 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug\RateGen_exec"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D RATEGEN_EXEC_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D RATEGEN_EXEC_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.."
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "..\..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d _DEBUG=1
BSC32=bscmake.exe
-# ADD BSC32 /nologo /o".\RateGen_exec.bsc"
+# ADD BSC32 /nologo
LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO RateGen_stubd.lib HUDisplay_stubd.lib RateGen_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:windows /pdb:"..\..\..\..\..\..\bin\RateGen_execd.pdb" /dll /debug /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_execd.dll"
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 RateGen_stubd.lib HUDisplay_stubd.lib RateGen_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\RateGen_execd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_execd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -109,66 +115,30 @@ SOURCE=.\RateGenEI.idl !IF "$(CFG)" == "RateGen_exec DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__RATEG="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\RateGenEI.idl
InputName=RateGenEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
!ELSEIF "$(CFG)" == "RateGen_exec DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__RATEG="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\RateGenEI.idl
InputName=RateGenEI
-InputDir=.
-BuildCmds= \
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
..\..\..\..\..\..\bin\tao_idl -o . -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h -I..\..\..\..\.. -I..\..\..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(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)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_stub.dsp b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_stub.dsp index 6fcbb4a362c..d672513918d 100644 --- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_stub.dsp +++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_stub.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release\RateGen_stub"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D RATEGEN_STUB_BUILD_DLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D RATEGEN_STUB_BUILD_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\RateGen_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_stub.dll" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\RateGen_stub.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_stub.dll" /libpath:".." /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "RateGen_stub DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\RateGen_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_stubd.dll" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 HUDisplay_stubd.lib TAOd.lib TAO_Securityd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\RateGen_stubd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_stubd.dll" /libpath:".." /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -107,14 +107,15 @@ SOURCE=.\RateGen.idl !IF "$(CFG)" == "RateGen_stub DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__RATEG="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\RateGen.idl
InputName=RateGen
BuildCmds= \
- ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
+ ..\..\..\..\..\..\bin\tao_idl -o . -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\..\..\.. -I ..\..\..\..\.. -I ..\..\..\..\ciao -I ..\..\..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)
-".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -136,7 +137,8 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "RateGen_stub DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__RATEG="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\RateGen.idl
InputName=RateGen
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_svnt.dsp b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_svnt.dsp index 8e0a5bef960..be584d72fd1 100644 --- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_svnt.dsp +++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_svnt.dsp @@ -45,7 +45,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib RateGen_stub.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\RateGen_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 RateGen_stub.lib HUDisplay_stub.lib HUDisplay_svnt.lib CIAO_Server.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_ObjRefTemplate.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:windows /dll /pdb:"..\..\..\..\..\..\bin\RateGen_svnt.pdb" /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_svnt.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "RateGen_svnt DLL - Win32 Debug"
@@ -64,7 +64,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib RateGen_stubd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\RateGen_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 RateGen_stubd.lib HUDisplay_stubd.lib HUDisplay_svntd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_ObjRefTemplated.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib TAO_Valuetyped.lib CIAO_Clientd.lib ACEd.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"..\..\..\..\..\..\bin\RateGen_svntd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\..\bin\RateGen_svntd.dll" /libpath:".." /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -126,6 +126,24 @@ SOURCE=.\RateGen.cidl !IF "$(CFG)" == "RateGen_svnt DLL - Win32 Release"
+USERDEP__RATEG="..\..\..\..\..\..\bin\cidlc.exe"
+# Begin Custom Build - nvoking CIAO CIDL Compiler on $(InputPath)
+InputPath=.\RateGen.cidl
+InputName=RateGen
+
+BuildCmds= \
+ ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" -- $(InputName).cidl
+
+"$(InputName)E.idl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)_svnt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "RateGen_svnt DLL - Win32 Debug"
USERDEP__RATEG="..\..\..\..\..\..\bin\cidlc.exe"
@@ -156,7 +174,8 @@ SOURCE=.\RateGenE.idl !IF "$(CFG)" == "RateGen_svnt DLL - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__RATEGE="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\RateGenE.idl
InputName=RateGenE
@@ -185,7 +204,8 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "RateGen_svnt DLL - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
+USERDEP__RATEGE="..\..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\RateGenE.idl
InputName=RateGenE
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/controller.dsp b/TAO/CIAO/examples/OEP/Display/RateGen/controller.dsp index a3207f8ffd8..4a5a50aef61 100644 --- a/TAO/CIAO/examples/OEP/Display/RateGen/controller.dsp +++ b/TAO/CIAO/examples/OEP/Display/RateGen/controller.dsp @@ -35,7 +35,7 @@ RSC=rc.exe # PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release\controller"
# PROP Target_Dir ""
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\ciao" /I "..\..\..\..\.." /I "..\..\..\..\..\tao" /I "..\..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /i "..\..\..\.." /i "..\..\..\..\ciao" /i "..\..\..\..\.." /i "..\..\..\..\..\tao" /i "..\..\..\..\..\.." /d NDEBUG=1
@@ -43,7 +43,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 advapi32.lib user32.lib RateGen_stub.lib HUDisplay_stub.lib TAO.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
+# ADD LINK32 RateGen_stub.lib HUDisplay_stub.lib TAO.lib TAO_Security.lib TAO_IFR_Client.lib TAO_Valuetype.lib CIAO_Client.lib ACE.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\orbsvcs\orbsvcs" /libpath:".." /libpath:"..\..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\ciao" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\..\ace" /version:1.3.1
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "controller EXE - Win32 Debug"
|