changed NetWare test makefile static link order
Этот коммит содержится в:
родитель
7c32c84d0e
Коммит
3fda91d725
@ -138,6 +138,13 @@ INCLUDES = -I.. -I../../include
|
|||||||
|
|
||||||
LDLIBS =
|
LDLIBS =
|
||||||
|
|
||||||
|
ifdef LINK_STATIC
|
||||||
|
LDLIBS += ../libssh2.$(LIBEXT)
|
||||||
|
else
|
||||||
|
IMPORTS += @../libssh2.imp
|
||||||
|
MODULES += libssh2.nlm
|
||||||
|
endif
|
||||||
|
|
||||||
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L) -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)/openssl
|
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L) -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)/openssl
|
||||||
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
|
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
|
||||||
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
|
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
|
||||||
@ -153,13 +160,6 @@ else
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef LINK_STATIC
|
|
||||||
LDLIBS += ../libssh2.$(LIBEXT)
|
|
||||||
else
|
|
||||||
IMPORTS += @../libssh2.imp
|
|
||||||
MODULES += libssh2.nlm
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(LIBARCH),LIBC)
|
ifeq ($(LIBARCH),LIBC)
|
||||||
INCLUDES += -I$(SDK_LIBC)/include
|
INCLUDES += -I$(SDK_LIBC)/include
|
||||||
# INCLUDES += -I$(SDK_LIBC)/include/nks
|
# INCLUDES += -I$(SDK_LIBC)/include/nks
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user