1) VC7 and VC8 compile ready for ogl and d3d.

2) Cleanup d3d build.xml script to closely resemble ogl build.xml.


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

13 files changed, 55 insertions, 35 deletions

diff --git a/src/native/d3d/D3dCtx.cpp b/src/native/d3d/D3dCtx.cpp
index ec01327..3d697f4 100644
--- a/src/native/d3d/D3dCtx.cpp
+++ b/src/native/d3d/D3dCtx.cpp
@@ -10,6 +10,9 @@
  * $State$
  */
 
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
+
 #include "Stdafx.h"
 
 D3dCtxVector d3dCtxList;
diff --git a/src/native/d3d/D3dDriverInfo.cpp b/src/native/d3d/D3dDriverInfo.cpp
index 57d7b8a..fe19a6c 100644
--- a/src/native/d3d/D3dDriverInfo.cpp
+++ b/src/native/d3d/D3dDriverInfo.cpp
@@ -10,6 +10,8 @@
  * $State$
  */
 
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 #include "Stdafx.h"
 
 
diff --git a/src/native/d3d/build-windows-i586-vc.xml b/src/native/d3d/build-windows-i586-vc.xml
index 78d1a4b..b2b2ee6 100644
--- a/src/native/d3d/build-windows-i586-vc.xml
+++ b/src/native/d3d/build-windows-i586-vc.xml
@@ -36,13 +36,13 @@
 
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/d3d/objs" executable="cl">
-	<arg line="-Ox -Og -O2 -Ob2 -Os -Oi -GT -GL  /nologo -I&quot;${javaInclude}&quot; -I&quot;${javaWin32Include}&quot; -I&quot;${src}/native/ogl&quot; -I&quot;${javahCoreTarget}&quot; /D &quot;NDEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_MBCS&quot; /D &quot;_USRDLL&quot; /D &quot;J3DDX90PORT_EXPORTS&quot; /D &quot;WIN32&quot; /D &quot;D3D&quot; /D &quot;J3D_BUILDVERTICES&quot; /D &quot;NVIDIA_DEBUG&quot; /FD /EHsc /MT /Fp&quot;J3dDX90Port.pch&quot;  /W2 /c /TP   &quot;${oglsrc}/DrawingSurfaceObjectAWT.c&quot; &quot;${oglsrc}/MasterControl.c&quot; &quot;${d3dsrc}/D3dVertexBuffer.cpp&quot; &quot;${d3dsrc}/D3dDisplayList.cpp&quot; &quot;${d3dsrc}/D3dDriverInfo.cpp&quot; &quot;${d3dsrc}/D3dDeviceInfo.cpp&quot; &quot;${d3dsrc}/D3dCtx.cpp&quot; &quot;${d3dsrc}/D3dUtil.cpp&quot; &quot;${d3dsrc}/GeometryArrayRetained.cpp&quot; &quot;${d3dsrc}/Canvas3D.cpp&quot; &quot;${d3dsrc}/GraphicsContext3D.cpp&quot; &quot;${d3dsrc}/Attributes.cpp&quot; &quot;${d3dsrc}/Lights.cpp&quot; &quot;${d3dsrc}/NativeConfigTemplate3D.cpp&quot; "/>
+	<arg line="-I&quot;${javaInclude}&quot; -I&quot;${javaWin32Include}&quot; -I&quot;${src}/native/ogl&quot; -I&quot;${javahCoreTarget}&quot; /D &quot;NDEBUG&quot;  /D &quot;J3DDX90PORT_EXPORTS&quot; /D &quot;WIN32&quot; /D &quot;D3D&quot; /D &quot;J3D_BUILDVERTICES&quot; /D &quot;NVIDIA_DEBUG&quot; -nologo -MT -W2 -EHsc -O2 -FD  /Fp&quot;J3dDX90Port.pch&quot; -c -TP   &quot;${oglsrc}/DrawingSurfaceObjectAWT.c&quot; &quot;${oglsrc}/MasterControl.c&quot; &quot;${d3dsrc}/D3dVertexBuffer.cpp&quot; &quot;${d3dsrc}/D3dDisplayList.cpp&quot; &quot;${d3dsrc}/D3dDriverInfo.cpp&quot; &quot;${d3dsrc}/D3dDeviceInfo.cpp&quot; &quot;${d3dsrc}/D3dCtx.cpp&quot; &quot;${d3dsrc}/D3dUtil.cpp&quot; &quot;${d3dsrc}/GeometryArrayRetained.cpp&quot; &quot;${d3dsrc}/Canvas3D.cpp&quot; &quot;${d3dsrc}/GraphicsContext3D.cpp&quot; &quot;${d3dsrc}/Attributes.cpp&quot; &quot;${d3dsrc}/Lights.cpp&quot; &quot;${d3dsrc}/NativeConfigTemplate3D.cpp&quot; "/>
     </exec>
 
 
     <!-- Create the library file-->
     <exec dir="${build}/${platform}/${bldType}/native/d3d/objs" executable="link">
