(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.44 and 1.47

version 1.44, 2007/07/06 17:46:32 version 1.47, 2008/04/09 04:38:36
Line 51 
Line 51 
 # #
 # Determine the version of Windows being used. # Determine the version of Windows being used.
 # IPv6 is not supported on Windows 2000 (earliest Windows version supported # IPv6 is not supported on Windows 2000 (earliest Windows version supported
 # by Pegasus), nor by the VC 6 compiler (CL_MAJOR_VERSION is 12 for VC 6).  # by Pegasus), but we don't enforce that here.
   # IPv6 is not supported by the VC 6 compiler (CL_MAJOR_VERSION is 12 for VC 6).
 # #
 WIN_VERSION := $(shell ver)  
 ifeq ($(findstring [Version 5.0.,$(WIN_VERSION)),[Version 5.0.)  
     PEGASUS_ENABLE_IPV6 = false  
 endif  
 ifeq ($(CL_MAJOR_VERSION), 12) ifeq ($(CL_MAJOR_VERSION), 12)
     PEGASUS_ENABLE_IPV6 = false     PEGASUS_ENABLE_IPV6 = false
 endif endif
Line 104 
Line 101 
     LINK_FLAGS += -debug     LINK_FLAGS += -debug
 else else
     FLAGS = $(CXX_VERSION_FLAGS) $(CXX_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)      LINK_FLAGS += $(LINK_VERSION_RELEASE_FLAGS) -map
 endif endif
  
  
Line 177 
Line 174 
  
 YACC = bison YACC = bison
  
   RC = rc
   
 # 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
  
Line 246 
Line 245 
   endif   endif
 endif endif
  
   ##################################
   ##
   ## The newer compiler versions need neither MS Platform SDK installed nor MSSdk variable defined.
   ##
   ##################################
 ifeq ($(PEGASUS_BUILD_WMIMAPPER),true) ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     ifeq ($(CL_MAJOR_VERSION), 12)
       PEGASUS_WMIMAPPER_NEED_MSSDK=true
     endif
     ifeq ($(CL_MAJOR_VERSION), 13)
       PEGASUS_WMIMAPPER_NEED_MSSDK=true
     endif
     ifeq ($(PEGASUS_WMIMAPPER_NEED_MSSDK),true)
   ifndef MSSdk   ifndef MSSdk
     $(error MSSdk environment variable undefined)     $(error MSSdk environment variable undefined)
   endif   endif
 endif endif
   endif
   
   
  
  


Legend:
Removed from v.1.44  
changed lines
  Added in v.1.47

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2