From 4a53b753b875fd62814719c0b8719910ba631dac Mon Sep 17 00:00:00 2001 From: Garux Date: Thu, 13 May 2021 20:42:14 +0300 Subject: [PATCH] make libassimp_.$(DLL) order-only prerequisite to avoid it in the $^ list = fix linking in linux --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81398ca3..95384864 100644 --- a/Makefile +++ b/Makefile @@ -585,8 +585,8 @@ $(INSTALLDIR)/q3map2.$(EXE): \ libddslib.$(A) \ libfilematch.$(A) \ libl_net.$(A) \ - $(INSTALLDIR)/libassimp_.$(DLL) \ $(if $(findstring Win32,$(OS)),icons/q3map2.o,) \ + | $(INSTALLDIR)/libassimp_.$(DLL) \ libmathlib.$(A): CPPFLAGS_EXTRA := -Ilibs libmathlib.$(A): \ @@ -1083,7 +1083,7 @@ $(INSTALLDIR)/modules/assmodel.$(DLL): \ plugins/assmodel/mdlimage.o \ plugins/assmodel/model.o \ plugins/assmodel/plugin.o \ - $(INSTALLDIR)/libassimp_.$(DLL) \ + | $(INSTALLDIR)/libassimp_.$(DLL) \ $(INSTALLDIR)/modules/shaders.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(INSTALLDIR)/modules/shaders.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude