Commit 80186d58 authored by deuce's avatar deuce
Browse files

Update for new 3rd party location.

You will need to do a clean build before building actoss this change.
parent 136ff539
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
# # # #
# Common Build Macros REQUIRED: # # Common Build Macros REQUIRED: #
# SRC_ROOT - *MUST* be set to the src dir # # SRC_ROOT - *MUST* be set to the src dir #
# 3RDP_ROOT - If not set, defaults to $(SRC_ROOT)/../3rdp #
# # # #
# Common Build Macros Used: # # Common Build Macros Used: #
# DEBUG - Create a debug build # # DEBUG - Create a debug build #
...@@ -360,7 +361,8 @@ XPDEV_SRC := $(SRC_ROOT)$(DIRSEP)xpdev ...@@ -360,7 +361,8 @@ XPDEV_SRC := $(SRC_ROOT)$(DIRSEP)xpdev
CIOLIB_SRC := $(SRC_ROOT)$(DIRSEP)conio CIOLIB_SRC := $(SRC_ROOT)$(DIRSEP)conio
SMBLIB_SRC := $(SRC_ROOT)$(DIRSEP)smblib SMBLIB_SRC := $(SRC_ROOT)$(DIRSEP)smblib
UIFC_SRC := $(SRC_ROOT)$(DIRSEP)uifc UIFC_SRC := $(SRC_ROOT)$(DIRSEP)uifc
JS_SRC := $(SRC_ROOT)$(DIRSEP)js 3RDP_ROOT ?= $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)3rdp
3RDP_BUILD := $(3RDP_ROOT)$(DIRSEP)build
# SDL ciolib enabled by default for the moment. # SDL ciolib enabled by default for the moment.
ifndef WITHOUT_SDL ifndef WITHOUT_SDL
...@@ -378,8 +380,8 @@ endif ...@@ -378,8 +380,8 @@ endif
-include $(CIOLIB_SRC)$(DIRSEP)Common.gmake -include $(CIOLIB_SRC)$(DIRSEP)Common.gmake
-include $(UIFC_SRC)$(DIRSEP)Common.make -include $(UIFC_SRC)$(DIRSEP)Common.make
-include $(UIFC_SRC)$(DIRSEP)Common.gmake -include $(UIFC_SRC)$(DIRSEP)Common.gmake
-include $(JS_SRC)$(DIRSEP)Common.make -include $(3RDP_BUILD)$(DIRSEP)Common.make
-include $(JS_SRC)$(DIRSEP)Common.gmake -include $(3RDP_BUILD)$(DIRSEP)Common.gmake
ifdef DEBUG ifdef DEBUG
CFLAGS += -ggdb CFLAGS += -ggdb
...@@ -459,4 +461,8 @@ uifc-mt: ...@@ -459,4 +461,8 @@ uifc-mt:
$(JS_LIB): $(JS_DEPS) $(JS_LIB): $(JS_DEPS)
js: js:
$(MAKE) -C $(JS_SRC) lib $(MAKE) -C $(3RDPBUILDDIR) jslib
$(CRYPT_LIB): $(CRYPT_DEPS)
cl:
$(MAKE) -C $(3RDPBUILDDIR) cryptlib
...@@ -16,6 +16,7 @@ $(LIBODIR): ...@@ -16,6 +16,7 @@ $(LIBODIR):
$(EXEODIR): $(EXEODIR):
$(QUIET)$(IFNOTEXIST) mkdir $(EXEODIR) $(QUIET)$(IFNOTEXIST) mkdir $(EXEODIR)
clean:
clean: clean:
@echo Deleting $(OBJODIR)$(DIRSEP) @echo Deleting $(OBJODIR)$(DIRSEP)
-$(QUIET)$(DELETE) $(OBJODIR)$(DIRSEP)* -$(QUIET)$(DELETE) $(OBJODIR)$(DIRSEP)*
......
...@@ -3,37 +3,11 @@ ...@@ -3,37 +3,11 @@
# You really should set SBBS_SRC before calling this. # You really should set SBBS_SRC before calling this.
# #
# Available options: # Available options:
# NEED_JAVASCRIPT = Set flags for use with JS
SBBS_SRC ?= $(XPDEV)/../sbbs3 SBBS_SRC ?= $(XPDEV)/../sbbs3
CFLAGS += -I$(SBBS_SRC) CFLAGS += -I$(SBBS_SRC)
JS_CFLAGS += -DJAVASCRIPT JS_CFLAGS += -DJAVASCRIPT
ifdef JSINCLUDE
JS_CFLAGS += -I$(JSINCLUDE)
else
JS_CFLAGS += -I$(SBBS_SRC)/../../include/mozilla/js
endif
ifndef JSLIBDIR
JSLIBDIR := $(SBBS_SRC)/../../lib/mozilla/js/$(machine).$(BUILD)
endif
ifndef JSLIB
JSLIB := js
endif
ifndef NSPRDIR
NSPRDIR := $(SBBS_SRC)/../../lib/mozilla/nspr/$(machine).$(BUILD)
endif
JS_LDFLAGS += -L$(JSLIBDIR) -l$(JSLIB)
#The following is needed for nspr support on Linux
ifeq ($(os),linux)
JS_LDFLAGS += -ldl
endif
JS_LDFLAGS += -L$(NSPRDIR) -lnspr4
ifdef NEED_JAVASCRIPT
CFLAGS += $(JS_CFLAGS)
LDFLAGS += $(JS_LDFLAGS)
endif
vpath %.c $(SBBS_SRC) vpath %.c $(SBBS_SRC)
vpath %.cpp $(SBBS_SRC) vpath %.cpp $(SBBS_SRC)
......
...@@ -37,8 +37,6 @@ ifeq ($(os),qnx) ...@@ -37,8 +37,6 @@ ifeq ($(os),qnx)
LDFLAGS += -lsocket LDFLAGS += -lsocket
endif endif
SBBS_LIBS += -lcl
ifdef PREFIX ifdef PREFIX
CFLAGS += -DPREFIX=$(PREFIX) CFLAGS += -DPREFIX=$(PREFIX)
endif endif
...@@ -59,17 +57,6 @@ ifeq ($(os),linux) ...@@ -59,17 +57,6 @@ ifeq ($(os),linux)
endif endif
endif endif
ifdef CRYPTLIBINCLUDE
CFLAGS += -I$(CRYPTLIBINCLUDE)
else
CFLAGS += -I$(SRC_ROOT)/../include/cryptlib
endif
ifndef CRYPTLIBDIR
CRYPTLIBDIR := $(SRC_ROOT)/../lib/cryptlib/$(machine).release
endif
LDFLAGS += -L$(CRYPTLIBDIR)
include sbbsdefs.mk include sbbsdefs.mk
MT_CFLAGS += $(SBBSDEFS) MT_CFLAGS += $(SBBSDEFS)
...@@ -106,21 +93,21 @@ else ...@@ -106,21 +93,21 @@ else
endif endif
endif endif
CFLAGS += $(UIFC-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(SMBLIB_CFLAGS) $(CIOLIB-MT_CFLAGS) $(JS_CFLAGS) CFLAGS += $(UIFC-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(SMBLIB_CFLAGS) $(CIOLIB-MT_CFLAGS) $(JS_CFLAGS) $(CRYPT_CFLAGS)
CFLAGS += -I../comio CFLAGS += -I../comio
vpath %.c ../comio vpath %.c ../comio
OBJS += $(MTOBJODIR)$(DIRSEP)comio_nix$(OFILE) OBJS += $(MTOBJODIR)$(DIRSEP)comio_nix$(OFILE)
LDFLAGS += $(UIFC-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(SMBLIB_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(JS_LDFLAGS) LDFLAGS += $(UIFC-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(SMBLIB_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(JS_LDFLAGS) $(CRYPT_LDFLAGS)
# Monolithic Synchronet executable Build Rule # Monolithic Synchronet executable Build Rule
$(SBBSMONO): $(MONO_OBJS) $(OBJS) $(SBBSMONO): $(MONO_OBJS) $(OBJS)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CXX) -o $@ $(LDFLAGS) $(MT_LDFLAGS) $(MONO_OBJS) $(OBJS) $(SBBS_LIBS) $(SMBLIB_LIBS) $(XPDEV-MT_LIBS) $(JS_LIBS) $(QUIET)$(CXX) -o $@ $(LDFLAGS) $(MT_LDFLAGS) $(MONO_OBJS) $(OBJS) $(SBBS_LIBS) $(SMBLIB_LIBS) $(XPDEV-MT_LIBS) $(JS_LIBS) $(CRYPT_LIBS)
# Synchronet BBS library Link Rule # Synchronet BBS library Link Rule
$(SBBS): $(OBJS) $(LIBS) $(SBBS): $(OBJS) $(LIBS)
@echo Linking $@ @echo Linking $@
$(QUIET)$(MKSHPPLIB) $(LDFLAGS) -o $@ $(OBJS) $(SBBS_LIBS) $(LIBS) $(SHLIBOPTS) $(QUIET)$(MKSHPPLIB) $(LDFLAGS) -o $@ $(OBJS) $(SBBS_LIBS) $(LIBS) $(SHLIBOPTS) $(CRYPT_LIBS)
# FTP Server Link Rule # FTP Server Link Rule
$(FTPSRVR): $(MTOBJODIR)/ftpsrvr.o $(FTPSRVR): $(MTOBJODIR)/ftpsrvr.o
...@@ -153,7 +140,7 @@ $(BAJA): $(BAJA_OBJS) ...@@ -153,7 +140,7 @@ $(BAJA): $(BAJA_OBJS)
$(QUIET)$(CC) $(UTIL_LDFLAGS) -o $@ $(BAJA_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(QUIET)$(CC) $(UTIL_LDFLAGS) -o $@ $(BAJA_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS)
# UnBaja Utility # UnBaja Utility
$(UNBAJA): $(OBJODIR) $(EXEODIR) $(UNBAJA_OBJS) $(UNBAJA): $(UNBAJA_OBJS) | $(OBJODIR) $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(UTIL_LDFLAGS) -o $@ $(UNBAJA_OBJS) $(XPDEV_LIBS) $(UTIL_LIBS) $(QUIET)$(CC) $(UTIL_LDFLAGS) -o $@ $(UNBAJA_OBJS) $(XPDEV_LIBS) $(UTIL_LIBS)
......
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