(file) Return to platform_WIN32_IX86_MSVC.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_WIN32_IX86_MSVC.mak between version 1.37 and 1.40

version 1.37, 2005/08/09 18:34:32 version 1.40, 2005/12/16 19:44:35
Line 49 
Line 49 
 # #
 # The flags set here should be valid for VC 6. # The flags set here should be valid for VC 6.
 # #
 CXX_VERSION_FLAGS := -GX  # The -Zm105 flag was added as part of bug 4418 to resolve this compile error:
   #   C:\Program Files\Microsoft Visual Studio\VC98\include\xlocale(467) :
   #   fatal error C1076: compiler limit : internal heap limit reached; use /Zm to
   #   specify a higher limit
   #
   CXX_VERSION_FLAGS := -GX -Zm105
 CXX_VERSION_DEBUG_FLAGS := CXX_VERSION_DEBUG_FLAGS :=
 CXX_VERSION_RELEASE_FLAGS := CXX_VERSION_RELEASE_FLAGS :=
 LINK_VERSION_RELEASE_FLAGS := LINK_VERSION_RELEASE_FLAGS :=
Line 78 
Line 83 
 endif endif
  
  
 ifdef PEGASUS_DEBUG  ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
     FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/     FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/
     LINK_FLAGS += -debug     LINK_FLAGS += -debug
 else else
Line 91 
Line 96 
     DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION     DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION
 endif endif
  
   # if PEGASUS_ENABLE_SLP is already set then honor the users preference else
 # Enable the compilation of the SLP functions. # Enable the compilation of the SLP functions.
 ifndef PEGASUS_DISABLE_SLP  #
   ifndef PEGASUS_ENABLE_SLP
     PEGASUS_ENABLE_SLP = true     PEGASUS_ENABLE_SLP = true
     DEFINES += -DPEGASUS_ENABLE_SLP  
 endif endif
  
 # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability


Legend:
Removed from v.1.37  
changed lines
  Added in v.1.40

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2