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

version 1.4, 2001/05/14 00:39:51 version 1.27, 2005/03/24 17:46:07
Line 7 
Line 7 
  
 DEPEND_INCLUDES = DEPEND_INCLUDES =
  
 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM)  DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=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 -W3 -Od -Zi -MDd      FLAGS := $(VERSION_FLAGS) $(VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/
       LINK_FLAGS := -debug
 else else
   FLAGS = -GX -W3 -O2 -MD      FLAGS := $(VERSION_FLAGS) $(VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD
   endif
   
   
   ifdef PEGASUS_DEBUG_CIMEXCEPTION
       DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION
   endif
   
   # Enable the compilation of the SLP functions.
   PEGASUS_ENABLE_SLP=true
   
   # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability
   # changes during interoperability tests.
   ifdef PEGASUS_SNIA_INTEROP_TEST
       DEFINES+= -DPEGASUS_SNIA_INTEROP_TEST
 endif endif
  
 RM = mu rm RM = mu rm
Line 21 
Line 74 
  
 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 37 
Line 94 
  
 EXE = .exe EXE = .exe
  
   DLL = .dll
   
   ILK = .ilk
   
   PDB = .pdb
   
   EXP = .exp
   
 AR = LINK -nologo -dll AR = LINK -nologo -dll
  
 LIB_PREFIX = LIB_PREFIX =
Line 51 
Line 116 
  
 YACC = bison YACC = bison
  
 SYS_LIBS = ws2_32.lib advapi32.lib  
   
 SH = bash SH = bash
  
 YACC = bison YACC = bison
   
   # Windows DLLs are installed in the $(PEGASUS_HOME)/bin directory
   PEGASUS_DEST_LIB_DIR = bin
   
   # The Provider User Context feature (PEP 197) is not supported on Windows
   PEGASUS_DISABLE_PROV_USERCTXT=1
   
   # l10n
   ifdef PEGASUS_HAS_MESSAGES
       DEFINES += -DPEGASUS_HAS_MESSAGES
       ifdef ICU_ROOT
           MSG_COMPILE = genrb
           MSG_FLAGS =
           MSG_SOURCE_EXT = .txt
           MSG_COMPILE_EXT = .res
           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
           SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n
       endif
   endif


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2