diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-12-08 17:36:05 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-12-08 17:36:05 +0100 |
| commit | d95c37cdac36e96c22fa38b519817cc0466f1f96 (patch) | |
| tree | 980ed1a5ee552e7c9bebb6b37cbc7f3ce3e807d4 /extensions/source/activex | |
| parent | a2dc6ec23c5f6fabd3c80d4bcc75f0a913460093 (diff) | |
masterfix: #i10000# no 64-bit debug libs to link
Notes
split repo tag: components_ooo/DEV300_m67
Diffstat (limited to 'extensions/source/activex')
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index 1a702eb9da27..6ecd7f909484 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -62,9 +62,6 @@ INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \ .IF "$(PRODUCT)"!="" RC+=-DPRODUCT .ENDIF -.IF "$(USE_STLP_DEBUG)"!="" -CDEFS+=-D_DEBUG -.ENDIF # "$(USE_STLP_DEBUG)"!="" RCFILES=\ $(TARGET).rc @@ -90,13 +87,9 @@ SHL1STDLIBS=\ .IF "$(COM)"!="GCC" .IF "$(CCNUMVER)" > "001300000000" -.IF "$(USE_STLP_DEBUG)" != "" - SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib -.ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF .ENDIF -.ENDIF # $(KERNEL32LIB) \ @@ -116,9 +109,6 @@ SHL1RES=$(RES)$/$(TARGET).res .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 @@ -152,11 +142,7 @@ SHL1STDLIBS_X64+=\ SHL1OBJS_X64=$(SLOFILES_X64) SHL1DEF_X64=$(TARGET).def -.IF "$(USE_STLP_DEBUG)" != "" - SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib -.ELSE - SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib -.ENDIF +SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib .ENDIF # "$(BUILD_X64)"!="" |