Merged changes from dev-1_4 branch into the main trunk.

NOTE: all 1.4 development will now proceed on the main trunk. The dev-1_4 branch is closed.


git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@445 ba19aa83-45c5-6ac9-afd3-db810772062c

1 files changed, 60 insertions, 12 deletions

diff --git a/src/native/build.xml b/src/native/build.xml
index 8bd6b91..12c82e0 100644
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -18,38 +18,50 @@
 <project name="Java 3D" default="compile-opt">
 
   <target name="nativeSetup-debug-solaris" if="isSolarisOnSparc">
-	<property name="bldFlag" value="g"/>
+	<property name="bldFlag" value="-g -DDEBUG"/>
 	<property name="coreLibDependency" value="lib/sparc/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/sparc/libj3dutils.so"/>
   </target>
 
+  <target name="nativeSetup-debug-solaris-x86" if="isSolarisOnX86">
+	<property name="bldFlag" value="-g -DDEBUG"/>
+	<property name="coreLibDependency" value="lib/i386/libj3dcore-ogl.so"/>
+	<property name="coreUtilsLibDependency" value="lib/i386/libj3dutils.so"/>
+  </target>
+
   <target name="nativeSetup-debug-linux" if="isLinuxOnX86">
-	<property name="bldFlag" value="g"/>
+	<property name="bldFlag" value="-g -DDEBUG"/>
 	<property name="coreLibDependency" value="lib/i386/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/i386/libj3dutils.so"/>
   </target>
 
   <target name="nativeSetup-debug-linux-amd64" if="isLinuxOnAmd64">
-	<property name="bldFlag" value="g -fPIC -march=k8 -msse2 -mfpmath=sse"/>
+	<property name="bldFlag" value="-g -DDEBUG -fPIC -march=k8 -msse2 -mfpmath=sse"/>
 	<property name="coreLibDependency" value="lib/amd64/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/amd64/libj3dutils.so"/>
   </target>
 
   <target name="nativeSetup-debug-linux-ia64" if="isLinuxOnIA64">
-	<property name="bldFlag" value="g"/>
+	<property name="bldFlag" value="-g -DDEBUG"/>
 	<property name="coreLibDependency" value="lib/ia64/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/ia64/libj3dutils.so"/>
   </target>
+  
+  <target name="nativeSetup-debug-linux-ppc" if="isLinuxOnPPC">
+	<property name="bldFlag" value="-g -DDEBUG"/>
+	<property name="coreLibDependency" value="lib/ppc/libj3dcore-ogl.so"/>
+	<property name="coreUtilsLibDependency" value="lib/ppc/libj3dutils.so"/>
+  </target>
 
   <target name="nativeSetup-debug-win32" if="isWindowsOnX86">
 	<property name="bldFlag" 
-	         value="-DWIN32 -DDEBUG -D_WINDOWS"/>
+	         value="-DDEBUG -DWIN32 -D_WINDOWS"/>
 	<property name="coreLibDependency" value="bin/j3dcore-${build.rend}.dll"/>
 	<property name="coreUtilsLibDependency" value="bin/j3dutils.dll"/>
   </target>
 
 
-  <target name="nativeSetup-debug" depends="nativeSetup-debug-solaris, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-win32">
+  <target name="nativeSetup-debug" depends="nativeSetup-debug-solaris, nativeSetup-debug-solaris-x86, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-linux-ppc, nativeSetup-debug-win32">
 	<property name="bldType" value="debug"/>
 	<property name="javahCoreSrc"     
 	 location="${src}/classes/share/javax/media/j3d"/>
@@ -62,37 +74,49 @@
   </target>
 
   <target name="nativeSetup-opt-solaris" if="isSolarisOnSparc">
-	<property name="bldFlag" value="O"/>
+	<property name="bldFlag" value="-O"/>
 	<property name="coreLibDependency" value="lib/sparc/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/sparc/libj3dutils.so"/>
   </target>
 
+  <target name="nativeSetup-opt-solaris-x86" if="isSolarisOnX86">
+	<property name="bldFlag" value="-O"/>
+	<property name="coreLibDependency" value="lib/i386/libj3dcore-ogl.so"/>
+	<property name="coreUtilsLibDependency" value="lib/i386/libj3dutils.so"/>
+  </target>
+
   <target name="nativeSetup-opt-linux" if="isLinuxOnX86">
-	<property name="bldFlag" value="O"/>
+	<property name="bldFlag" value="-O"/>
 	<property name="coreLibDependency" value="lib/i386/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/i386/libj3dutils.so"/>
   </target>
 
   <target name="nativeSetup-opt-linux-amd64" if="isLinuxOnAmd64">
-	<property name="bldFlag" value="O -fPIC -march=k8 -msse2 -mfpmath=sse"/>
+	<property name="bldFlag" value="-O -fPIC -march=k8 -msse2 -mfpmath=sse"/>
 	<property name="coreLibDependency" value="lib/amd64/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/amd64/libj3dutils.so"/>
   </target>
 
   <target name="nativeSetup-opt-linux-ia64" if="isLinuxOnIA64">
