|
0 |
diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/build.xml java3d-1.5.2+dfsg.new/j3d-core/build.xml
|
|
1 |
--- java3d-1.5.2+dfsg/j3d-core/build.xml 2008-05-24 02:01:19.000000000 +0530
|
|
2 |
+++ java3d-1.5.2+dfsg.new/j3d-core/build.xml 2009-08-13 15:01:06.000000000 +0530
|
|
3 |
@@ -196,6 +196,15 @@
|
|
4 |
<property name="install.bin" value="lib/ppc"/>
|
|
5 |
</target>
|
|
6 |
|
|
7 |
+ <target name="setupLinuxGeneric" if="isLinuxGeneric">
|
|
8 |
+ <property name="isUnix" value="true"/>
|
|
9 |
+ <property name="shell" value="/bin/sh"/>
|
|
10 |
+ <property name="wstype" value="x11"/>
|
|
11 |
+ <property name="platformname" value="linux-generic"/>
|
|
12 |
+ <property name="platform" value="linux-generic"/>
|
|
13 |
+ <property name="install.bin" value="lib/${os.arch}"/>
|
|
14 |
+ </target>
|
|
15 |
+
|
|
16 |
<!-- win32 should be rename as windows -->
|
|
17 |
<target name="setupWindows" if="isWindowsOnX86">
|
|
18 |
<property name="isWindows" value="true"/>
|
|
19 |
@@ -232,7 +241,7 @@
|
|
20 |
</target>
|
|
21 |
|
|
22 |
<target name="setupPlatform"
|
|
23 |
- depends="init, setupBuildType, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl">
|
|
24 |
+ depends="init, setupBuildType, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupLinuxGeneric, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl">
|
|
25 |
<property name="build-debug-gen" location="${build}/${platform}/debug/gen"/>
|
|
26 |
<property name="build-opt-gen" location="${build}/${platform}/opt/gen"/>
|
|
27 |
<property name="docname" value="${build.relprefix}-${version_file}-doc"/>
|
|
28 |
@@ -382,6 +391,10 @@
|
|
29 |
<os name="linux" arch="ppc"/>
|
|
30 |
</condition>
|
|
31 |
|
|
32 |
+ <condition property="isLinuxGeneric">
|
|
33 |
+ <os name="linux"/>
|
|
34 |
+ </condition>
|
|
35 |
+
|
|
36 |
<condition property="isSolarisOnSparc">
|
|
37 |
<os name="SunOS" arch="sparc"/>
|
|
38 |
</condition>
|
|
39 |
diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml
|
|
40 |
--- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 1970-01-01 05:30:00.000000000 +0530
|
|
41 |
+++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml 2009-08-13 15:00:17.000000000 +0530
|
|
42 |
@@ -0,0 +1,74 @@
|
|
43 |
+<?xml version="1.0"?>
|
|
44 |
+
|
|
45 |
+<!-- Ant file for building native ogl renderer files for Linux/x86 -->
|
|
46 |
+<project name="j3d-core native" default="compile">
|
|
47 |
+
|
|
48 |
+ <target name="init" depends="init-cg,init-nocg">
|
|
49 |
+ <!-- Create the build directories for linux -->
|
|
50 |
+ <mkdir dir="${build}/${platform}/${bldType}/native/ogl/objs"/>
|
|
51 |
+ <mkdir dir="${build}/${platform}/${bldType}/lib/${os.arch}"/>
|
|
52 |
+
|
|
53 |
+ <property name="oglsrc" location="${src}/native/ogl"/>
|
|
54 |
+ </target>
|
|
55 |
+
|
|
56 |
+ <target name="init-cg" if="build.cg">
|
|
57 |
+ <property name="cflags.cg" value="-DCOMPILE_CG_SHADERS=1"/>
|
|
58 |
+ </target>
|
|
59 |
+
|
|
60 |
+ <target name="init-nocg" unless="build.cg">
|
|
61 |
+ <property name="cflags.cg" value=""/>
|
|
62 |
+ </target>
|
|
63 |
+
|
|
64 |
+ <target name="compile-ogl">
|
|
65 |
+ <echo message="Executing native renderer build [${bldType}]"/>
|
|
66 |
+
|
|
67 |
+ <!-- Compile the c source files-->
|
|
68 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
|
|
69 |
+ <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
|
|
70 |
+ </exec>
|
|
71 |
+
|
|
72 |
+ <!-- Create the library file-->
|
|
73 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
|
|
74 |
+ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
|
|
75 |
+ </exec>
|
|
76 |
+
|
|
77 |
+ </target>
|
|
78 |
+
|
|
79 |
+ <target name="compile-ogl-cg" if="build.cg">
|
|
80 |
+ <!-- Compile the wrapper -->
|
|
81 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
|
|
82 |
+ <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
|
|
83 |
+ </exec>
|
|
84 |
+
|
|
85 |
+ <!-- Create the wrapper library -->
|
|
86 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
|
|
87 |
+ <arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
|
|
88 |
+ </exec>
|
|
89 |
+
|
|
90 |
+ </target>
|
|
91 |
+
|
|
92 |
+ <target name="compile" depends="init,compile-ogl,compile-ogl-cg">
|
|
93 |
+
|
|
94 |
+ <!-- Copy the library file -->
|
|
95 |
+ <copy todir="${build}/${platform}/${bldType}/lib/${os.arch}">
|
|
96 |
+ <fileset dir="${build}/${platform}/${bldType}/native/ogl/objs"
|
|
97 |
+ includes="libj3dcore-ogl*.so"
|
|
98 |
+ />
|
|
99 |
+ </copy>
|
|
100 |
+
|
|
101 |
+ </target>
|
|
102 |
+
|
|
103 |
+ <target name="dist">
|
|
104 |
+ <!-- Create the distribution directory -->
|
|
105 |
+ <mkdir dir="${dist}/${platform}/lib/${os.arch}"/>
|
|
106 |
+
|
|
107 |
+ <!-- Copy the library files -->
|
|
108 |
+ <copy todir="${dist}/${platform}/lib/${os.arch}">
|
|
109 |
+ <fileset dir="${build}/${platform}/opt/lib/${os.arch}"
|
|
110 |
+ includes="libj3dcore-ogl*.so"
|
|
111 |
+ />
|
|
112 |
+ </copy>
|
|
113 |
+
|
|
114 |
+ </target>
|
|
115 |
+
|
|
116 |
+</project>
|