equal
deleted
inserted
replaced
19 ifneq ($(filter plugin plugin3,$(TARGETTYPE)),) |
19 ifneq ($(filter plugin plugin3,$(TARGETTYPE)),) |
20 include $(FLMHOME)/e32abiv2defaults.mk |
20 include $(FLMHOME)/e32abiv2defaults.mk |
21 |
21 |
22 # Default Linker settings for this target type |
22 # Default Linker settings for this target type |
23 LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib |
23 LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib |
24 LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) |
24 LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_PREFIX)$(ENTRYPOINT) $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) |
25 |
|
26 ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") |
|
27 LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) |
|
28 endif |
|
29 |
25 |
30 LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib |
26 LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib |
31 STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB) |
27 STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB) |
32 |
28 |
33 # Default Postlinker settings |
29 # Default Postlinker settings |