Skip to content
Snippets Groups Projects
Commit fb6ca379 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Fix textgen build (when SBBS_OFFICIAL is defined)

This build rule needed to be defined *after* objects.mk and rules.mk are
included.
parent 5fcd0c56
No related branches found
No related tags found
No related merge requests found
Pipeline #7006 passed
......@@ -330,3 +330,13 @@ $(UPGRADE_TO_V320): $(UPGRADE_TO_V320_OBJS) $(OBJODIR) | $(EXEODIR)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UPGRADE_TO_V320_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
ifdef SBBS_OFFICIAL
ifdef SBBSCTRL
$(EXEODIR)/textgen: $(TEXTGEN_OBJS)
@echo Linking $@
$(QUIET)$(CC) -o $@ $(TEXTGEN_OBJS) $(XPDEV_LIB) $(ENCODE_LIB) -lm
text.h: $(SBBSCTRL)/text.dat $(EXEODIR)/textgen
$(EXEODIR)/textgen
endif
endif
......@@ -142,16 +142,6 @@ symlinks: all
ln -sf `realpath */$(EXEODIR)/*` $(SBBSEXEC)
endif
ifdef SBBS_OFFICIAL
ifdef SBBSCTRL
$(EXEODIR)/textgen: $(TEXTGEN_OBJS)
$(CC) -o $@ $(TEXTGEN_OBJS) $(XPDEV_LIB) $(ENCODE_LIB) -lm
text.h: $(SBBSCTRL)/text.dat $(EXEODIR)/textgen
$(EXEODIR)/textgen
endif
endif
.PHONY: FORCE
FORCE:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment