diff options
Diffstat (limited to 'src/native/ogl')
| -rw-r--r-- | src/native/ogl/Attributes.c | 6 | ||||
| -rw-r--r-- | src/native/ogl/Canvas3D.c | 10 | ||||
| -rw-r--r-- | src/native/ogl/CgShaderProgram.c | 5 | ||||
| -rw-r--r-- | src/native/ogl/CgWrapper.c | 5 | ||||
| -rw-r--r-- | src/native/ogl/GLSLShaderProgram.c | 5 | ||||
| -rw-r--r-- | src/native/ogl/NativeConfigTemplate3D.c | 10 | ||||
| -rw-r--r-- | src/native/ogl/NativeScreenInfo.c | 5 | ||||
| -rw-r--r-- | src/native/ogl/build-windows-i586-vc.xml | 4 | ||||
| -rw-r--r-- | src/native/ogl/gldefs.h | 5 | ||||
| -rw-r--r-- | src/native/ogl/j3dsys.h | 26 |
10 files changed, 48 insertions, 33 deletions
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"${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""/> + <arg line="-I"${oglsrc}" -I"${javaInclude}" -I"${javaWin32Include}" -I"${javahCoreTarget}" -I"${cg.home}\include" -nologo -MT -W3 -EHsc -O2 -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 -EHsc -Ox -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 -O2 -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 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_ */ |