libcacard: fix mingw64 cross-compilation
Compile and link with version.lo Signed-off-by: Marc-André Lureau <mlureau@redhat.com> Reviewed-by: Alon Levy <alevy@redhat.com>
This commit is contained in:
parent
37746c5eac
commit
5354e4d242
8
Makefile
8
Makefile
|
@ -166,11 +166,15 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
|
||||||
|
|
||||||
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
|
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
|
||||||
|
|
||||||
version.o: $(SRC_PATH)/version.rc config-host.h
|
version.o: $(SRC_PATH)/version.rc config-host.h | version.lo
|
||||||
$(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@")
|
$(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@")
|
||||||
|
version.lo: $(SRC_PATH)/version.rc config-host.h
|
||||||
|
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o $@ $<,"lt RC $(TARGET_DIR)$@")
|
||||||
|
|
||||||
version-obj-$(CONFIG_WIN32) += version.o
|
version-obj-$(CONFIG_WIN32) += version.o
|
||||||
Makefile: $(version-obj-y)
|
version-lobj-$(CONFIG_WIN32) += $(if $(LIBTOOL),version.lo)
|
||||||
|
Makefile: $(version-obj-y) $(version-lobj-y)
|
||||||
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Build libraries
|
# Build libraries
|
||||||
|
|
|
@ -35,7 +35,8 @@ LIBTOOL += $(if $(V),,--quiet)
|
||||||
LINK = $(call quiet-command,\
|
LINK = $(call quiet-command,\
|
||||||
$(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \
|
$(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \
|
||||||
)$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
|
)$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
|
||||||
$(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
|
$(sort $(filter %.o, $1)) $(filter-out %.o, $1) \
|
||||||
|
$(if $(filter %.lo %.la,$^),$(version-lobj-y),$(version-obj-y)) \
|
||||||
$(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
|
$(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
|
||||||
$(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK ")"$(TARGET_DIR)$@")
|
$(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK ")"$(TARGET_DIR)$@")
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue