- Timestamp:
- Nov 29, 2013 5:56:02 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/Makefile
r4639 r4663 1 1 include ../../../../build.mak 2 3 ifneq ($(findstring "$(TARGET_NAME)","darwin"),"") 4 OS=darwin 5 endif 2 6 3 7 OUT_DIR=output … … 5 9 LIBPJSUA2_SO=$(OUT_DIR)/pjsua2.dll 6 10 else 7 LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so 11 ifeq ($(OS),darwin) 12 LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.jnilib 13 else 14 LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so 15 endif 8 16 endif 9 17 … … 23 31 # OS specific 24 32 ifeq ($(OS),Windows_NT) 25 MY_JNI_LDFLAGS = -L$(MY_JDK)/lib -Wl,--kill-at26 MY_JNI_LIB = $(OUT_DIR)/pjsua2.dll33 MY_JNI_LDFLAGS = -L$(MY_JDK)/lib -Wl,--kill-at 34 MY_JNI_LIB = $(OUT_DIR)/pjsua2.dll 27 35 else 28 MY_JNI_LDFLAGS = -L$(MY_JDK)/lib -Wl,-soname,pjsua2.so 29 MY_JNI_LIB = $(OUT_DIR)/libpjsua2.so 30 MY_JNI_CFLAGS := -fPIC 36 MY_JNI_LDFLAGS = -L$(MY_JDK)/lib 37 ifneq ($(OS),darwin) 38 MY_JNI_LDFLAGS := $(MY_JNI_LDFLAGS) -Wl,-soname,pjsua2.so 39 endif 40 MY_JNI_LIB = $(OUT_DIR)/libpjsua2.so 41 MY_JNI_CFLAGS := -fPIC $(MY_JNI_CFLAGS) 31 42 endif 32 43 … … 34 45 MY_SWIG = swig 35 46 MY_JDK = $(JAVA_HOME) 36 MY_JAVA = $(MY_JDK)/bin/java 37 MY_JAVAC = $(MY_JDK)/bin/javac 47 ifneq ($(findstring $(JAVA_BIN), bin),) 48 MY_JAVA = $(MY_JDK)/bin/java 49 MY_JAVAC = $(MY_JDK)/bin/javac 50 else 51 MY_JAVA = $(MY_JDK)/java 52 MY_JAVAC = $(MY_JDK)/javac 53 endif 38 54 MY_JNI_CFLAGS := $(MY_JNI_CFLAGS) -I$(MY_JDK)/include -I$(MY_JDK)/include/win32 \ 39 55 -I$(MY_JDK)/include/linux -I.
Note: See TracChangeset
for help on using the changeset viewer.