diff options
Diffstat (limited to 'src/native/build.xml')
| -rw-r--r-- | src/native/build.xml | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/src/native/build.xml b/src/native/build.xml index 3fe7794..8cdbc58 100644 --- a/src/native/build.xml +++ b/src/native/build.xml @@ -1,4 +1,4 @@ -<project name="jitsi-native" default="help-native"> +<project name="jitsi-native" default="help-native" xmlns:if="ant:if"> <import file="../../build.xml"/> <!-- additionnal property --> @@ -533,34 +533,6 @@ </cc> </target> - <target name="unbound" - description="Build libjunbound" - depends="init-native"> - - <cc outtype="shared" - name="g++" - outfile="${native_install_dir}/junbound" - objdir="${obj}"> - <!-- common compiler flags --> - <compilerarg value="-Wall" /> - <compilerarg value="-Wreturn-type" /> - <compilerarg value="-fPIC"/> - <compilerarg value="-D_JNI_IMPLEMENTATION_" /> - - <compilerarg value="-I${system.JAVA_HOME}/include" - if="is.running.linux" /> - <compilerarg value="-I${system.JAVA_HOME}/include/linux" - if="is.running.linux" /> - - <linkerarg value="-Wl,-z,relro" if="is.running.debian"/> - <linkerarg value="-shared"/> - <linkerarg value="-lunbound" if="is.running.linux"/> - - <fileset dir="${src}/native/libjunbound/src" - includes="*.cpp"/> - </cc> - </target> - <!-- Cleanup object files and shared libraries --> <target name="clean-native" description="Clean all object files and libraries."> <delete failonerror="false" includeemptydirs="true"> @@ -592,6 +564,9 @@ can directly use command prompt When changing idl file in visual studio console execute midl <idl file>. + + Microsoft MAPI headers won't compile with gcc. See: + http://lists.jitsi.org/pipermail/dev/2013-April/001313.html --> <target name="msoutlookaddrbook" @@ -641,7 +616,7 @@ http://www.microsoft.com/en-us/download/details.aspx?id=10176 - compile the tlb: cd src/native/windows/msofficecomm - midl "C:\Program Files (x86)\Microsoft Office Communicator\SDK\" + midl "C:\Program Files (x86)\Microsoft Office Communicator\SDK\msgrua.idl" - run ant: ant msofficecomm -DOCS2007SDK=<path here, escape \ with \\> -Darch=32 ant msofficecomm -DOCS2007SDK=<path here, escape \ with \\> -Darch=64 @@ -652,6 +627,15 @@ if="is.running.windows" depends="init-native"> <fail message="OCS 2007 SDK not set!" unless="OCS2007SDK" /> + <exec executable="windres"> + <arg value="-i"/> + <arg value="${src}\native\windows\msofficecomm\Resources.rc"/> + <arg value="-o"/> + <arg value="${obj}\jmsofficecommtlb.o"/> + <arg value="-F"/> + <arg value="pe-i386" if:set="cross_32"/> + <arg value="pe-x86-64" if:set="cross_64"/> + </exec> <cc name="gcc" objdir="${obj}" @@ -679,6 +663,7 @@ <libset libs="advapi32, uuid, ole32, oleaut32, msi, stdc++" /> <fileset dir="${src}\native\windows\msofficecomm" includes="*.cxx" /> + <fileset dir="${obj}" includes="jmsofficecommtlb.o"/> </cc> <exec executable="strip"> <arg value="-x"/> |