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

version 1.24, 2005/03/07 19:52:08 version 1.35, 2005/05/03 20:20:50
Line 10 
Line 10 
 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0400 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0400
 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400
  
   
   #
   # Determine the version of the compiler being used.
   #
   CL_VERSION := $(word 8, $(shell cl.exe 2>&1))
   CL_MAJOR_VERSION := $(word 1, $(subst .,  , $(CL_VERSION)))
   
   
   #
   # The flags set here should be valid for VC 6.
   #
   CXX_VERSION_FLAGS := -GX
   CXX_VERSION_DEBUG_FLAGS :=
   CXX_VERSION_RELEASE_FLAGS :=
   LINK_VERSION_RELEASE_FLAGS :=
   
   
   #
   # CL_MAJOR_VERSION 13 is VC 7
   #
   ifeq ($(CL_MAJOR_VERSION), 13)
       CXX_VERSION_FLAGS := -Wp64 -EHsc
       CXX_VERSION_DEBUG_FLAGS := -Gs
       CXX_VERSION_RELEASE_FLAGS := -Gs -GF -Gy
       LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
   endif
   
   
   #
   # CL_MAJOR_VERSION 14 is VC 8
   #
   ifeq ($(CL_MAJOR_VERSION), 14)
       CXX_VERSION_FLAGS := -Wp64 -EHsc
       CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
       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
   endif
   
   
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
   FLAGS = -GX -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 = -GX -GR -W3 -O2 -MD      FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD
       LINK_FLAGS += $(LINK_VERSION_RELEASE_FLAGS)
 endif endif
  
   
 ifdef PEGASUS_DEBUG_CIMEXCEPTION ifdef PEGASUS_DEBUG_CIMEXCEPTION
  DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION  DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION
 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 36 
Line 80 
  
 MKDIRHIER = mu mkdirhier MKDIRHIER = mu mkdirhier
  
   DIFF = mu compare
   
   SORT = mu sort
   
 COPY = mu copy COPY = mu copy
  
 MOVE = mu move MOVE = mu move
Line 78 
Line 126 
  
 YACC = bison YACC = bison
  
 INSTALL_LIBRARY = echo Not supported.  
 INSTALL_PROGRAM = echo Not supported.  
 INSTALL_SBIN_PROGRAM = echo Not supported.  
   
 # Windows DLLs are installed in the $(PEGASUS_HOME)/bin directory # Windows DLLs are installed in the $(PEGASUS_HOME)/bin directory
 PEGASUS_DEST_LIB_DIR = bin PEGASUS_DEST_LIB_DIR = bin
  
 # 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
Line 130 
Line 177 
     SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n     SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n
   endif   endif
 endif endif
   


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2