SPARK-1692 Native Jitsi libraries not loading on Mac OSX

build/build.xml

@@ -722,6 +722,7 @@
 		<path id="osx.lib">
 			<fileset dir="${target.build}/lib">
 				<include name="**/*.jar"/>
+				<include name="**/*.jnilib"/>
 				<exclude name="**/windows/"/>
 				<exclude name="**/linux/"/>
 			</fileset>
@@ -748,6 +749,7 @@
 					jrepreferred="true">
 			<arch name="x86_64"/>
 			<arch name="i386"/>
+			<option value="-Djava.library.path=$APP_ROOT/Contents/Java/"/>
 			<option value="-Xdock:name=Spark"/>
 
 		</appbundler>
@@ -762,11 +764,6 @@
 			</fileset>
 		</copy>
 
-		<!-- When building on PowerPC Macs we get a PowerPC binary for the JavaApplicationStub. We've gotten a few requests to fix that from the forums, so we'll manually copy one from an Intel Mac -->
-		<copy todir="${mac.app.file}/Contents/MacOS">
-			<fileset file="${basedir}/src/resources/JavaApplicationStub"/>
-		</copy>
-
 		<delete file="${plugins}/jniwrapper.jar"/>
 	</target>
 

src/resources/startup.sh

@@ -10,6 +10,15 @@ ${libdir}/jdom.jar:\
 ${libdir}/log4j.jar:\
 ${libdir}/lti-civil.jar:\
 ${libdir}/fmj.jar:\
+${libdir}/jspeex.jar:\
+${libdir}/libjitsi.jar:\
+${libdir}/zrtp4j-light.jar:\
+${libdir}/jna.jar:\
+${libdir}/bcpkix.jar:\
+${libdir}/bcprov.jar:\
+${libdir}/bccontrib.jar:\
+${libdir}/ice4j.jar:\
+${libdir}/osgi.core.jar:\
 ${libdir}/startup.jar:\
 ${libdir}/linux/jdic.jar:\
 ${wd}/resources\