fixed path for static release builds

2 files changed, 27 insertions, 30 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
index 66626000839..55cc8976310 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
@@ -7,27 +7,24 @@
 CFG=IDL_Cubit Client - 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 "client.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 "client.mak" CFG="IDL_Cubit Client - Win32 static Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "IDL_Cubit Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Client - Win32 static Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Client - Win32 static Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

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

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

+!MESSAGE "IDL_Cubit Client - Win32 static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "IDL_Cubit Client - Win32 static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -126,7 +123,7 @@ LINK32=link.exe
 # PROP Target_Dir "client"

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D ACE_NO_INLINE /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -137,7 +134,7 @@ LINK32=link.exe
 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 # ADD LINK32 aces.lib TAOs.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -195,13 +192,13 @@ SOURCE=.\cubit.idl
 !IF  "$(CFG)" == "IDL_Cubit Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\..\release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -233,7 +230,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Client - Win32 Debug"

 

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"

+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

@@ -271,13 +268,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Client - Win32 static Debug"

 

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"

+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl_static.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\..\bin\tao_idl_static $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -311,13 +308,13 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl_static.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\..\bin\release\tao_idl_static $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -347,7 +344,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
index cd7068b3998..c60692923bd 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Target_Dir "server"

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D ACE_NO_INLINE /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -210,7 +210,7 @@ InputPath=.\cubit.idl
 InputName=cubit

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\..\release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -280,13 +280,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Server - Win32 static Debug"

 

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl_static.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\..\bin\tao_idl_static $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -320,13 +320,13 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl_static.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\..\bin\release\tao_idl_static $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)