(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.45 and 1.48

version 1.45, 2007/07/13 21:49:42 version 1.48, 2008/05/22 17:43:53
Line 101 
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 174 
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 183 
Line 185 
 # Windows does not support local domain sockets or the equivalent Bug 2147 # Windows does not support local domain sockets or the equivalent Bug 2147
 PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1 PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
  
 # l10n  
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
     DEFINES += -DPEGASUS_HAS_MESSAGES      ifeq ($(PEGASUS_HAS_ICU),true)
     ifdef ICU_ROOT  
         MSG_COMPILE = genrb         MSG_COMPILE = genrb
         MSG_FLAGS =         MSG_FLAGS =
         MSG_SOURCE_EXT = .txt         MSG_SOURCE_EXT = .txt
         MSG_COMPILE_EXT = .res         MSG_COMPILE_EXT = .res
         CNV_ROOT_CMD = cnv2rootbundle         CNV_ROOT_CMD = cnv2rootbundle
  
 ##################################  
 ##  
 ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle,  
 ## default is to uppercase the root resource bundle##  
 ##################################  
   
 ifdef ICU_NO_UPPERCASE_ROOT  
     CNV_ROOT_FLAGS =  
 else  
     CNV_ROOT_FLAGS = -u  
 endif  
   
 ####################################  
 ##  
 ##   ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource bundle will be generated from  
 ##   defaults to _en if not set.  if set, for any directory containing resource bundles,  
 ##   there must exist a file name: package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages target will fail  
 ##  
 ##   We have to use the full path library because the cl /Fe command in program-windows.mak does  
 ##   not take libpath as an argument (as far as I can tell)  
 ####################################  
   
 ifdef ICU_ROOT_BUNDLE_LANG  
     MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)  
 else  
     MSG_ROOT_SOURCE = _en  
 endif  
         DEFINES += -DPEGASUS_HAS_ICU  
         EXTRA_LIBRARIES += $(ICU_INSTALL)/lib/icuuc.lib $(ICU_INSTALL)/lib/icuin.lib $(ICU_INSTALL)/lib/icudt.lib         EXTRA_LIBRARIES += $(ICU_INSTALL)/lib/icuuc.lib $(ICU_INSTALL)/lib/icuin.lib $(ICU_INSTALL)/lib/icudt.lib
         SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n          SYS_INCLUDES += -I$(ICU_INSTALL)/include
     endif     endif
 endif endif
  
Line 243 
Line 215 
   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.45  
changed lines
  Added in v.1.48

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2