Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

APPS-6162: Fix linker flags for darwin OS #89

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pjsip-apps/src/swig/csharp/Makefile
Original file line number Diff line number Diff line change
@@ -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

8 changes: 7 additions & 1 deletion pjsip-apps/src/swig/java/Makefile
Original file line number Diff line number Diff line change
@@ -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))