diff --git a/pjsip-apps/src/swig/csharp/Makefile b/pjsip-apps/src/swig/csharp/Makefile index f4a5812ba5..df23866054 100644 --- a/pjsip-apps/src/swig/csharp/Makefile +++ b/pjsip-apps/src/swig/csharp/Makefile @@ -39,9 +39,15 @@ else LIBPJSUA2=$(LIBPJSUA2_DIR)/libpjsua2.a endif +ifeq ($(OS),darwin) + PJNAT64_LDLIBS=-Wl,-all_load $(PJNAT64_LDLIB) +else + PJNAT64_LDLIBS=-Wl,--whole-archive $(PJNAT64_LDLIB) -Wl,--no-whole-archive +endif + # Build settings MY_CFLAGS := $(PJ_CXXFLAGS) -I$(PJDIR)/pjnat64/include $(CFLAGS) -MY_LDFLAGS := $(PJ_LDXXFLAGS) -L$(PJDIR)/pjnat64/lib $(PJ_LDXXLIBS) -Wl,--whole-archive $(PJNAT64_LDLIB) -Wl,--no-whole-archive $(LDFLAGS) +MY_LDFLAGS := $(PJ_LDXXFLAGS) -L$(PJDIR)/pjnat64/lib $(PJ_LDXXLIBS) $(PJNAT64_LDLIBS) $(LDFLAGS) .PHONY: all install uninstall diff --git a/pjsip-apps/src/swig/java/Makefile b/pjsip-apps/src/swig/java/Makefile index 1885c4de3f..6a9c80d199 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/pjsip-apps/src/swig/java/Makefile @@ -154,9 +154,15 @@ else endif endif +ifeq ($(OS),darwin) + PJNAT64_LDLIBS=-Wl,-all_load $(PJNAT64_LDLIB) +else + PJNAT64_LDLIBS=-Wl,--whole-archive $(PJNAT64_LDLIB) -Wl,--no-whole-archive +endif + # Build settings MY_CFLAGS := $(PJ_CXXFLAGS) -I$(PJDIR)/pjnat64/include $(MY_JNI_CFLAGS) $(CFLAGS) -MY_LDFLAGS := $(PJ_LDXXFLAGS) -L$(PJDIR)/pjnat64/lib $(PJ_LDXXLIBS) -Wl,--whole-archive $(PJNAT64_LDLIB) -Wl,--no-whole-archive $(MY_JNI_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS) +MY_LDFLAGS := $(PJ_LDXXFLAGS) -L$(PJDIR)/pjnat64/lib $(PJ_LDXXLIBS) $(MY_JNI_LDXXLIBS) $(PJNAT64_LDLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS) MY_PACKAGE_NAME := org.pjsip.pjsua2 ifeq ($(OS),android) MY_PACKAGE_PATH := android/pjsua2/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME))