Compile clean under windows

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1924 232f8b59-042b-4e1e-8c03-345bb8c30851

6 files changed, 30 insertions, 7 deletions

diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat
new file mode 100644
index 000000000..e8c4a9884
--- /dev/null
+++ b/make/make.jogl.all.win32.bat
@@ -0,0 +1,11 @@
+set THISDIR="C:\SUN\JOGL2"

+set J2RE_HOME=c:\jre6

+set JAVA_HOME=c:\jdk6

+set PATH=%JAVA_HOME%\bin;%PATH%

+set LIB_GEN=%THISDIR%\lib

+set CLASSPATH=.;%THISDIR%\build-win32\classes

+#    -Dc.compiler.debug=true 

+#    -DuseOpenMAX=true 

+#    -DuseKD=true

+

+ant -Drootrel.build=build-win32 -v > make.jogl.all.win32.log 2>&1

diff --git a/make/setvc9-jogl.bat b/make/setvc9-jogl.bat
new file mode 100755
index 000000000..be6f039ad
--- /dev/null
+++ b/make/setvc9-jogl.bat
@@ -0,0 +1,9 @@
+

+

+set PATH=C:\cygwin\devtools\share\apache-ant-1.7.0\bin;%PATH%

+set ANT_PATH=C:\cygwin\devtools\share\apache-ant-1.7.0

+

+c:

+cd C:\SUN\JOGL2\jogl\make

+

+"C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"

diff --git a/make/stub_includes/egl/KD/kd.h b/make/stub_includes/egl/KD/kd.h
index a1228e667..c82385b86 100755
--- a/make/stub_includes/egl/KD/kd.h
+++ b/make/stub_includes/egl/KD/kd.h
@@ -707,7 +707,7 @@ KD_API KDint KD_APIENTRY kdInetAton(const KDchar *cp, KDuint32 *inp);
 /* kdInetNtop: Convert a network address to textual form. */
 #define KD_INET_ADDRSTRLEN 16
 typedef struct KDInAddr {
-    KDuint32 s_addr;
+    KDuint32 _s_addr; /* MSVC VC9 again .. couldn't handle s_addr here */
 } KDInAddr;
 KD_API const KDchar *KD_APIENTRY kdInetNtop(KDuint af, const void *src, KDchar *dst, KDsize cnt);
 
diff --git a/make/stub_includes/opengl/GL3/gl3.h b/make/stub_includes/opengl/GL3/gl3.h
index cf7c9fb2f..5fae6986d 100755
--- a/make/stub_includes/opengl/GL3/gl3.h
+++ b/make/stub_includes/opengl/GL3/gl3.h
@@ -1211,7 +1211,7 @@ typedef void (GLAPIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pna
 typedef void (GLAPIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
 typedef void (GLAPIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
 typedef GLboolean (GLAPIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
-typedef void (GLAPIENTRYP PFNGLDEPTHRANGEPROC) (GLclampd near, GLclampd far);
+typedef void (GLAPIENTRYP PFNGLDEPTHRANGEPROC) (GLclampd _near, GLclampd _far); /* MSVC can't handle near or far var names */
 typedef void (GLAPIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
 #endif
 
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 9ab878b2a..e336cc48d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -33,6 +33,7 @@
 package com.sun.opengl.impl.windows.wgl;
 
 import javax.media.nativewindow.*;
+import javax.media.nativewindow.windows.*;
 import com.sun.nativewindow.impl.*;
 
 import javax.media.opengl.*;
@@ -47,11 +48,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
     protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
 
     public WindowsWGLGraphicsConfigurationFactory() {
-        Class awtDeviceClass = NWReflection.getClass("javax.media.nativewindow.awt.AWTGraphicsDevice");
-        if(null!=awtDeviceClass) {
-            GraphicsConfigurationFactory.registerFactory(awtDeviceClass, this);
-        }
-        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.AbstractGraphicsDevice.class, this);
+        GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.windows.WindowsGraphicsDevice.class, this);
     }
 
     public AbstractGraphicsConfiguration chooseGraphicsConfiguration(Capabilities capabilities,
diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c
index e5fb41a76..d08d5411c 100755
--- a/src/newt/native/KDWindow.c
+++ b/src/newt/native/KDWindow.c
@@ -47,6 +47,12 @@
     #else
         typedef int intptr_t;
     #endif
+#elif _MSC_VER <= 1500
+    #ifdef _WIN64 // [
+        typedef __int64           intptr_t;
+    #else // _WIN64 ][
+        typedef int               intptr_t;
+    #endif // _WIN64 ]
 #else
     #include <inttypes.h>
 #endif