diff options
| author | Sven Gothel <[email protected]> | 2009-06-04 03:15:40 +0000 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-06-04 03:15:40 +0000 |
| commit | 886dc3ffa4f55d1f37cf22cb4167aedf3bf8f69b (patch) | |
| tree | 8231decd03b16a0d104e04a3f1f67d6d0e528910 /make | |
| parent | 0c88b63fc45602d4ceabda377d03a6b9a4b289db (diff) | |
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
Diffstat (limited to 'make')
| -rw-r--r-- | make/make.jogl.all.win32.bat | 11 | ||||
| -rwxr-xr-x | make/setvc9-jogl.bat | 9 | ||||
| -rwxr-xr-x | make/stub_includes/egl/KD/kd.h | 2 | ||||
| -rwxr-xr-x | make/stub_includes/opengl/GL3/gl3.h | 2 |
4 files changed, 22 insertions, 2 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 |