168 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_DSO)),) |
168 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_DSO)),) |
169 IMPORTLIBTARGET_DSO:=$(TMP_IMPORTLIBTARGET_ROOT).dso |
169 IMPORTLIBTARGET_DSO:=$(TMP_IMPORTLIBTARGET_ROOT).dso |
170 IMPORTLIBTARGETVERSIONED_DSO:=$(VER_E32IMPORTLIBBASE).dso |
170 IMPORTLIBTARGETVERSIONED_DSO:=$(VER_E32IMPORTLIBBASE).dso |
171 endif |
171 endif |
172 |
172 |
173 # ABIv1 .lib (for specific builds, toolchains and host OS platforms only) |
173 # ABIv1 .lib (for specific kits and toolchains only) |
174 IMPORTLIBTARGET_LIB:= |
174 IMPORTLIBTARGET_LIB:= |
175 IMPORTLIBTARGETVERSIONED_LIB:= |
175 IMPORTLIBTARGETVERSIONED_LIB:= |
176 BUILDMARKER_IMPORTLIBTARGET_LIB:=TARGET_$(subst :,,$(VER_E32IMPORTLIBBASE)).lib |
176 BUILDMARKER_IMPORTLIBTARGET_LIB:=TARGET_$(subst :,,$(VER_E32IMPORTLIBBASE)).lib |
177 # Only for builds that require and support them, and only on windows |
177 # Only for kits that require and tools that support them |
178 ifeq ($(OSTYPE),cygwin) |
178 ifneq ($(SUPPORTS_ABIV1_IMPLIBS),) |
179 ifeq ($(GENERATE_ABIV1_IMPLIBS),1) |
|
180 WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).lib) |
179 WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).lib) |
181 WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).lib |
180 WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).lib |
182 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_LIB)),) |
181 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_LIB)),) |
183 IMPORTLIBTARGET_LIB:=$(TMP_IMPORTLIBTARGET_ROOT).lib |
182 IMPORTLIBTARGET_LIB:=$(TMP_IMPORTLIBTARGET_ROOT).lib |
184 IMPORTLIBTARGETVERSIONED_LIB:=$(VER_E32IMPORTLIBBASE).lib |
183 IMPORTLIBTARGETVERSIONED_LIB:=$(VER_E32IMPORTLIBBASE).lib |
185 endif |
184 endif |
186 endif |
|
187 endif |
185 endif |
188 endif |
186 endif |
189 |
187 |
190 # Try to make sure that we get the right linkas name |
188 # Try to make sure that we get the right linkas name |
191 # If linkas is specified then split it up and |
189 # If linkas is specified then split it up and |