|
Lines 1-7
Link Here
|
| 1 |
diff -ruN ./j3d-core/build.xml ../java3d-1.5.2/j3d-core/build.xml |
1 |
diff -ruN ../java3d-1.5.2/j3d-core/build.xml ./j3d-core/build.xml |
| 2 |
--- ./j3d-core/build.xml 2008-05-24 08:31:19.000000000 +1200 |
2 |
--- ../java3d-1.5.2/j3d-core/build.xml 2008-05-24 08:31:19.000000000 +1200 |
| 3 |
+++ ../java3d-1.5.2/j3d-core/build.xml 2008-07-21 23:00:14.000000000 +1200 |
3 |
+++ ./j3d-core/build.xml 2009-07-12 13:20:26.000000000 +1200 |
| 4 |
@@ -142,6 +142,15 @@ |
4 |
@@ -142,6 +142,16 @@ |
| 5 |
<echo message="version_file = ${version_file}"/> |
5 |
<echo message="version_file = ${version_file}"/> |
| 6 |
</target> |
6 |
</target> |
| 7 |
|
7 |
|
|
Lines 12-23
Link Here
|
| 12 |
+ <property name="platformname" value="freebsd-${os.arch}"/> |
12 |
+ <property name="platformname" value="freebsd-${os.arch}"/> |
| 13 |
+ <property name="platform" value="freebsd"/> |
13 |
+ <property name="platform" value="freebsd"/> |
| 14 |
+ <property name="install.bin" value="lib/${os.arch}"/> |
14 |
+ <property name="install.bin" value="lib/${os.arch}"/> |
|
|
15 |
+ <property name="ports.prefix" value="/usr/local"/> |
| 15 |
+ </target> |
16 |
+ </target> |
| 16 |
+ |
17 |
+ |
| 17 |
<target name="setupSolaris" if="isSolarisOnSparc"> |
18 |
<target name="setupSolaris" if="isSolarisOnSparc"> |
| 18 |
<property name="isUnix" value="true"/> |
19 |
<property name="isUnix" value="true"/> |
| 19 |
<property name="shell" value="/usr/bin/ksh"/> |
20 |
<property name="shell" value="/usr/bin/ksh"/> |
| 20 |
@@ -232,7 +241,7 @@ |
21 |
@@ -232,7 +242,7 @@ |
| 21 |
</target> |
22 |
</target> |
| 22 |
|
23 |
|
| 23 |
<target name="setupPlatform" |
24 |
<target name="setupPlatform" |
|
Lines 26-34
Link Here
|
| 26 |
<property name="build-debug-gen" location="${build}/${platform}/debug/gen"/> |
27 |
<property name="build-debug-gen" location="${build}/${platform}/debug/gen"/> |
| 27 |
<property name="build-opt-gen" location="${build}/${platform}/opt/gen"/> |
28 |
<property name="build-opt-gen" location="${build}/${platform}/opt/gen"/> |
| 28 |
<property name="docname" value="${build.relprefix}-${version_file}-doc"/> |
29 |
<property name="docname" value="${build.relprefix}-${version_file}-doc"/> |
| 29 |
diff -ruN ./j3d-core/src/classes/build.xml ../java3d-1.5.2/j3d-core/src/classes/build.xml |
30 |
diff -ruN ../java3d-1.5.2/j3d-core/src/classes/build.xml ./j3d-core/src/classes/build.xml |
| 30 |
--- ./j3d-core/src/classes/build.xml 2008-02-29 09:17:18.000000000 +1300 |
31 |
--- ../java3d-1.5.2/j3d-core/src/classes/build.xml 2008-02-29 09:17:18.000000000 +1300 |
| 31 |
+++ ../java3d-1.5.2/j3d-core/src/classes/build.xml 2008-07-21 23:02:37.000000000 +1200 |
32 |
+++ ./j3d-core/src/classes/build.xml 2009-07-12 13:19:17.000000000 +1200 |
| 32 |
@@ -95,6 +95,7 @@ |
33 |
@@ -95,6 +95,7 @@ |
| 33 |
<javac srcdir="${src}/classes/share:${src}/classes/${wstype}:${jogl.pipeline.srcdir}:${core_utils_src}/classes/share:${build-opt-gen}/classes" destdir="${build}/${platform}/opt/classes" |
34 |
<javac srcdir="${src}/classes/share:${src}/classes/${wstype}:${jogl.pipeline.srcdir}:${core_utils_src}/classes/share:${build-opt-gen}/classes" destdir="${build}/${platform}/opt/classes" |
| 34 |
source="1.5" |
35 |
source="1.5" |
|
Lines 46-54
Link Here
|
| 46 |
destdir="${build}/${platform}/javadocs/docs-public" |
47 |
destdir="${build}/${platform}/javadocs/docs-public" |
| 47 |
bottom="${javadoc.bottom}" |
48 |
bottom="${javadoc.bottom}" |
| 48 |
windowtitle="${build.javadoc.name} ${version}"> |
49 |
windowtitle="${build.javadoc.name} ${version}"> |
| 49 |
diff -ruN ./j3d-core/src/native/build.xml ../java3d-1.5.2/j3d-core/src/native/build.xml |
50 |
diff -ruN ../java3d-1.5.2/j3d-core/src/native/build.xml ./j3d-core/src/native/build.xml |
| 50 |
--- ./j3d-core/src/native/build.xml 2008-02-29 09:17:58.000000000 +1300 |
51 |
--- ../java3d-1.5.2/j3d-core/src/native/build.xml 2008-02-29 09:17:58.000000000 +1300 |
| 51 |
+++ ../java3d-1.5.2/j3d-core/src/native/build.xml 2008-07-21 23:00:14.000000000 +1200 |
52 |
+++ ./j3d-core/src/native/build.xml 2009-07-12 13:19:17.000000000 +1200 |
| 52 |
@@ -3,6 +3,19 @@ |
53 |
@@ -3,6 +3,19 @@ |
| 53 |
<!-- Ant file for building native files --> |
54 |
<!-- Ant file for building native files --> |
| 54 |
<project name="j3d-core native" default="compile-opt"> |
55 |
<project name="j3d-core native" default="compile-opt"> |
|
Lines 87-95
Link Here
|
| 87 |
<property name="bldType" value="opt"/> |
88 |
<property name="bldType" value="opt"/> |
| 88 |
<property name="javahCoreSrc" |
89 |
<property name="javahCoreSrc" |
| 89 |
location="${src}/classes/share/javax/media/j3d"/> |
90 |
location="${src}/classes/share/javax/media/j3d"/> |
| 90 |
diff -ruN ./j3d-core/src/native/ogl/build-freebsd.xml ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml |
91 |
diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/src/native/ogl/build-freebsd.xml |
| 91 |
--- ./j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 |
92 |
--- ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 |
| 92 |
+++ ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 2008-07-21 23:00:14.000000000 +1200 |
93 |
+++ ./j3d-core/src/native/ogl/build-freebsd.xml 2009-07-12 13:21:41.000000000 +1200 |
| 93 |
@@ -0,0 +1,74 @@ |
94 |
@@ -0,0 +1,74 @@ |
| 94 |
+<?xml version="1.0"?> |
95 |
+<?xml version="1.0"?> |
| 95 |
+ |
96 |
+ |
|
Lines 117-128
Link Here
|
| 117 |
+ |
118 |
+ |
| 118 |
+ <!-- Compile the c source files--> |
119 |
+ <!-- Compile the c source files--> |
| 119 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> |
120 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> |
| 120 |
+ <arg line="-fPIC -march=k8 -I${oglsrc} -I/usr/local/include -I${java.home}/../include -I${java.home}/../include/freebsd -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"/> |
121 |
+ <arg line="-fPIC -march=k8 -I${oglsrc} -I${ports.prefix}/include -I${java.home}/../include -I${java.home}/../include/freebsd -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"/> |
| 121 |
+ </exec> |
122 |
+ </exec> |
| 122 |
+ |
123 |
+ |
| 123 |
+ <!-- Create the library file--> |
124 |
+ <!-- Create the library file--> |
| 124 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> |
125 |
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> |
| 125 |
+ <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/local/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/> |
126 |
+ <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${ports.prefix}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/> |
| 126 |
+ </exec> |
127 |
+ </exec> |
| 127 |
+ |
128 |
+ |
| 128 |
+ </target> |
129 |
+ </target> |