Fixing Windows build issues (TAO projects were particularily broken)

9 files changed, 305 insertions, 20 deletions

diff --git a/perf/src/CosEvent/Notifier.cpp b/perf/src/CosEvent/Notifier.cpp
index 9b0b4840edc..79355039bdb 100644
--- a/perf/src/CosEvent/Notifier.cpp
+++ b/perf/src/CosEvent/Notifier.cpp
@@ -53,9 +53,9 @@ public:
 		syncs.push_back(Perf::Sync::_duplicate(sync.in()));
 	    }
 
-	    for(vector<Perf::Sync_var>::const_iterator p = syncs.begin(); p != syncs.end(); ++p)
+	    for(vector<Perf::Sync_var>::const_iterator i = syncs.begin(); i != syncs.end(); ++i)
 	    {
-		(*p)->notify();
+		(*i)->notify();
 		ACE_TRY_CHECK;	
 	    }
 
diff --git a/perf/src/CosEvent/destroyer.dsp b/perf/src/CosEvent/destroyer.dsp
new file mode 100755
index 00000000000..b1f956ffb7e
--- /dev/null
+++ b/perf/src/CosEvent/destroyer.dsp
@@ -0,0 +1,87 @@
+# Microsoft Developer Studio Project File - Name="destroyer" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=destroyer - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "destroyer.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "destroyer.mak" CFG="destroyer - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "destroyer - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "destroyer - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "destroyer - Win32 Debug"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Debug\destroyer"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD MTL /D "_DEBUG" /nologo /mktyplib203 /win32

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Gy /I "$(TAO_ROOT)\.." /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\orbsvcs" /I "$(ICE_HOME)\include" /I "." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 TAO_CosEventd.lib TAOd.lib TAO_Messagingd.lib ACEd.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\client.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"

+# SUBTRACT LINK32 /pdb:none

+

+!ELSEIF  "$(CFG)" == "destroyer - Win32 Release"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD MTL /D "NDEBUG" /nologo /mktyplib203 /win32

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "$(TAO_ROOT)\orbsvcs" /I "$(TAO_ROOT)\.." /I "$(TAO_ROOT)" /I "$(ICE_HOME)\include" /I "." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 TAO_CosEvent.lib TAO_AnyTypeCode.lib TAO_Messaging.lib TAO.lib ACE.lib advapi32.lib user32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "destroyer - Win32 Debug"

+# Name "destroyer - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;cxx;c"

+# Begin Source File

+

+SOURCE=.\Destroyer.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/perf/src/CosEvent/notifier.dsp b/perf/src/CosEvent/notifier.dsp
new file mode 100755
index 00000000000..9df6e6422b8
--- /dev/null
+++ b/perf/src/CosEvent/notifier.dsp
@@ -0,0 +1,200 @@
+# Microsoft Developer Studio Project File - Name="notifier" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=notifier - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "notifier.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "notifier.mak" CFG="notifier - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "notifier - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "notifier - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "notifier - Win32 Debug"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Debug\notifier"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD MTL /D "_DEBUG" /nologo /mktyplib203 /win32

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Gy /I "$(TAO_ROOT)\.." /I "$(TAO_ROOT)" /I "$(ICE_HOME)\include" /I "." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 TAO_ValueTyped.lib TAO_AnyTypeCoded.lib TAOd.lib ACEd.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"notifier.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"

+# SUBTRACT LINK32 /pdb:none

+

+!ELSEIF  "$(CFG)" == "notifier - Win32 Release"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD MTL /D "NDEBUG" /nologo /mktyplib203 /win32

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "$(TAO_ROOT)\.." /I "$(TAO_ROOT)" /I "$(ICE_HOME)\include" /I "." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 TAO_AnyTypeCode.lib TAO_ValueType.lib TAO.lib ACE.lib advapi32.lib user32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"notifier.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "notifier - Win32 Debug"

+# Name "notifier - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;cxx;c"

+# Begin Source File

+

+SOURCE=.\Notifier.cpp

+# End Source File

+# Begin Source File

+

+SOURCE="SyncC.cpp"

+# End Source File

+# Begin Source File

+

