(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.26 and 1.27

version 1.26, 2005/03/19 04:01:37 version 1.27, 2005/03/24 17:46:07
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.
   #
   VERSION_FLAGS := -Gx
   VERSION_DEBUG_FLAGS :=
   VERSION_RELEASE_FLAGS :=
   
   
   #
   # CL_MAJOR_VERSION 13 is VC 7
   #
   ifeq ($(CL_MAJOR_VERSION), 13)
       VERSION_FLAGS := -Wp64 -Gx -EHs
       VERSION_DEBUG_FLAGS := -Gs
       VERSION_RELEASE_FLAGS := -Gs -GF
   endif
   
   
   #
   # CL_MAJOR_VERSION 14 is VC 8
   #
   ifeq ($(CL_MAJOR_VERSION), 14)
       VERSION_FLAGS := -Wp64 -EHsc
       VERSION_DEBUG_FLAGS := -RTCc -RTCsu
       VERSION_RELEASE_FLAGS := -GF -GL
       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 := $(VERSION_FLAGS) $(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 := $(VERSION_FLAGS) $(VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD
 endif endif
  
   
 ifdef PEGASUS_DEBUG_CIMEXCEPTION ifdef PEGASUS_DEBUG_CIMEXCEPTION
  DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION  DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION
 endif endif
Line 130 
Line 168 
     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.26  
changed lines
  Added in v.1.27

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2