quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make libassimp_.$(DLL) order-only prerequisite to avoid it in the $^ list = fix linking in linux

Browse Source
This commit is contained in:
Garux 2021-05-13 20:42:14 +03:00
parent 31e7829e2b
commit 4a53b753b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -585,8 +585,8 @@ $(INSTALLDIR)/q3map2.$(EXE): \
libddslib.$(A) \ libddslib.$(A) \
libfilematch.$(A) \ libfilematch.$(A) \
libl_net.$(A) \ libl_net.$(A) \
$(INSTALLDIR)/libassimp_.$(DLL) \
$(if $(findstring Win32,$(OS)),icons/q3map2.o,) \ $(if $(findstring Win32,$(OS)),icons/q3map2.o,) \
| $(INSTALLDIR)/libassimp_.$(DLL) \
libmathlib.$(A): CPPFLAGS_EXTRA := -Ilibs libmathlib.$(A): CPPFLAGS_EXTRA := -Ilibs
libmathlib.$(A): \ libmathlib.$(A): \
@ -1083,7 +1083,7 @@ $(INSTALLDIR)/modules/assmodel.$(DLL): \
plugins/assmodel/mdlimage.o \ plugins/assmodel/mdlimage.o \
plugins/assmodel/model.o \ plugins/assmodel/model.o \
plugins/assmodel/plugin.o \ plugins/assmodel/plugin.o \
$(INSTALLDIR)/libassimp_.$(DLL) \ | $(INSTALLDIR)/libassimp_.$(DLL) \
$(INSTALLDIR)/modules/shaders.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(INSTALLDIR)/modules/shaders.$(DLL): LIBS_EXTRA := $(LIBS_GLIB)
$(INSTALLDIR)/modules/shaders.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude $(INSTALLDIR)/modules/shaders.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) -Ilibs -Iinclude