Commit 00e9592f authored by rswindell's avatar rswindell
Browse files

base64.* and lzh.* have been moved to src/encode.

You will need to perform a clean rebuild.
parent e5daa603
......@@ -2,7 +2,7 @@ SRC_ROOT = ..
# Cross platform/compiler definitions
include $(SRC_ROOT)/build/Common.gmake # defines clean and output directory rules
CFLAGS += $(XPDEV-MT_CFLAGS) $(SMBLIB_CFLAGS) $(CIOLIB-MT_CFLAGS)
CFLAGS += $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS) $(CIOLIB-MT_CFLAGS)
ifeq ($(os),win32)
OBJS += $(MTOBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
......
......@@ -7,7 +7,7 @@ SRC_ROOT = ..
# Cross platform/compiler definitions
include $(SRC_ROOT)/build/Common.gmake # defines clean and output directory rules
CFLAGS += -I$(ENCODE_SRC)
CFLAGS += -I$(ENCODE_SRC) $(XPDEV_CFLAGS)
# ENCODE Library Link Rule
$(ENCODE_BUILD): $(OBJODIR) $(OBJS)
......
......@@ -8,6 +8,8 @@
OBJS = $(OBJODIR)$(DIRSEP)cp437_utf8_tbl$(OFILE) \
$(OBJODIR)$(DIRSEP)uucode$(OFILE) \
$(OBJODIR)$(DIRSEP)yenc$(OFILE)
$(OBJODIR)$(DIRSEP)yenc$(OFILE) \
$(OBJODIR)$(DIRSEP)lzh$(OFILE) \
$(OBJODIR)$(DIRSEP)base64$(OFILE)
......@@ -166,22 +166,22 @@ $(NODE): $(NODE_OBJS)
# FIXSMB Utility
$(FIXSMB): $(FIXSMB_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FIXSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FIXSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS)
# CHKSMB Utility
$(CHKSMB): $(CHKSMB_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(CHKSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(CHKSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS)
# SMB Utility
$(SMBUTIL): $(SMBUTIL_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBUTIL_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBUTIL_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS)
# SBBSecho (FidoNet Packet Tosser)
$(SBBSECHO): $(SBBSECHO_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SBBSECHO_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SBBSECHO_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS)
# SBBSecho Configuration Program
$(ECHOCFG): $(ECHOCFG_OBJS)
......@@ -191,7 +191,7 @@ $(ECHOCFG): $(ECHOCFG_OBJS)
# ADDFILES
$(ADDFILES): $(ADDFILES_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(ADDFILES_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(ADDFILES_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS)
# FILELIST
$(FILELIST): $(FILELIST_OBJS)
......@@ -201,7 +201,7 @@ $(FILELIST): $(FILELIST_OBJS)
# MAKEUSER
$(MAKEUSER): $(MAKEUSER_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(MAKEUSER_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(MAKEUSER_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS)
# JSDOOR
$(JSDOOR): $(JSDOOR_OBJS) $(SBBS)
......@@ -231,7 +231,7 @@ $(SEXYZ): $(SEXYZ_OBJS)
# QWKNODES
$(QWKNODES): $(QWKNODES_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS)
# SLOG
$(SLOG): $(SLOG_OBJS)
......@@ -256,7 +256,7 @@ $(DUPEFIND): $(DUPEFIND_OBJS)
# SMBACTIV
$(SMBACTIV): $(SMBACTIV_OBJS)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBACTIV_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBACTIV_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS)
# DSTSEDIT
$(DSTSEDIT): $(DSTSEDIT_OBJS)
......
SRC_ROOT ?= ../..
include ${SRC_ROOT}/build/Common.gmake
CFLAGS += -DSCFG -I.. -I../../comio $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS)
LDFLAGS += $(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS)
CFLAGS += -DSCFG -I.. -I../../comio $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS)
LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS)
vpath %.c ..
$(SCFG): $(OBJS)
@echo Linking $@
${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) -o$@ $(OBJS) $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) -o$@ $(OBJS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
......@@ -2,7 +2,7 @@
#########################################################################
# Makefile for Synchronet Message Base Library (SMBLIB) #
# For use with Borland C++ Builder 5+ or Borland C++ 5.5 for Win32 #
# GNU make #
# @format.tab-size 4 #
# #
# usage: make #
......@@ -17,7 +17,7 @@ SRC_ROOT = ..
# Cross platform/compiler definitions
include $(SRC_ROOT)/build/Common.gmake # defines clean and output directory rules
CFLAGS += -I$(XPDEV_SRC)
CFLAGS += -I$(XPDEV_SRC) $(ENCODE_CFLAGS)
# SMBLIB Library Link Rule
......
......@@ -16,9 +16,7 @@ OBJS = $(OBJODIR)$(DIRSEP)smbadd$(OFILE)\
$(OBJODIR)$(DIRSEP)smbtxt$(OFILE)\
$(OBJODIR)$(DIRSEP)crc16$(OFILE)\
$(OBJODIR)$(DIRSEP)crc32$(OFILE)\
$(OBJODIR)$(DIRSEP)base64$(OFILE)\
$(OBJODIR)$(DIRSEP)md5$(OFILE)\
$(OBJODIR)$(DIRSEP)lzh$(OFILE)
MTOBJS = $(MTOBJODIR)$(DIRSEP)smbadd$(OFILE)\
$(MTOBJODIR)$(DIRSEP)smballoc$(OFILE)\
......@@ -30,6 +28,4 @@ MTOBJS = $(MTOBJODIR)$(DIRSEP)smbadd$(OFILE)\
$(MTOBJODIR)$(DIRSEP)smbtxt$(OFILE)\
$(MTOBJODIR)$(DIRSEP)crc16$(OFILE)\
$(MTOBJODIR)$(DIRSEP)crc32$(OFILE)\
$(MTOBJODIR)$(DIRSEP)base64$(OFILE)\
$(MTOBJODIR)$(DIRSEP)md5$(OFILE)\
$(MTOBJODIR)$(DIRSEP)lzh$(OFILE)
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