2009-08-21 12:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/win/mingw.mk
* config/win/msvc.mk
* config/rules.mk
! BIN_DIR -> DYN_DIR
This commit is contained in:
@@ -17,6 +17,12 @@
|
||||
past entries belonging to author(s): Viktor Szakats.
|
||||
*/
|
||||
|
||||
2009-08-21 12:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* config/win/mingw.mk
|
||||
* config/win/msvc.mk
|
||||
* config/rules.mk
|
||||
! BIN_DIR -> DYN_DIR
|
||||
|
||||
2009-08-21 12:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* source/Makefile
|
||||
! Fixed typo in prev commit.
|
||||
|
||||
@@ -59,7 +59,7 @@ endif
|
||||
|
||||
# The rule to link a dynamic library.
|
||||
ifeq ($(DY_RULE),)
|
||||
# DY_RULE = $(DY) $(DY_OUT)$(subst /,$(DIRSEP),$(BIN_DIR)/$@) $^ $(DFLAGS) $(HB_USER_DFLAGS) $(DLIBS)
|
||||
# DY_RULE = $(DY) $(DY_OUT)$(subst /,$(DIRSEP),$(DYN_DIR)/$@) $^ $(DFLAGS) $(HB_USER_DFLAGS) $(DLIBS)
|
||||
endif
|
||||
|
||||
# Eliminate these rules.
|
||||
|
||||
@@ -68,7 +68,7 @@ endef
|
||||
define create_dynlib
|
||||
$(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
|
||||
$(foreach file,$^,$(dyn_object))
|
||||
$(DY) $(DFLAGS) $(DY_OUT)"$(BIN_DIR)/$@"$(ECHOQUOTE) __dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS) -Wl,--output-def,"$(BIN_DIR)/$(basename $@).def"
|
||||
$(DY) $(DFLAGS) $(DY_OUT)"$(DYN_DIR)/$@"$(ECHOQUOTE) __dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS) -Wl,--output-def,"$(DYN_DIR)/$(basename $@).def"
|
||||
endef
|
||||
|
||||
DY_RULE = $(create_dynlib)
|
||||
|
||||
@@ -77,7 +77,7 @@ endef
|
||||
define create_dynlib
|
||||
@$(ECHO) $(ECHOQUOTE) $(DFLAGS) > __dyn__.tmp
|
||||
$(foreach file,$^,$(dyn_object))
|
||||
$(DY) $(DY_OUT)"$(subst /,$(DIRSEP),$(BIN_DIR)/$@)"$(ECHOQUOTE) @__dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS)
|
||||
$(DY) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)"$(ECHOQUOTE) @__dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS)
|
||||
endef
|
||||
|
||||
DY_RULE = $(create_dynlib)
|
||||
|
||||
Reference in New Issue
Block a user