From 5f77aa7b33af62561a03c2f1f0b2a14c72acc6f9 Mon Sep 17 00:00:00 2001
From: Chien Yang <jada@dev.java.net>
Date: Tue, 9 Jan 2007 22:31:49 +0000
Subject: VC8 ready. Removed obsolete option, and suppress VC8 deprecated
 warning.

git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@766 ba19aa83-45c5-6ac9-afd3-db810772062c
---
 src/native/ogl/Attributes.c              | 6 +++---
 src/native/ogl/Canvas3D.c                | 6 +++---
 src/native/ogl/NativeConfigTemplate3D.c  | 5 +++--
 src/native/ogl/build-windows-i586-vc.xml | 4 ++--
 src/native/ogl/gldefs.h                  | 5 +++++
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/native/ogl/Attributes.c b/src/native/ogl/Attributes.c
index 2538bc4..88a5c0a 100644
--- a/src/native/ogl/Attributes.c
+++ b/src/native/ogl/Attributes.c
@@ -10,20 +10,20 @@
  * $State$
  */
 
+/* gldefs.h needs to be included before any other include files to suppres VC warning */
+#include "gldefs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <jni.h>
 
-#include "gldefs.h"
-
 #ifdef DEBUG
 /* Uncomment the following for VERBOSE debug messages */
 /* #define VERBOSE */
 #endif /* DEBUG */
 
-
 /*
  * Screen door transparency table.
  */
diff --git a/src/native/ogl/Canvas3D.c b/src/native/ogl/Canvas3D.c
index e1bcb83..b5f08d4 100644
--- a/src/native/ogl/Canvas3D.c
+++ b/src/native/ogl/Canvas3D.c
@@ -20,14 +20,15 @@
 #define _GNU_SOURCE 1
 #endif
 
+/* gldefs.h needs to be included before any other include files to suppres VC warning */
+#include "gldefs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <jni.h>
 
-#include "gldefs.h"
-
 #if defined(UNIX)
 #include <dlfcn.h>
 #endif
@@ -37,7 +38,6 @@
 /* #define VERBOSE */
 #endif /* DEBUG */
 
-
 extern void throwAssert(JNIEnv *env, char *str);
 
 static void initializeCtxInfo(JNIEnv *env, GraphicsContextPropertiesInfo* ctxInfo);
diff --git a/src/native/ogl/NativeConfigTemplate3D.c b/src/native/ogl/NativeConfigTemplate3D.c
index a05359e..e24505d 100644
--- a/src/native/ogl/NativeConfigTemplate3D.c
+++ b/src/native/ogl/NativeConfigTemplate3D.c
@@ -20,12 +20,13 @@
 #define _GNU_SOURCE 1
 #endif
 
+/* gldefs.h needs to be included before any other include files to suppres VC warning */
+#include "gldefs.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/build-windows-i586-vc.xml b/src/native/ogl/build-windows-i586-vc.xml
index 66f889e..5aca9e1 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 -GX -Ox -YX -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 -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;"/>
     </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 -GX -Ox -YX -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 -Ox -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 e278f1d..b0c225a 100644
--- a/src/native/ogl/gldefs.h
+++ b/src/native/ogl/gldefs.h
@@ -13,6 +13,11 @@
 #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
-- 
cgit v1.2.3