(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.27 and 1.35

version 1.27, 2005/03/24 17:46:07 version 1.35, 2005/05/03 20:20:50
Line 21 
Line 21 
 # #
 # The flags set here should be valid for VC 6. # The flags set here should be valid for VC 6.
 # #
 VERSION_FLAGS := -Gx  CXX_VERSION_FLAGS := -GX
 VERSION_DEBUG_FLAGS :=  CXX_VERSION_DEBUG_FLAGS :=
 VERSION_RELEASE_FLAGS :=  CXX_VERSION_RELEASE_FLAGS :=
   LINK_VERSION_RELEASE_FLAGS :=
  
  
 # #
 # CL_MAJOR_VERSION 13 is VC 7 # CL_MAJOR_VERSION 13 is VC 7
 # #
 ifeq ($(CL_MAJOR_VERSION), 13) ifeq ($(CL_MAJOR_VERSION), 13)
     VERSION_FLAGS := -Wp64 -Gx -EHs      CXX_VERSION_FLAGS := -Wp64 -EHsc
     VERSION_DEBUG_FLAGS := -Gs      CXX_VERSION_DEBUG_FLAGS := -Gs
     VERSION_RELEASE_FLAGS := -Gs -GF      CXX_VERSION_RELEASE_FLAGS := -Gs -GF -Gy
       LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
 endif endif
  
  
Line 40 
Line 42 
 # CL_MAJOR_VERSION 14 is VC 8 # CL_MAJOR_VERSION 14 is VC 8
 # #
 ifeq ($(CL_MAJOR_VERSION), 14) ifeq ($(CL_MAJOR_VERSION), 14)
     VERSION_FLAGS := -Wp64 -EHsc      CXX_VERSION_FLAGS := -Wp64 -EHsc
     VERSION_DEBUG_FLAGS := -RTCc -RTCsu      CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
     VERSION_RELEASE_FLAGS := -GF -GL      CXX_VERSION_RELEASE_FLAGS := -GF -GL -Gy
       LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
     DEFINES += -D_CRT_SECURE_NO_DEPRECATE     DEFINES += -D_CRT_SECURE_NO_DEPRECATE
 endif endif
  
  
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
     FLAGS := $(VERSION_FLAGS) $(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
     FLAGS := $(VERSION_FLAGS) $(VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD      FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD
       LINK_FLAGS += $(LINK_VERSION_RELEASE_FLAGS)
 endif endif
  
  
Line 60 
Line 64 
 endif endif
  
 # Enable the compilation of the SLP functions. # Enable the compilation of the SLP functions.
 PEGASUS_ENABLE_SLP=true  ifdef PEGASUS_ENABLE_SLP
       DEFINES+= -DPEGASUS_ENABLE_SLP
   endif
  
 # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability
 # changes during interoperability tests. # changes during interoperability tests.
Line 126 
Line 132 
 # The Provider User Context feature (PEP 197) is not supported on Windows # The Provider User Context feature (PEP 197) is not supported on Windows
 PEGASUS_DISABLE_PROV_USERCTXT=1 PEGASUS_DISABLE_PROV_USERCTXT=1
  
   # Windows does not support local domain sockets or the equivalent Bug 2147
   PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
   
 # l10n # l10n
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
     DEFINES += -DPEGASUS_HAS_MESSAGES     DEFINES += -DPEGASUS_HAS_MESSAGES


Legend:
Removed from v.1.27  
changed lines
  Added in v.1.35

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2