Changeset 4670 for pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/Makefile

Timestamp:

Dec 4, 2013 2:38:20 AM (10 years ago)

Author:

nanang

Message:

Misc update & fix:

• added new files (call & media) to VS2005 project
• fixed compile warnings
• fixed compile error when video is disabled
• fixed Makefile when JAVA_HOME env var is set

File:

• pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/Makefile (modified) (1 diff)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/Makefile

@@ -27 +27 @@
   JAVA_BIN := $(dir $(JAVAC_PATH))
   JAVA_HOME := $(patsubst %/bin/,%,$(JAVA_BIN))
+else
+  ifeq (exists, $(shell test -d $(JAVA_HOME)/bin && echo exists ))
+    JAVA_BIN := $(JAVA_HOME)/bin
+  else
+    JAVA_BIN := $(JAVA_HOME)
+  endif
+  #$(error $(JAVA_BIN))
 endif