Attachment #51054 for issue #85437

View | Details | Raw Unified | Return to issue 85437
Collapse All | Expand All




LIBTARGET=NO
USE_DEFFILE=YES

INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \
    -I$(MISC) \

# --- Files -------------------------------------

    $(URLMONLIB) \
    $(SHLWAPILIB)

.IF "$(COM)"!="GCC"
.IF "$(CCNUMVER)" > "001300000000"
.IF "$(USE_STLP_DEBUG)" != ""
    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib

    SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
.ENDIF
.ENDIF
.ENDIF


#    $(KERNEL32LIB) \

Lines 49-55 Link Here

(-)ooo_src680_m243/extensions/source/ole/makefile.mk.orig (-1 / +1 lines)
49		49
50	USE_DEFFILE=TRUE	50	USE_DEFFILE=TRUE
51		51
52	INCPRE+= -I$(ATL_INCLUDE)	52	INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i))
53		53
54	# --- Settings -----------------------------------------------------	54	# --- Settings -----------------------------------------------------
55		55

Return to issue 85437

Lines 52-58 Link Here

(-)ooo_src680_m243/extensions/source/activex/main/makefile.mk.orig (-1 / +3 lines)
52	LIBTARGET=NO	52	LIBTARGET=NO
53	USE_DEFFILE=YES	53	USE_DEFFILE=YES
54		54
55	INCPRE+=$(ATL_INCLUDE) \	55	INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \
56	-I$(MISC) \	56	-I$(MISC) \
57		57
58	# --- Files -------------------------------------	58	# --- Files -------------------------------------
Lines 87-92 Link Here
87	$(URLMONLIB) \	87	$(URLMONLIB) \
88	$(SHLWAPILIB)	88	$(SHLWAPILIB)
89		89
		90	.IF "$(COM)"!="GCC"
90	.IF "$(CCNUMVER)" > "001300000000"	91	.IF "$(CCNUMVER)" > "001300000000"
91	.IF "$(USE_STLP_DEBUG)" != ""	92	.IF "$(USE_STLP_DEBUG)" != ""
92	SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib	93	SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
Lines 94-99 Link Here
94	SHL1STDLIBS+= $(ATL_LIB)$/atls.lib	95	SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
95	.ENDIF	96	.ENDIF
96	.ENDIF	97	.ENDIF
		98	.ENDIF
97		99
98		100
99	# $(KERNEL32LIB) \	101	# $(KERNEL32LIB) \