-	<arg line="/OUT:&quot;j3dcore-d3d.dll&quot; /nologo -DLL -DELAYLOAD:jawt.dll -IMPLIB:&quot;j3dcore-d3d.lib&quot; -MACHINE:X86 -LTCG /ignore:4089  ddraw.lib d3d9.lib d3dx9.lib dxerr9.lib dxguid.lib dinput.lib dinput8.lib delayimp.lib WinStrm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib DelayImp.lib   Attributes.obj  Canvas3D.obj    D3dCtx.obj    D3dDeviceInfo.obj    D3dDisplayList.obj    D3dDriverInfo.obj    D3dUtil.obj    D3dVertexBuffer.obj    DrawingSurfaceObjectAWT.obj    GeometryArrayRetained.obj    GraphicsContext3D.obj        Lights.obj    MasterControl.obj    NativeConfigTemplate3D.obj    ddraw.lib d3d9.lib d3dx9.lib dxerr9.lib dxguid.lib dinput.lib dinput8.lib delayimp.lib WinStrm.lib -LIBPATH:&quot;${java.home}\..\lib&quot; jawt.lib"/>
+	<arg line="-nologo -dll -subsystem:windows -machine:I386 -out:j3dcore-d3d.dll Attributes.obj  Canvas3D.obj    D3dCtx.obj    D3dDeviceInfo.obj    D3dDisplayList.obj    D3dDriverInfo.obj    D3dUtil.obj    D3dVertexBuffer.obj    DrawingSurfaceObjectAWT.obj    GeometryArrayRetained.obj    GraphicsContext3D.obj        Lights.obj    MasterControl.obj    NativeConfigTemplate3D.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib  shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ddraw.lib d3d9.lib d3dx9.lib dxerr9.lib dxguid.lib dinput.lib dinput8.lib delayimp.lib -DELAYLOAD:jawt.dll -LIBPATH:&quot;${java.home}\..\lib&quot; jawt.lib"/>
     </exec>
 
     <!-- Copy the copyright library file -->
diff --git a/src/native/ogl/Attributes.c b/src/native/ogl/Attributes.c
index 88a5c0a..a73e4d4 100644
--- a/src/native/ogl/Attributes.c
+++ b/src/native/ogl/Attributes.c
@@ -10,8 +10,8 @@
  * $State$
  */
 
-/* gldefs.h needs to be included before any other include files to suppres VC warning */
-#include "gldefs.h"
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -19,6 +19,8 @@
 #include <math.h>
 #include <jni.h>
 
+#include "gldefs.h"
+
 #ifdef DEBUG
 /* Uncomment the following for VERBOSE debug messages */
 /* #define VERBOSE */
diff --git a/src/native/ogl/Canvas3D.c b/src/native/ogl/Canvas3D.c
index b5f08d4..31530ee 100644
--- a/src/native/ogl/Canvas3D.c
+++ b/src/native/ogl/Canvas3D.c
@@ -16,12 +16,8 @@
  * of the Java 3D API.
  */
 