+SOURCE=.\WorkerThread.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hh"

+# Begin Source File

+

+SOURCE="SyncC.h"

+# End Source File

+# Begin Source File

+

+SOURCE=.\WorkerThread.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i;inl"

+# Begin Source File

+

+SOURCE="SyncC.inl"

+# End Source File

+# End Group

+# Begin Group "Idl Files"

+

+# PROP Default_Filter "idl"

+# Begin Source File

+

+SOURCE="Sync.idl"

+

+!IF  "$(CFG)" == "notifier - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__SYNC_="$(ACE_ROOT)\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking $(TAO_ROOT)\..\bin\tao_idl on $(InputPath)

+InputPath="Sync.idl"

+

+BuildCmds= \

+	PATH=%PATH%;$(ACE_ROOT)\lib \

+	$(ACE_ROOT)\bin\tao_idl -Ge 1 -I$(TAO_ROOT) $(InputPath) \

+	

+

+"SyncC.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS_T.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "notifier - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__SYNC_="$(ACE_ROOT)\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking $(ACE_ROOT)\bin\tao_idl on $(InputPath)

+InputPath="Sync.idl"

+

+BuildCmds= \

+	PATH=%PATH%;$(ACE_ROOT)\lib \

+	$(ACE_ROOT)\bin\tao_idl -Ge 1 -I$(TAO_ROOT) $(InputPath) \

+	

+

+"SyncC.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS_T.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SyncS_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/perf/src/IceE/latency/latencyIceEC.dsp b/perf/src/IceE/latency/latencyIceEC.dsp
index b47c288663f..951713ed16f 100755
--- a/perf/src/IceE/latency/latencyIceEC.dsp
+++ b/perf/src/IceE/latency/latencyIceEC.dsp
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 icee.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"$(ICEE_HOME)/lib"

+# ADD LINK32 icee.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"$(ICEE_HOME)/lib"

 # SUBTRACT LINK32 /debug /nodefaultlib

 

 !ELSEIF  "$(CFG)" == "latencyIceEC - Win32 Debug"

diff --git a/perf/src/TAO/Roundtrip_Handler.cpp b/perf/src/TAO/Roundtrip_Handler.cpp
index 0d286b3f787..3444e7ebf88 100644
--- a/perf/src/TAO/Roundtrip_Handler.cpp
+++ b/perf/src/TAO/Roundtrip_Handler.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <Roundtrip_Handler.h>
-#include <ace/OS_NS_time.h>
 
 Roundtrip_Handler::Roundtrip_Handler() :
     _finished(false)
diff --git a/perf/src/TAO/Roundtrip_Handler.h b/perf/src/TAO/Roundtrip_Handler.h
index 4fdba01b7c0..7e20dbec3aa 100644
--- a/perf/src/TAO/Roundtrip_Handler.h
+++ b/perf/src/TAO/Roundtrip_Handler.h
@@ -9,10 +9,11 @@
 
 #ifndef ROUNDTRIP_HANDLER_H
 #define ROUNDTRIP_HANDLER_H
-#include <ace/pre.h>
+

+#include <IceUtil/Mutex.h>

+#include <IceUtil/Monitor.h>

 
 #include <TestS.h>
-#include <ace/Basic_Stats.h>
 
 #if defined (_MSC_VER)
 #   if (_MSC_VER >= 1200)
@@ -21,9 +22,6 @@
 #   pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-#include <IceUtil/Mutex.h>
-#include <IceUtil/Monitor.h>
-
 //
 // Implement the Test::Roundtrip interface
 //
diff --git a/perf/src/TAO/client.cpp b/perf/src/TAO/client.cpp
index 245f1b2a906..6775f1b26d8 100644
--- a/perf/src/TAO/client.cpp
+++ b/perf/src/TAO/client.cpp
@@ -7,18 +7,17 @@
 //
 // **********************************************************************
 
-#include <Roundtrip.h>
-#include <Roundtrip_Handler.h>
-#include <WorkerThread.h>
 #include <ace/Get_Opt.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Sched_Params.h>
 #include <ace/Stats.h>
 #include <ace/OS_NS_errno.h>
 
