diff options
| -rwxr-xr-x | make/egl.cfg | 9 | ||||
| -rw-r--r-- | make/gl-win32.cfg | 5 | ||||
| -rwxr-xr-x | make/glu-win32.cfg | 5 | ||||
| -rwxr-xr-x | make/intptr.cfg | 13 | ||||
| -rw-r--r-- | make/jawt-win32.cfg | 5 | ||||
| -rw-r--r-- | make/wglext.cfg | 5 | ||||
| -rw-r--r-- | make/wingdi-win32.cfg | 5 |
7 files changed, 19 insertions, 28 deletions
diff --git a/make/egl.cfg b/make/egl.cfg index 2ae90b53b..9733114f2 100755 --- a/make/egl.cfg +++ b/make/egl.cfg @@ -75,14 +75,7 @@ Opaque long EGLNativePixmapType CustomCCode #include <EGL/egl.h> -CustomCCode #ifdef _MSC_VER -CustomCCode /* This typedef is apparently needed for Microsoft compilers before VC8 */ -CustomCCode #if _MSC_VER < 1400 -CustomCCode typedef int intptr_t; -CustomCCode #endif -CustomCCode #else -CustomCCode #include <inttypes.h> -CustomCCode #endif +Include intptr.cfg CustomJavaCode EGL private static EGLProcAddressTable _table = new EGLProcAddressTable(); CustomJavaCode EGL public static void resetProcAddressTable(DynamicLookupHelper lookup) { diff --git a/make/gl-win32.cfg b/make/gl-win32.cfg index 5c1c9e26a..4cd107db8 100644 --- a/make/gl-win32.cfg +++ b/make/gl-win32.cfg @@ -28,10 +28,7 @@ CustomCCode #define GL_GLEXT_PROTOTYPES CustomCCode /* Include the OpenGL headers */ CustomCCode #include <GL/gl.h> -CustomCCode /* This typedef is apparently needed for compilers before VC8 */ -CustomCCode #if _MSC_VER < 1400 -CustomCCode typedef int intptr_t; -CustomCCode #endif +Include intptr.cfg IncludeAs CustomJavaCode GLImpl gl-impl-CustomJavaCode.java IncludeAs CustomCCode gl-impl-CustomCCode.c diff --git a/make/glu-win32.cfg b/make/glu-win32.cfg index 341a88e98..ba0a3997b 100755 --- a/make/glu-win32.cfg +++ b/make/glu-win32.cfg @@ -6,9 +6,6 @@ CustomCCode #undef WIN32_LEAN_AND_MEAN CustomCCode CustomCCode #include <stddef.h> -CustomCCode /* This typedef is only needed for VC6 */ -CustomCCode #if _MSC_VER <= 1200 -CustomCCode typedef int intptr_t; -CustomCCode #endif +Include intptr.cfg Include glu-desktop.cfg diff --git a/make/intptr.cfg b/make/intptr.cfg new file mode 100755 index 000000000..0c2ac99a1 --- /dev/null +++ b/make/intptr.cfg @@ -0,0 +1,13 @@ +CustomCCode #ifdef _MSC_VER +CustomCCode /* This typedef is apparently needed for Microsoft compilers before VC8, +CustomCCode and on Windows CE */ +CustomCCode #if (_MSC_VER < 1400) || defined(UNDER_CE) +CustomCCode #ifdef _WIN64 +CustomCCode typedef long long intptr_t; +CustomCCode #else +CustomCCode typedef int intptr_t; +CustomCCode #endif +CustomCCode #endif +CustomCCode #else +CustomCCode #include <inttypes.h> +CustomCCode #endif diff --git a/make/jawt-win32.cfg b/make/jawt-win32.cfg index 15a642f10..9b3afc13b 100644 --- a/make/jawt-win32.cfg +++ b/make/jawt-win32.cfg @@ -19,10 +19,7 @@ IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java CustomCCode #include <jawt.h> -CustomCCode /* This typedef is only needed for VC6 */ -CustomCCode #if _MSC_VER <= 1200 -CustomCCode typedef int intptr_t; -CustomCCode #endif +Include intptr.cfg import java.security.* Import com.sun.opengl.impl.JAWT_PlatformInfo diff --git a/make/wglext.cfg b/make/wglext.cfg index 06474c0e0..25b4a0f41 100644 --- a/make/wglext.cfg +++ b/make/wglext.cfg @@ -35,10 +35,7 @@ CustomCCode /* Include the OpenGL headers */ CustomCCode #include <GL/gl.h> CustomCCode #include <GL/wglext.h> -CustomCCode /* This typedef is apparently needed for compilers before VC8 */ -CustomCCode #if _MSC_VER < 1400 -CustomCCode typedef int intptr_t; -CustomCCode #endif +Include intptr.cfg CustomJavaCode WGLExt public boolean isFunctionAvailable(String glFunctionName); CustomJavaCode WGLExt public boolean isExtensionAvailable(String glExtensionName); diff --git a/make/wingdi-win32.cfg b/make/wingdi-win32.cfg index 56ad8e37e..7f05bcea3 100644 --- a/make/wingdi-win32.cfg +++ b/make/wingdi-win32.cfg @@ -21,9 +21,6 @@ CustomCCode #undef WIN32_LEAN_AND_MEAN CustomCCode #include <wingdi.h> CustomCCode #include <stddef.h> -CustomCCode /* This typedef is only needed for VC6 */ -CustomCCode #if _MSC_VER <= 1200 -CustomCCode typedef int intptr_t; -CustomCCode #endif +Include intptr.cfg IncludeAs CustomCCode wgl-CustomCCode.c |