qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-23 10:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Check qfo target matches compile target

Browse source 
Linking mixed target VMs is unlikely to end well.
This commit is contained in:
Bill Currie 2022-01-27 11:42:23 +09:00
parent 0123e12304
commit 4b4cb60c65
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/qfcc/source/obj_file.c
View file

@ -573,6 +573,13 @@ qfo_read (QFile *file)
free (data);
return 0;
}
// qfprogs leaves progsversion as 0
if (options.code.progsversion
&& header->progs_version != options.code.progsversion) {
fprintf (stderr, "qfo file target VM does not match current target\n");
free (data);
return 0;
}
qfo = calloc (1, sizeof (qfo_t));
qfo->num_spaces = LittleLong (header->num_spaces);

2
tools/qfcc/test/Makemodule.am
View file

@ -169,7 +169,7 @@ tools_qfcc_test_chewed_return_dat_SOURCES=tools/qfcc/test/chewed-return.r
chewed_return_obj=$(tools_qfcc_test_chewed_return_dat_SOURCES:.r=.o)
chewed_return_dep=$(call qcautodep,$(tools_qfcc_test_chewed_return_dat_SOURCES))
tools/qfcc/test/chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
$(V_QFCCLD)$(QLINK) -o $@ $(chewed_return_obj)
$(V_QFCCLD)$(QLINK) -Ctarget=v6 -o $@ $(chewed_return_obj)
tools/qfcc/test/chewed-return.run: $(qfcc_test_run_deps)
@TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@
include $(chewed_return_dep) # am--include-marker