makefile.mk (7871dc3e) makefile.mk (b93bfd5e)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 29 unchanged lines hidden (view full) ---

38USE_DEFFILE=TRUE
39
40INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i))
41
42# --- Settings -----------------------------------------------------
43
44.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
45
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 29 unchanged lines hidden (view full) ---

38USE_DEFFILE=TRUE
39
40INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i))
41
42# --- Settings -----------------------------------------------------
43
44.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
45
46.IF "$(USE_STLP_DEBUG)"!=""
47CDEFS+=-D_DEBUG
48.ENDIF # "$(USE_STLP_DEBUG)"!=""
49
50SLOFILES= \
51 $(SLO)$/servreg.obj \
52 $(SLO)$/servprov.obj \
53 $(SLO)$/unoobjw.obj \
54 $(SLO)$/oleobjw.obj \
55 $(SLO)$/olethread.obj \
56 $(SLO)$/oledll.obj \
57 $(SLO)$/jscriptclasses.obj \

--- 14 unchanged lines hidden (view full) ---

72 $(CPPUHELPERLIB) \
73 $(OLE32LIB) \
74 $(UUIDLIB) \
75 $(ADVAPI32LIB) \
76 $(OLEAUT32LIB)
77
78.IF "$(COM)"=="MSC"
79.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
46SLOFILES= \
47 $(SLO)$/servreg.obj \
48 $(SLO)$/servprov.obj \
49 $(SLO)$/unoobjw.obj \
50 $(SLO)$/oleobjw.obj \
51 $(SLO)$/olethread.obj \
52 $(SLO)$/oledll.obj \
53 $(SLO)$/jscriptclasses.obj \

--- 14 unchanged lines hidden (view full) ---

68 $(CPPUHELPERLIB) \
69 $(OLE32LIB) \
70 $(UUIDLIB) \
71 $(ADVAPI32LIB) \
72 $(OLEAUT32LIB)
73
74.IF "$(COM)"=="MSC"
75.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
80.IF "$(USE_STLP_DEBUG)" != ""
81 SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
82.ELSE
83 SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
76 SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
84.ENDIF
85.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
86.ENDIF # "$(COM)"=="MSC"
87
88SHL1LIBS=
89SHL1OBJS=$(SLOFILES)
90
91DEF1NAME=$(SHL1TARGET)
92DEF1EXPORTFILE=$(SHL1TARGET).dxp

--- 7 unchanged lines hidden (view full) ---

100 $(CPPUHELPERLIB) \
101 $(OLE32LIB) \
102 $(UUIDLIB) \
103 $(ADVAPI32LIB) \
104 $(OLEAUT32LIB)
105
106.IF "$(COM)"=="MSC"
107.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
77.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
78.ENDIF # "$(COM)"=="MSC"
79
80SHL1LIBS=
81SHL1OBJS=$(SLOFILES)
82
83DEF1NAME=$(SHL1TARGET)
84DEF1EXPORTFILE=$(SHL1TARGET).dxp

--- 7 unchanged lines hidden (view full) ---

92 $(CPPUHELPERLIB) \
93 $(OLE32LIB) \
94 $(UUIDLIB) \
95 $(ADVAPI32LIB) \
96 $(OLEAUT32LIB)
97
98.IF "$(COM)"=="MSC"
99.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
108.IF "$(USE_STLP_DEBUG)" != ""
109 SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
110.ELSE
111 SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
100 SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
112.ENDIF
113.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
114.ENDIF # "$(COM)"=="MSC"
115
116SHL2LIBS=
117SHL2OBJS=$(REAL_OWNGUID_SLOFILES)
118
119DEF2NAME=$(SHL2TARGET)
120DEF2EXPORTFILE=$(TARGET).dxp

--- 14 unchanged lines hidden --- 		101.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
102.ENDIF # "$(COM)"=="MSC"
103
104SHL2LIBS=
105SHL2OBJS=$(REAL_OWNGUID_SLOFILES)
106
107DEF2NAME=$(SHL2TARGET)
108DEF2EXPORTFILE=$(TARGET).dxp

--- 14 unchanged lines hidden ---