Commit c2689c53 authored by deuce's avatar deuce
Browse files

Move the setting of LD_RUN_PATH into sbbs3/Common.gmake

parent 6eeebf8c
......@@ -14,6 +14,13 @@ SBBS_LDFLAGS += -L$(SBBS_SRC)/$(LIBODIR)
SBBSLIBS += -lsbbs
ifdef SBBSDIR
LD_RUN_PATH := $(SBBSDIR)/exec:$(SBBS_SRC)/$(LIBODIR)
else
LD_RUN_PATH := $(SBBS_SRC)/$(LIBODIR)
endif
export LD_RUN_PATH
$(SBBS):
$(MAKE) -C $(SBBS_SRC) $(LIBODIR)$(DIRSEP)$(LIBPREFIX)sbbs$(SOFILE)
......@@ -22,12 +22,6 @@ include ../Common.gmake
CFLAGS += $(SBBS_CFLAGS) $(SMBLIB_CFLAGS) $(XPDEV-MT_CFLAGS) `wx-config --unicode --cflags`
CXXFLAGS += $(CFLAGS)
LDFLAGS += `wx-config --unicode --libs` $(SMBLIB_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS) $(SBBS_LDFLAGS)
ifdef SBBSDIR
LD_RUN_PATH := $(SBBSDIR)/exec:$(SBBS_SRC)/$(LIBODIR)
else
LD_RUN_PATH := $(SBBS_SRC)/$(LIBODIR)
endif
export LD_RUN_PATH
$(USERLIST): $(SBBS) $(OBJS)
@echo Linking $@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment