mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-19 13:17:39 +01:00
defs.mk, rules.mk: Some fixes to mingw support
This commit is contained in:
parent
9b9343c48a
commit
12b543efd9
2 changed files with 18 additions and 7 deletions
|
|
@ -61,9 +61,15 @@ endif
|
|||
$(VERSION_SCRIPT):
|
||||
$(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@
|
||||
|
||||
ifneq ($(TARGET),mingw)
|
||||
$(LIB_SO): $(VERSION_SCRIPT) $(LIB_A)
|
||||
$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \
|
||||
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
|
||||
else
|
||||
$(LIB_SO): $(VERSION_SCRIPT) $(LIB_A)
|
||||
$(CC) -shared -Wl,--whole-archive,--out-implib,$(LIB_A)-mingw $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \
|
||||
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
|
||||
endif
|
||||
|
||||
$(TOPDIR)/include:
|
||||
mkdir -p $@
|
||||
|
|
@ -200,10 +206,10 @@ endif
|
|||
# fi
|
||||
|
||||
.%.o.dep.mk: %.cpp $(BUILD_H)
|
||||
gcc -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
|
||||
$(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
|
||||
|
||||
.%.o.dep.mk: %.c $(BUILD_H)
|
||||
gcc -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
|
||||
$(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
|
||||
|
||||
checkroot:
|
||||
@if [ "$(CHECK_ROOT)" = true -o "$(CHECK_ROOT)" = TRUE ] ; then \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue