summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2005-06-24 03:21:17 +0000
committerMatthew Newhook <matthew@zeroc.com>2005-06-24 03:21:17 +0000
commit23be099fd1c9f1a93f713699cb502faac841d88d (patch)
tree6e3d23a8bb247b1a9407c7e7771d1a0dba5bf023
parentChanges to support recent code rearrangement (diff)
downloadice-23be099fd1c9f1a93f713699cb502faac841d88d.tar.bz2
ice-23be099fd1c9f1a93f713699cb502faac841d88d.tar.xz
ice-23be099fd1c9f1a93f713699cb502faac841d88d.zip
- Commented out the STLport #defines.
- Fixed some project options.
-rwxr-xr-xcppe/test/Common/testCommon.dsp11
1 files changed, 6 insertions, 5 deletions
diff --git a/cppe/test/Common/testCommon.dsp b/cppe/test/Common/testCommon.dsp
index 5f0f53aea2e..801a51988fc 100755
--- a/cppe/test/Common/testCommon.dsp
+++ b/cppe/test/Common/testCommon.dsp
@@ -116,8 +116,8 @@ PostBuild_Cmds=copy $(OutDir)\testCommond.lib ..\..\lib\ copy $(OutDir)\testComm
# PROP Intermediate_Dir "ReleaseStatic"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-MTL=midl.exe
SLICE2CPPEFLAGS=-DICEE
+MTL=midl.exe
CPP=cl.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /I "../include" /D "NDEBUG" /D "ICE_STATIC_LIBS" /D "_LIB" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c
@@ -129,10 +129,11 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
+# ADD LIB32 /nologo
# Begin Special Build Tool
OutDir=.\ReleaseStatic
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\testCommon.lib ..\..\lib\
+PostBuild_Cmds=copy $(OutDir)\testCommon.lib ..\..\lib\
# End Special Build Tool
!ELSEIF "$(CFG)" == "testCommon - Win32 Debug Static"
@@ -148,8 +149,8 @@ PostBuild_Cmds=copy $(OutDir)\testCommon.lib ..\..\lib\
# PROP Intermediate_Dir "DebugStatic"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-MTL=midl.exe
SLICE2CPPEFLAGS=-DICEE
+MTL=midl.exe
CPP=cl.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "../include" /D "_DEBUG" /D "ICE_STATIC_LIBS" /D "_LIB" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c
@@ -161,11 +162,11 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo /o"DebugStatic/testCommone.bsc"
LIB32=link.exe -lib
-# ADD LIB32 /out:"DebugStatic\testCommond.lib"
+# ADD LIB32 /nologo /out:"DebugStatic\testCommond.lib"
# Begin Special Build Tool
OutDir=.\DebugStatic
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\testCommond.lib ..\..\lib\
+PostBuild_Cmds=copy $(OutDir)\testCommond.lib ..\..\lib\
# End Special Build Tool
!ENDIF