1 files changed, 21 insertions, 23 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
index 59d5fbe01a7..72c9ad270da 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
@@ -7,27 +7,29 @@
 CFG=MT_Cubit Server - Win32 static Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "server.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 "server.mak" CFG="MT_Cubit Server - Win32 static Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "MT_Cubit Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_Cubit Server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_Cubit Server - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_Cubit Server - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
+!MESSAGE
+!MESSAGE "MT_Cubit Server - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MT_Cubit Server - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MT_Cubit Server - Win32 static Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MT_Cubit Server - Win32 static Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
-# PROP Scc_LocalPath "Desktop"
-# PROP WCE_FormatVersion ""
+# PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
 
@@ -95,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -132,7 +134,7 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"
 # ADD LINK32 acesd.lib TAOsd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -218,13 +220,12 @@ SOURCE=.\cubit.idl
 !IF  "$(CFG)" == "MT_Cubit Server - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\..\bin\release\tao_idl.exe"	
 # Begin Custom Build - Invoking tao_idl
 InputPath=.\cubit.idl
 InputName=cubit
 
 BuildCmds= \
-	..\..\..\..\..\bin\release\tao_idl $(InputName).idl
+	tao_idl $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -257,7 +258,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "MT_Cubit Server - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking tao_idl
 InputPath=.\cubit.idl
 InputName=cubit
@@ -297,13 +297,12 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\..\bin\release\tao_idl_static.exe"	
 # Begin Custom Build - Invoking tao_idl
 InputPath=.\cubit.idl
 InputName=cubit
 
 BuildCmds= \
-	..\..\..\..\..\bin\release\tao_idl_static $(InputName).idl
+	tao_idl $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -337,13 +336,12 @@ BuildCmds= \
 
 # PROP BASE Ignore_Default_Tool 1
 # PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl_static.exe"	
 # Begin Custom Build - Invoking tao_idl
 InputPath=.\cubit.idl
 InputName=cubit
 
 BuildCmds= \
-	tao_idl_static $(InputName).idl
+	tao_idl $(InputName).idl
 
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -373,7 +371,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Group