2.7.0 release ..

5 files changed, 84 insertions, 127 deletions

diff --git a/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp b/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp
index 43aa508..62ce5d8 100755
--- a/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib /nologo /subsystem:windows /dll /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

 # SUBTRACT LINK32 /pdb:none /incremental:yes /debug

 # Begin Target

 

@@ -60,10 +60,26 @@ SOURCE=..\..\CNativeCode\GLCallbackHelperJNI.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glcaps.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\gltool.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLUCallbackJNI.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\CNativeCode\jnitools.c

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\OpenGL_JauJNI_funcs.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\CNativeCode\OpenGL_misc.c

 # End Source File

 # Begin Source File

@@ -78,5 +94,13 @@ SOURCE=..\..\CNativeCode\OpenGL_Win32_common.c
 

 SOURCE=..\..\CNativeCode\OpenGL_Win32_common.h

 # End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\OpenGLU_JauJNI_funcs.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\wgltool.c

+# End Source File

 # End Target

 # End Project

diff --git a/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp b/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp
index 28faec0..7a398aa 100755
--- a/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib /nologo /subsystem:windows /dll /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

 # SUBTRACT LINK32 /pdb:none /incremental:yes /debug

 # Begin Target

 

@@ -60,10 +60,26 @@ SOURCE=..\..\CNativeCode\GLCallbackHelperJNI.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glcaps.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\gltool.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLUCallbackJNI.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\CNativeCode\jni12tools.c

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\OpenGL_JauJNI12_funcs.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\CNativeCode\OpenGL_misc.c

 # End Source File

 # Begin Source File

@@ -74,5 +90,13 @@ SOURCE=..\..\CNativeCode\OpenGL_Win32.c
 

 SOURCE=..\..\CNativeCode\OpenGL_Win32_common.c

 # End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\OpenGLU_JauJNI12_funcs.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\wgltool.c

+# End Source File

 # End Target

 # End Project

diff --git a/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp b/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp
index 5569e4a..ea407ca 100755
--- a/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp
@@ -49,8 +49,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib jawt.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"d:\java2\lib"

-# SUBTRACT LINK32 /pdb:none

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib jawt.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"d:\java2\lib"

+# SUBTRACT LINK32 /pdb:none /debug

 # Begin Target

 

 # Name "GL4JavaJauGljJNI13 - Win32 Release"

@@ -60,10 +60,22 @@ SOURCE=..\..\CNativeCode\GLCallbackHelperJNI.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glcaps.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\CNativeCode\GLDrawableFactory_Win32_SunJDK13.c

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\gltool.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLUCallbackJNI.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\CNativeCode\jawt_misc.c

 # End Source File

 # Begin Source File

@@ -72,6 +84,10 @@ SOURCE=..\..\CNativeCode\jni12tools.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\OpenGL_JauJNI12_funcs.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\CNativeCode\OpenGL_misc.c

 # End Source File

 # Begin Source File

@@ -82,5 +98,13 @@ SOURCE=..\..\CNativeCode\OpenGL_Win32_common.c
 

 SOURCE=..\..\CNativeCode\OpenGL_Win32_jawt.c

 # End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\OpenGLU_JauJNI12_funcs.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\wgltool.c

+# End Source File

 # End Target

 # End Project

diff --git a/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp b/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp
index 8471a8d..172725a 100755
--- a/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp
+++ b/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp
@@ -40,7 +40,6 @@ RSC=rc.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\java2\include" /I "d:\java2\include\win32" /I "..\..\CCLassHeaders" /I "..\..\CNativeCode" /D "NO_VSNPRINTF" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32_" /D "_MSVC_" /D "_MT" /D "_GL_DYNAMIC_BINDING_" /FD /c

-# SUBTRACT CPP /Z<none>

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD BASE RSC /l 0x407 /d "NDEBUG"

@@ -50,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib  ../libs/GL4JavaJauGljJNI.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../libs/GL4JavaGljMSJDirect.dll"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  ../libs/GL4JavaJauGljJNI.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../libs/GL4JavaGljMSJDirect.dll"

 # SUBTRACT LINK32 /pdb:none /incremental:yes /map /debug

 # Begin Target

 

diff --git a/Win32VC6/Win32VC6.dsw b/Win32VC6/Win32VC6.dsw
index bee10b8..819f100 100755
--- a/Win32VC6/Win32VC6.dsw
+++ b/Win32VC6/Win32VC6.dsw
@@ -3,52 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "GL4JavaJauGLJNI"=.\GL4JavaJauGLJNI\GL4JavaJauGLJNI.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "GL4JavaJauGLJNI12"=.\GL4JavaJauGLJNI12\GL4JavaJauGLJNI12.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI12

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "GL4JavaJauGLJNI12tst"=.\GL4JavaJauGLJNI12tst\GL4JavaJauGLJNI12tst.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI12

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "GL4JavaJauGLJNInf"=.\GL4JavaJauGLJNInf\GL4JavaJauGLJNInf.dsp - Package Owner=<4>

+Project: "GL4JavaJauGljJNI"=.\GL4JavaJauGljJNI\GL4JavaJauGljJNI.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -56,29 +11,11 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "GL4JavaJauGLJNItst"=.\GL4JavaJauGLJNItst\GL4JavaJauGLJNItst.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "GL4JavaJauGLUJNI"=.\GL4JavaJauGLUJNI\GL4JavaJauGLUJNI.dsp - Package Owner=<4>

+Project: "GL4JavaJauGljJNI12"=.\GL4JavaJauGljJNI12\GL4JavaJauGljJNI12.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -86,14 +23,11 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "GL4JavaJauGLUJNI12"=.\GL4JavaJauGLUJNI12\GL4JavaJauGLUJNI12.dsp - Package Owner=<4>

+Project: "GL4JavaJauGljJNI13"=.\GL4JavaJauGljJNI13\GL4JavaJauGljJNI13.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -101,14 +35,11 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI12

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "GL4JavaJauGLUJNI12tst"=.\GL4JavaJauGLUJNI12tst\GL4JavaJauGLUJNI12tst.dsp - Package Owner=<4>

+Project: "GL4JavaJauGljJNI13nf"=.\GL4JavaJauGljJNI13nf\GL4JavaJauGljJNI13nf.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -116,14 +47,11 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI12

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "GL4JavaJauGLUJNInf"=.\GL4JavaJauGLUJNInf\GL4JavaJauGLUJNI.dsp - Package Owner=<4>

+Project: "GL4JavaJauGljJNI13tst"=.\GL4JavaJauGljJNI13tst\GL4JavaJauGljJNI13tst.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -131,14 +59,11 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "GL4JavaJauGLUJNItst"=.\GL4JavaJauGLUJNItst\GL4JavaJauGLUJNItst.dsp - Package Owner=<4>

+Project: "GL4JavaMSJDirect"=.\GL4JavaMSJDirect\GL4JavaMSJDirect.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -153,19 +78,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "GL4JavaJauGljJNI"=.\GL4JavaJauGljJNI\GL4JavaJauGljJNI.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "GL4JavaJauGljJNI12"=.\GL4JavaJauGljJNI12\GL4JavaJauGljJNI12.dsp - Package Owner=<4>

+Project: "invokejvm"=.\invokejvm\invokejvm.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -177,33 +90,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "GL4JavaJauGljJNI13"=.\GL4JavaJauGljJNI13\GL4JavaJauGljJNI13.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "GL4JavaMSJDirect"=.\GL4JavaMSJDirect\GL4JavaMSJDirect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name GL4JavaJauGljJNI

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Global:

 

 Package=<5>