Skip to content
Snippets Groups Projects
Commit 28c334b3 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Fix WITHOUT_CRYPTLIB build

parent 9013f866
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
SRC_ROOT := .. SRC_ROOT := ..
include ${SRC_ROOT}/build/Common.gmake include ${SRC_ROOT}/build/Common.gmake
include extdeps.mk
ifdef NEED_BITMAP ifdef NEED_BITMAP
OBJS += $(CIOLIB_INTERPOLATE_OBJS) OBJS += $(CIOLIB_INTERPOLATE_OBJS)
...@@ -25,6 +24,7 @@ ifdef WITHOUT_CRYPTLIB ...@@ -25,6 +24,7 @@ ifdef WITHOUT_CRYPTLIB
CFLAGS += -DWITHOUT_CRYPTLIB CFLAGS += -DWITHOUT_CRYPTLIB
CRYPT_LDFLAGS := CRYPT_LDFLAGS :=
CRYPT_DEPS := CRYPT_DEPS :=
CRYPT_LIBS :=
else else
OBJS += $(MTOBJODIR)$(DIRSEP)ssh$(OFILE) OBJS += $(MTOBJODIR)$(DIRSEP)ssh$(OFILE)
OBJS += $(MTOBJODIR)$(DIRSEP)telnets$(OFILE) OBJS += $(MTOBJODIR)$(DIRSEP)telnets$(OFILE)
...@@ -32,8 +32,15 @@ else ...@@ -32,8 +32,15 @@ else
CRYPT_LDFLAGS += $(SFTP-MT_LDFLAGS) CRYPT_LDFLAGS += $(SFTP-MT_LDFLAGS)
EXTRA_LIBS += $(CRYPT_LIBS) $(SFTP-MT_LIBS) EXTRA_LIBS += $(CRYPT_LIBS) $(SFTP-MT_LIBS)
STATIC_CRYPTLIB := true STATIC_CRYPTLIB := true
CRYPT_LIBS += $(CRYPT_LIB)
endif endif
$(MTOBJODIR)$(DIRSEP)conn$(OFILE): $(CRYPT_LIBS)
$(MTOBJODIR)$(DIRSEP)ssh$(OFILE): $(CRYPT_LIBS)
$(MTOBJODIR)$(DIRSEP)syncterm$(OFILE): $(CRYPT_LIBS) $(CIOLIB-MT)
$(MTOBJODIR)$(DIRSEP)telnets$(OFILE): $(CRYPT_LIBS)
$(CIOLIB_INTERPOLATE_OBJS): $(CIOLIB-MT_BUILD)
ifeq ($(os),darwin) ifeq ($(os),darwin)
OBJS += $(MTOBJODIR)$(DIRSEP)DarwinWrappers$(OFILE) OBJS += $(MTOBJODIR)$(DIRSEP)DarwinWrappers$(OFILE)
EXTRA_LIBS += -framework Foundation EXTRA_LIBS += -framework Foundation
......
$(MTOBJODIR)$(DIRSEP)conn$(OFILE): $(CRYPT_LIB)
$(MTOBJODIR)$(DIRSEP)ssh$(OFILE): $(CRYPT_LIB)
$(MTOBJODIR)$(DIRSEP)syncterm$(OFILE): $(CRYPT_LIB) $(CIOLIB-MT)
$(MTOBJODIR)$(DIRSEP)telnets$(OFILE): $(CRYPT_LIB)
$(CIOLIB_INTERPOLATE_OBJS): $(CIOLIB-MT_BUILD)
...@@ -72,14 +72,16 @@ enum { ...@@ -72,14 +72,16 @@ enum {
#include "bbslist.h" #include "bbslist.h"
#include "conn.h" #include "conn.h"
#ifndef WITHOUT_CRYPTLIB
#include "cryptlib.h" #include "cryptlib.h"
#include "ssh.h"
#endif
#include "fonts.h" #include "fonts.h"
#include "scale.h" #include "scale.h"
#include "syncterm.h" #include "syncterm.h"
#include "term.h" #include "term.h"
#include "uifcinit.h" #include "uifcinit.h"
#include "window.h" #include "window.h"
#include "ssh.h"
char *syncterm_version = "SyncTERM 1.2b" char *syncterm_version = "SyncTERM 1.2b"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment