qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 23:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qwaq] Link against build ruamoko libs, not installed

Browse source
This commit is contained in:
Bill Currie 2020-03-03 09:30:20 +09:00
parent ed04e6fc23
commit 50d39d64cb
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ruamoko/qwaq/Makefile.am
View file

@ -13,7 +13,9 @@ QFCC=$(top_builddir)/tools/qfcc/source/qfcc
QCFLAGS=-qq -O -g -Werror QCFLAGS=-qq -O -g -Werror
QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
SUFFIXES=.o .r SUFFIXES=.o .r
.r.o: .r.o:
@ -61,7 +63,7 @@ qwaq_app_dat_SOURCES=qwaq-app.r qwaq-screen.r qwaq-window.r qwaq-view.r
qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o) qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo)) qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP) qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
$(QFCC) $(QCFLAGS) -o $@ $(qwaq_app_obj) -lr $(QLINK) -o $@ $(qwaq_app_obj) -lr
include $(qwaq_app_dep) # am--include-marker include $(qwaq_app_dep) # am--include-marker
r_depfiles_remade += $(qwaq_app_dep) r_depfiles_remade += $(qwaq_app_dep)