-#include <tao/Strategies/advanced_resource.h>
 #include <tao/Messaging/Messaging.h>
 #include <iostream>
+#include <Roundtrip.h>

+#include <Roundtrip_Handler.h>

+#include <WorkerThread.h>

 
 #ifdef _WIN32
 #   include <sys/timeb.h>
diff --git a/perf/src/TAO/taoC.dsp b/perf/src/TAO/taoC.dsp
index dd798618f96..0b18dca5956 100644
--- a/perf/src/TAO/taoC.dsp
+++ b/perf/src/TAO/taoC.dsp
@@ -34,6 +34,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir "Debug\taoC"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 MTL=midl.exe

 # ADD MTL /D "_DEBUG" /nologo /mktyplib203 /win32

@@ -45,7 +46,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib TAO_Strategiesd.lib TAO_PortableServerd.lib TAOd.lib TAO_ValueTyped.lib TAO_Messagingd.lib ACEd.lib IceUtild.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\client.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"

+# ADD LINK32 TAO_AnyTypeCoded.lib TAO_ValueTyped.lib TAO_Messagingd.lib TAO_PortableServerd.lib TAOd.lib ACEd.lib IceUtild.lib  advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\client.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "taoC - Win32 Release"

@@ -171,7 +172,7 @@ InputPath="Test.idl"
 

 BuildCmds= \

 	PATH=%PATH%;$(ACE_ROOT)\lib \

-	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -I$(TAO_ROOT) $(InputPath) \

+	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC  -I$(TAO_ROOT) $(InputPath) \

 	

 

 "TestC.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

@@ -208,7 +209,7 @@ InputPath="Test.idl"
 

 BuildCmds= \

 	PATH=%PATH%;$(ACE_ROOT)\lib \

-	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -I$(TAO_ROOT) $(InputPath) \

+	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC -I$(TAO_ROOT) $(InputPath) \

 	

 

 "TestC.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

diff --git a/perf/src/TAO/taoS.dsp b/perf/src/TAO/taoS.dsp
index 3b34a524240..a5dfbac4841 100644
--- a/perf/src/TAO/taoS.dsp
+++ b/perf/src/TAO/taoS.dsp
@@ -34,6 +34,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir "Debug\taoS"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 MTL=midl.exe

 # ADD MTL /D "_DEBUG" /nologo /mktyplib203 /win32

@@ -45,7 +46,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib TAO_Messagingd.lib TAO_Strategiesd.lib TAO_PortableServerd.lib TAO_ValueTyped.lib TAOd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\server.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ACE_ROOT)\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType"

+# ADD LINK32 TAO_AnyTypecoded.lib TAO_Messagingd.lib TAO_ValueTyped.lib TAO_PortableServerd.lib TAOd.lib ACEd.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\server.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ACE_ROOT)\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "taoS - Win32 Release"

@@ -66,7 +67,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib TAO_Messaging.lib TAO_Strategies.lib TAO_PortableServer.lib TAO_ValueType.lib TAO_AnyTypeCode.lib TAO.lib ACE.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ACE_ROOT)\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType"

+# ADD LINK32 TAO_Messaging.lib TAO_PortableServer.lib TAO_ValueType.lib TAO_AnyTypeCode.lib TAO.lib ACE.lib advapi32.lib user32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"$(TAO_ROOT)\..\lib" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ACE_ROOT)\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType"

 

 !ENDIF 

 

@@ -167,7 +168,7 @@ InputPath="Test.idl"
 

 BuildCmds= \

 	PATH=%PATH%;$(ACE_ROOT)\lib \

-	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -I$(TAO_ROOT) $(InputPath) \

+	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC -I$(TAO_ROOT) $(InputPath) \

 	

 

 "TestC.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

@@ -207,7 +208,7 @@ InputPath="Test.idl"
 

 BuildCmds= \

 	PATH=%PATH%;$(ACE_ROOT)\lib \

-	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -I$(TAO_ROOT) $(InputPath) \

+	$(ACE_ROOT)\bin\tao_idl -Ge 1 -GC  -I$(TAO_ROOT) $(InputPath) \

 	

 

 "TestC.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"