From c5e868ec6b2d115d323536d5f183e319568c76d2 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 29 Jun 2019 00:27:03 +0000
Subject: [PATCH] base64.* was moved to src/encode
---
src/syncterm/GNUmakefile | 6 +++---
src/syncterm/objects.mk | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/syncterm/GNUmakefile b/src/syncterm/GNUmakefile
index 95d9ea92e6..a5042e233a 100644
--- a/src/syncterm/GNUmakefile
+++ b/src/syncterm/GNUmakefile
@@ -59,8 +59,8 @@ else
endif
CFLAGS += -DSYSTEM_LIST_DIR=\"${SYSTEM_LIST_DIR}\"
-CFLAGS += $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(SMBLIB_CFLAGS) -I../sbbs3 -I../smblib -I../comio
-LDFLAGS += $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(CRYPT_LDFLAGS)
+CFLAGS += $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS) -I../sbbs3 -I../smblib -I../comio
+LDFLAGS += $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(ENCODE_LDFLAGS) $(CRYPT_LDFLAGS)
vpath %.c ../sbbs3 ../smblib ../uifc ../comio
@@ -101,7 +101,7 @@ $(MTOBJODIR)$(DIRSEP)ciolib_res$(OFILE):
$(SYNCTERM): $(CRYPT_DEPS) $(EXEODIR) $(OBJS) $(BUILD_DEPENDS)
@echo Linking $@
- ${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(EXTRA_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
+ ${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(EXTRA_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) $(ENCODE_LIBS)
ifeq ($(os),darwin)
-${QUIET}mkdir $(EXEODIR)/SyncTERM.app
-${QUIET}mkdir $(EXEODIR)/SyncTERM.app/Contents
diff --git a/src/syncterm/objects.mk b/src/syncterm/objects.mk
index c8b90c0de8..c072164bb5 100644
--- a/src/syncterm/objects.mk
+++ b/src/syncterm/objects.mk
@@ -16,7 +16,6 @@ OBJS = \
$(MTOBJODIR)$(DIRSEP)zmodem$(OFILE) \
$(MTOBJODIR)$(DIRSEP)xmodem$(OFILE) \
$(MTOBJODIR)$(DIRSEP)md5$(OFILE) \
- $(MTOBJODIR)$(DIRSEP)base64$(OFILE) \
$(MTOBJODIR)$(DIRSEP)st_crypt$(OFILE) \
$(MTOBJODIR)$(DIRSEP)syncterm$(OFILE)
--
GitLab