-#if defined(LINUX)
-#define _GNU_SOURCE 1
-#endif
-
-/* gldefs.h needs to be included before any other include files to suppres VC warning */
-#include "gldefs.h"
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +25,8 @@
 #include <math.h>
 #include <jni.h>
 
+#include "gldefs.h"
+
 #if defined(UNIX)
 #include <dlfcn.h>
 #endif
diff --git a/src/native/ogl/CgShaderProgram.c b/src/native/ogl/CgShaderProgram.c
index bd51b60..e610d3b 100644
--- a/src/native/ogl/CgShaderProgram.c
+++ b/src/native/ogl/CgShaderProgram.c
@@ -10,9 +10,8 @@
  * $State$
  */
 
-#if defined(LINUX)
-#define _GNU_SOURCE 1
-#endif
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/native/ogl/CgWrapper.c b/src/native/ogl/CgWrapper.c
index 235bd64..8509265 100644
--- a/src/native/ogl/CgWrapper.c
+++ b/src/native/ogl/CgWrapper.c
@@ -16,9 +16,8 @@
  * available. This means we don't need to use "#ifdef COMPILE_CG".
  */
 
-#if defined(LINUX)
-#define _GNU_SOURCE 1
-#endif
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/native/ogl/GLSLShaderProgram.c b/src/native/ogl/GLSLShaderProgram.c
index 1196b16..4f123ff 100644
--- a/src/native/ogl/GLSLShaderProgram.c
+++ b/src/native/ogl/GLSLShaderProgram.c
@@ -10,9 +10,8 @@
  * $State$
  */
 
-#if defined(LINUX)
-#define _GNU_SOURCE 1
-#endif
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/native/ogl/NativeConfigTemplate3D.c b/src/native/ogl/NativeConfigTemplate3D.c
index e24505d..68dbcb2 100644
--- a/src/native/ogl/NativeConfigTemplate3D.c
+++ b/src/native/ogl/NativeConfigTemplate3D.c
@@ -16,17 +16,15 @@
  * of the Java 3D API.
  */
 
-#if defined(LINUX)
-#define _GNU_SOURCE 1
-#endif
-
-/* gldefs.h needs to be included before any other include files to suppres VC warning */
-#include "gldefs.h"
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 
 #include <jni.h>
 #include <math.h>
 #include <stdlib.h>
 
+#include "gldefs.h"
+
 #if defined(UNIX)
 #include <X11/X.h>
 #include <X11/Xlib.h>
diff --git a/src/native/ogl/NativeScreenInfo.c b/src/native/ogl/NativeScreenInfo.c
index 013e5ce..3f60fb6 100644
--- a/src/native/ogl/NativeScreenInfo.c
+++ b/src/native/ogl/NativeScreenInfo.c
@@ -16,9 +16,8 @@
  * of the Java 3D API.
  */
 
-#if defined(LINUX)
-#define _GNU_SOURCE 1
-#endif
+/* j3dsys.h needs to be included before any other include files to suppres VC warning */
+#include "j3dsys.h"
 
 #include <jni.h>
 #include <math.h>
