diff options
| author | Chien Yang <[email protected]> | 2007-01-09 22:31:49 +0000 |
|---|---|---|
| committer | Chien Yang <[email protected]> | 2007-01-09 22:31:49 +0000 |
| commit | 5f77aa7b33af62561a03c2f1f0b2a14c72acc6f9 (patch) | |
| tree | 8b99fc435a7adda178b1625433f2cd6a7f451048 | |
| parent | 829409e643e1d86bcdf1bede35da824efcffa415 (diff) | |
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
| -rw-r--r-- | src/native/ogl/Attributes.c | 6 | ||||
| -rw-r--r-- | src/native/ogl/Canvas3D.c | 6 | ||||
| -rw-r--r-- | src/native/ogl/NativeConfigTemplate3D.c | 5 | ||||
| -rw-r--r-- | src/native/ogl/build-windows-i586-vc.xml | 4 | ||||
| -rw-r--r-- | 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"${oglsrc}" -I"${javaInclude}" -I"${javaWin32Include}" -I"${javahCoreTarget}" -I"${cg.home}\include" -nologo -MT -W3 -GX -Ox -YX -FD ${bldFlag} ${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""/> + <arg line="-I"${oglsrc}" -I"${javaInclude}" -I"${javaWin32Include}" -I"${javahCoreTarget}" -I"${cg.home}\include" -nologo -MT -W3 -EHsc -Ox -FD ${bldFlag} ${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""/> </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"${oglsrc}" -I"${javaInclude}" -I"${javaWin32Include}" -I"${javahCoreTarget}" -I"${cg.home}\include" -nologo -MT -W3 -GX -Ox -YX -FD ${bldFlag} ${cflags.cg} -c "${oglsrc}/CgWrapper.c""/> + <arg line="-I"${oglsrc}" -I"${javaInclude}" -I"${javaWin32Include}" -I"${javahCoreTarget}" -I"${cg.home}\include" -nologo -MT -W3 -EHsc -Ox -FD ${bldFlag} ${cflags.cg} -c "${oglsrc}/CgWrapper.c""/> </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 |