diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-10-23 11:12:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-10-23 11:12:07 +0000 |
| commit | e20fb453423579cb6fae2e04cf26a59004560040 (patch) | |
| tree | 151bd86bcd4d24f10f3954ddbfdfcc5ed84c9b28 /extensions/source/activex | |
| parent | dca5cf3fdaaed8be10e8ca32fa8d7b4e0647e17b (diff) | |
#i105892# Windows 64 Bit support
Diffstat (limited to 'extensions/source/activex')
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 56 |
1 files changed, 55 insertions, 1 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index 64dcbe34a2e1..2dc8f9aa5ca9 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -49,6 +49,10 @@ LIBTARGET=NO USE_DEFFILE=YES UWINAPILIB= +.IF "$(BUILD_X64)"!="" +USE_DEFFILE_X64=TRUE +.ENDIF + INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \ -I$(MISC) \ @@ -110,9 +114,58 @@ SHL1RES=$(RES)$/$(TARGET).res .ENDIF +.IF "$(BUILD_X64)"!="" +# -------------------- x64 ----------------------- +.IF "$(USE_STLP_DEBUG)"!="" +CDEFS_X64+=-D_DEBUG +.ENDIF # "$(USE_STLP_DEBUG)"!="" + +CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1, $i)) +LIBTARGET_X64=NO +USE_DEFFILE_X64=YES +UWINAPILIB_X64= + +SLOFILES_X64= \ + $(SLO_X64)$/so_activex.obj \ + $(SLO_X64)$/SOActiveX.obj \ + $(SLO_X64)$/SOComWindowPeer.obj \ + $(SLO_X64)$/SODispatchInterceptor.obj \ + $(SLO_X64)$/SOActionsApproval.obj \ + $(SLO_X64)$/StdAfx2.obj + +SHL1TARGET_X64=$(TARGET) + +SHL1STDLIBS_X64+=\ + $(UUIDLIB_X64) \ + $(ADVAPI32LIB_X64) \ + $(OLE32LIB_X64) \ + $(OLEAUT32LIB_X64) \ + $(GDI32LIB_X64) \ + $(URLMONLIB_X64) \ + $(SHLWAPILIB_X64) \ + $(KERNEL32LIB_X64) \ + $(USER32LIB_X64) \ + $(MSVCRT_X64) \ + $(MSVCPRT_X64) \ + $(OLDNAMESLIB_X64) + +SHL1OBJS_X64=$(SLOFILES_X64) +SHL1DEF_X64=$(TARGET).def + +.IF "$(debug)" != "" + SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib +.ELSE + SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib +.ENDIF + +.ENDIF # "$(BUILD_X64)"!="" + # --- Targets ---------------------------------- +.INCLUDE : set_wntx64.mk +VERSIONOBJ_X64= .INCLUDE : target.mk +.INCLUDE : tg_wntx64.mk $(MISC)$/envsettings.h : makefile.mk -$(RM) $@ @@ -122,3 +175,4 @@ $(MISC)$/envsettings.h : makefile.mk .ELSE # "$(USE_SHELL)"!="4nt" echo #define MISC .\..\$(INPATH)\misc > $@ .ENDIF # "$(USE_SHELL)"!="4nt" + |