diff --git a/src/native/ogl/build-windows-i586-vc.xml b/src/native/ogl/build-windows-i586-vc.xml
index 5aca9e1..a75357b 100644
--- a/src/native/ogl/build-windows-i586-vc.xml
+++ b/src/native/ogl/build-windows-i586-vc.xml
@@ -55,7 +55,7 @@
   <target name="compile-ogl">
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="cl">
-	<arg line="-I&quot;${oglsrc}&quot; -I&quot;${javaInclude}&quot; -I&quot;${javaWin32Include}&quot; -I&quot;${javahCoreTarget}&quot; -I&quot;${cg.home}\include&quot; -nologo -MT -W3 -EHsc -Ox -FD ${bldFlag} ${cflags.cg} -c &quot;${oglsrc}/DrawingSurfaceObjectAWT.c&quot; &quot;${oglsrc}/Canvas3D.c&quot; &quot;${oglsrc}/GraphicsContext3D.c&quot; &quot;${oglsrc}/NativeScreenInfo.c&quot; &quot;${oglsrc}/NativeConfigTemplate3D.c&quot; &quot;${oglsrc}/MasterControl.c&quot; &quot;${oglsrc}/GeometryArrayRetained.c&quot; &quot;${oglsrc}/Attributes.c&quot; &quot;${oglsrc}/CgShaderProgram.c&quot; &quot;${oglsrc}/GLSLShaderProgram.c&quot; &quot;${oglsrc}/Lights.c&quot;"/>
+	<arg line="-I&quot;${oglsrc}&quot; -I&quot;${javaInclude}&quot; -I&quot;${javaWin32Include}&quot; -I&quot;${javahCoreTarget}&quot; -I&quot;${cg.home}\include&quot; -nologo -MT -W3 -EHsc -O2 -FD ${bldFlag} ${cflags.cg} -c &quot;${oglsrc}/DrawingSurfaceObjectAWT.c&quot; &quot;${oglsrc}/Canvas3D.c&quot; &quot;${oglsrc}/GraphicsContext3D.c&quot; &quot;${oglsrc}/NativeScreenInfo.c&quot; &quot;${oglsrc}/NativeConfigTemplate3D.c&quot; &quot;${oglsrc}/MasterControl.c&quot; &quot;${oglsrc}/GeometryArrayRetained.c&quot; &quot;${oglsrc}/Attributes.c&quot; &quot;${oglsrc}/CgShaderProgram.c&quot; &quot;${oglsrc}/GLSLShaderProgram.c&quot; &quot;${oglsrc}/Lights.c&quot;"/>
     </exec>
 
     <!-- Create the library file-->
@@ -69,7 +69,7 @@
   <target name="compile-ogl-cg" if="build.cg">
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="cl">
-	<arg line="-I&quot;${oglsrc}&quot; -I&quot;${javaInclude}&quot; -I&quot;${javaWin32Include}&quot; -I&quot;${javahCoreTarget}&quot; -I&quot;${cg.home}\include&quot; -nologo -MT -W3 -EHsc -Ox -FD ${bldFlag} ${cflags.cg} -c &quot;${oglsrc}/CgWrapper.c&quot;"/>
+	<arg line="-I&quot;${oglsrc}&quot; -I&quot;${javaInclude}&quot; -I&quot;${javaWin32Include}&quot; -I&quot;${javahCoreTarget}&quot; -I&quot;${cg.home}\include&quot; -nologo -MT -W3 -EHsc -O2 -FD ${bldFlag} ${cflags.cg} -c &quot;${oglsrc}/CgWrapper.c&quot;"/>
     </exec>
 
     <!-- Create the library file-->
diff --git a/src/native/ogl/gldefs.h b/src/native/ogl/gldefs.h
index b0c225a..e278f1d 100644
--- a/src/native/ogl/gldefs.h
+++ b/src/native/ogl/gldefs.h
@@ -13,11 +13,6 @@
 #ifndef _Java3D_gldefs_h_
 #define _Java3D_gldefs_h_
 
-#if defined(WIN32)
-#define _CRT_SECURE_NO_DEPRECATE // shut up the vs2005 compiler
-#define _CRT_NONSTDC_NO_DEPRECATE
-#endif
-
 /*
  * Portions of this code were derived from work done by the Blackdown
  * group (www.blackdown.org), who did the initial Linux implementation
diff --git a/src/native/ogl/j3dsys.h b/src/native/ogl/j3dsys.h
new file mode 100644
index 0000000..ef77539
--- /dev/null
+++ b/src/native/ogl/j3dsys.h
@@ -0,0 +1,26 @@
+/*
+ * $RCSfile$
+ *
+ * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * $Revision$
+ * $Date$
+ * $State$
+ */
+
+#ifndef _j3dsys_h_
+#define _j3dsys_h_
+
+// Suppress VS2005 compiler warning
+#if defined(WIN32)
+#define _CRT_SECURE_NO_DEPRECATE 
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+
+#if defined(LINUX)
+#define _GNU_SOURCE 1
+#endif
+
+#endif /* _j3dsys_h_ */