-	<property name="bldFlag" value="O"/>
+	<property name="bldFlag" value="-O"/>
 	<property name="coreLibDependency" value="lib/ia64/libj3dcore-ogl.so"/>
 	<property name="coreUtilsLibDependency" value="lib/ia64/libj3dutils.so"/>
   </target>
 
+  <target name="nativeSetup-opt-linux-ppc" if="isLinuxOnPPC">
+	<property name="bldFlag" value="-O"/>
+	<property name="coreLibDependency" value="lib/ppc/libj3dcore-ogl.so"/>
+	<property name="coreUtilsLibDependency" value="lib/ppc/libj3dutils.so"/>
+  </target>
+  
   <target name="nativeSetup-opt-win32" if="isWindowsOnX86">
 	<property name="bldFlag" 
-	         value="-DWIN32 -DNDEBUG -D_WINDOWS"/>
+	         value="-DWIN32 -D_WINDOWS"/>
 	<property name="coreLibDependency" value="bin/j3dcore-${build.rend}.dll"/>
 	<property name="coreUtilsLibDependency" value="bin/j3dutils.dll"/>
   </target>
 
-  <target name="nativeSetup-opt" depends="nativeSetup-opt-solaris, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-win32">
+  <target name="nativeSetup-opt" depends="nativeSetup-opt-solaris, nativeSetup-opt-solaris-x86, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-linux-ppc, nativeSetup-opt-win32">
 	<property name="bldType" value="opt"/>
 	<property name="javahCoreSrc"     
 	 location="${src}/classes/share/javax/media/j3d"/>
@@ -188,6 +212,9 @@
      	     srcfile="${javahCoreSrc}/ModelClipRetained.java"
     	     targetfile="${javahCoreTarget}/javax_media_j3d_ModelClipRetained.h"/>
 	    <uptodate
+             srcfile="${javahCoreSrc}/NativeAPIInfo.java"
+             targetfile="${javahCoreTarget}/javax_media_j3d_NativeAPIInfo.h"/>
+            <uptodate
      	     srcfile="${src}/classes/${ostype}/javax/media/j3d/NativeConfigTemplate3D.java"
     	     targetfile="${javahCoreTarget}/javax_media_j3d_NativeConfigTemplate3D.h"/>
 	    <uptodate
@@ -266,6 +293,21 @@
      	     srcfile="${javahCoreSrc}/TransparencyAttributesRetained.java"
     	     targetfile="${javahCoreTarget}/javax_media_j3d_TransparencyAttributesRetained.h"/>
 	    <uptodate
+     	     srcfile="${javahCoreSrc}/GLSLShaderProgramRetained.java"
+    	     targetfile="${javahCoreTarget}/javax_media_j3d_GLSLShaderProgramRetained.h"/>
+	    <uptodate
+     	     srcfile="${javahCoreSrc}/CgShaderProgramRetained.java"
+    	     targetfile="${javahCoreTarget}/javax_media_j3d_CgShaderProgramRetained.h"/>
+	    <uptodate
+     	     srcfile="${javahCoreSrc}/Shader.java"
+    	     targetfile="${javahCoreTarget}/javax_media_j3d_Shader.h"/>
+	    <uptodate
+     	     srcfile="${javahCoreSrc}/ShaderAttributeObjectRetained.java"
+    	     targetfile="${javahCoreTarget}/javax_media_j3d_ShaderAttributeObjectRetained.h"/>
+	    <uptodate
+     	     srcfile="${javahCoreSrc}/ShaderError.java"
+    	     targetfile="${javahCoreTarget}/javax_media_j3d_ShaderError.h"/>
+	    <uptodate
      	     srcfile="${javahUtilsSrc}/J3DTimer.java"
     	     targetfile="${javahUtilsTarget}/com_sun_j3d_utils_timer_J3DTimer.h"/>
 	  </and>
@@ -331,6 +373,7 @@
 	<class name="javax.media.j3d.Material"/>
 	<class name="javax.media.j3d.MaterialRetained"/>
 	<class name="javax.media.j3d.ModelClipRetained"/>
+        <class name="javax.media.j3d.NativeAPIInfo"/>
 	<class name="javax.media.j3d.NativeConfigTemplate3D"/>
 	<class name="javax.media.j3d.NodeRetained"/>
 	<class name="javax.media.j3d.PointAttributesRetained"/>
@@ -357,6 +400,11 @@
 	<class name="javax.media.j3d.TextureUnitStateRetained"/>
 	<class name="javax.media.j3d.TransparencyAttributes"/>
 	<class name="javax.media.j3d.TransparencyAttributesRetained"/>
+	<class name="javax.media.j3d.GLSLShaderProgramRetained"/>
+	<class name="javax.media.j3d.CgShaderProgramRetained"/>
+	<class name="javax.media.j3d.Shader"/>
+	<class name="javax.media.j3d.ShaderAttributeObjectRetained"/>
+	<class name="javax.media.j3d.ShaderError"/>
 
     </javah>