INTEGRATION: CWS obo24 (1.4.214); FILE MERGED

2008/03/13 15:26:35 obo 1.4.214.1: #i75046# additional build for 64 bit shell extension (Windows Vista)
This commit is contained in:
Kurt Zenker 2008-04-02 08:44:04 +00:00
parent a0234a1cc1
commit 79e1e36bc6
2 changed files with 25 additions and 9 deletions

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.4 $
# $Revision: 1.5 $
#
# last change: $Author: rt $ $Date: 2005-09-07 19:59:50 $
# last change: $Author: kz $ $Date: 2008-04-02 09:43:51 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -39,6 +39,7 @@ TARGET=columninfo
LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@ -50,8 +51,15 @@ CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
SLOFILES=$(SLO)$/columninfo.obj
.IF "$(BUILD_X64)"!=""
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS_X64+=-D_WIN32_IE=0x501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
.INCLUDE : tg_wntx64.mk

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.4 $
# $Revision: 1.5 $
#
# last change: $Author: rt $ $Date: 2005-09-07 20:00:26 $
# last change: $Author: kz $ $Date: 2008-04-02 09:44:04 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -50,8 +50,16 @@ CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
SLOFILES=$(SLO)$/$(TARGET).obj
.IF "$(BUILD_X64)"!=""
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS_X64+=-D_WIN32_IE=0x501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
.INCLUDE : tg_wntx64.mk