@@ -47,6 +47,7 @@ HAS_LIBCXX ?= YES
4747ALLOCATOR ?= STANDARD
4848PREFER_OS_CRT ?= NO
4949PREFER_OS_LIBC ?= YES
50+ SKIP_LIBRARY_LDFLAGS ?= NO
5051LIBLOAD_OPTIONAL ?=
5152COMPRESSED_MODE ?= zx7
5253COMMENT ?= $(shell cedev-config --comment)
@@ -169,6 +170,7 @@ LDFILES = $(LDCRT0) $(LINK_CSOURCES) $(LINK_CPPSOURCES) $(LINK_ASMSOURCES)
169170DEPFILES = $(wildcard $(LINK_CSOURCES:%.src=%.d ) $(LINK_CPPSOURCES:%.src=%.d ) )
170171endif
171172
173+ ifneq ($(SKIP_LIBRARY_LDFLAGS ) ,YES)
172174# find all required/optional libload libraries
173175LIBLOAD_LIBS ?= $(wildcard $(CEDEV_TOOLCHAIN ) /lib/libload/* .lib) $(EXTRA_LIBLOAD_LIBS )
174176LIBLOAD_LIBS := $(filter-out % libload.lib,$(LIBLOAD_LIBS ) )
@@ -179,6 +181,8 @@ OPT_LIBLOAD := $(call FASMG_LIB,$(OPT_LIBLOAD))
179181OPT_LIBLOAD := $(foreach lib,$(OPT_LIBLOAD ) ,$(lib )$(space ) optional)
180182LDLIBS := $(subst $(space ) ,$(comma )$(space ) ,$(strip $(REQ_LIBLOAD )$(space )$(OPT_LIBLOAD ) ) )
181183LDLIBS := $(subst $(comma )$(space ) optional,$(space ) optional,$(LDLIBS ) )
184+ LDLIBRARYFLAGS := -i $(call QUOTE_ARG,library $(LDLIBS ) )
185+ endif
182186
183187# check if there is an icon present that to convert
184188ifneq ($(ICONIMG ) ,)
@@ -269,7 +273,7 @@ FASMGFLAGS = \
269273 -i $(call QUOTE_ARG,locate .header at $$$(INIT_LOC ) ) \
270274 $(LDMAPFLAG ) \
271275 -i $(call QUOTE_ARG,source $(LDICON )$(call FASMG_FILES,$(LDFILES ) ) ) \
272- -i $( call QUOTE_ARG,library $( LDLIBS ) ) \
276+ $( LDLIBRARYFLAGS ) \
273277 $(EXTRA_LDFLAGS )
274278
275279.PHONY : all clean version gfx debug
0 commit comments