2.8.0.0 pre-release cvs only

7 files changed, 69 insertions, 9 deletions

diff --git a/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp b/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp
index 62ce5d8..66807a6 100755
--- a/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI/GL4JavaJauGljJNI.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # 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

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\jdk1.4\include" /I "d:\jdk1.4\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

 # 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"

@@ -64,6 +64,14 @@ SOURCE=..\..\CNativeCode\glcaps.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glf.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLF_JNI_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # Begin Source File

@@ -100,6 +108,10 @@ SOURCE=..\..\CNativeCode\OpenGLU_JauJNI_funcs.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\Tool_JNI_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # End Target

diff --git a/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp b/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp
index 7a398aa..d400c94 100755
--- a/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI12/GL4JavaJauGljJNI12.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # 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

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\jdk1.4\include" /I "d:\jdk1.4\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

 # 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"

@@ -64,6 +64,14 @@ SOURCE=..\..\CNativeCode\glcaps.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glf.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLF_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # Begin Source File

@@ -96,6 +104,10 @@ SOURCE=..\..\CNativeCode\OpenGLU_JauJNI12_funcs.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\Tool_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # End Target

diff --git a/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp b/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp
index ea407ca..bbcd9f8 100755
--- a/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI13/GL4JavaJauGljJNI13.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # 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

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\jdk1.4\include" /I "d:\jdk1.4\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

 # 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"

@@ -68,6 +68,14 @@ SOURCE=..\..\CNativeCode\GLDrawableFactory_Win32_SunJDK13.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glf.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLF_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # Begin Source File

@@ -104,6 +112,10 @@ SOURCE=..\..\CNativeCode\OpenGLU_JauJNI12_funcs.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\Tool_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # End Target

diff --git a/Win32VC6/GL4JavaJauGljJNI13nf/GL4JavaJauGljJNI13nf.dsp b/Win32VC6/GL4JavaJauGljJNI13nf/GL4JavaJauGljJNI13nf.dsp
index 5013f47..ed9d5f0 100755
--- a/Win32VC6/GL4JavaJauGljJNI13nf/GL4JavaJauGljJNI13nf.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI13nf/GL4JavaJauGljJNI13nf.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # 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 "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32_" /D "_MSVC_" /D "_MT" /D "_GL_DYNAMIC_BINDING_" /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\jdk1.4\include" /I "d:\jdk1.4\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 /YX

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

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

@@ -69,6 +69,14 @@ SOURCE=..\..\CNativeCode\GLDrawableFactory_Win32_SunJDK13.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glf.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLF_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # Begin Source File

@@ -105,6 +113,10 @@ SOURCE=..\..\CNativeCode\OpenGLU_JauJNI12nf_funcs.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\Tool_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # End Target

diff --git a/Win32VC6/GL4JavaJauGljJNI13tst/GL4JavaJauGljJNI13tst.dsp b/Win32VC6/GL4JavaJauGljJNI13tst/GL4JavaJauGljJNI13tst.dsp
index d903031..19206dd 100755
--- a/Win32VC6/GL4JavaJauGljJNI13tst/GL4JavaJauGljJNI13tst.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI13tst/GL4JavaJauGljJNI13tst.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # 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 "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32_" /D "_MSVC_" /D "_MT" /D "_GL_DYNAMIC_BINDING_" /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\jdk1.4\include" /I "d:\jdk1.4\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 /YX

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

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

@@ -69,6 +69,14 @@ SOURCE=..\..\CNativeCode\GLDrawableFactory_Win32_SunJDK13.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\glf.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\CNativeCode\GLF_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # Begin Source File

@@ -105,6 +113,10 @@ SOURCE=..\..\CNativeCode\OpenGLU_JauJNI12tst_funcs.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\CNativeCode\Tool_JNI12_funcs.c

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # End Target

diff --git a/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp b/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp
index 172725a..008bc3a 100755
--- a/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp
+++ b/Win32VC6/GL4JavaMSJDirect/GL4JavaMSJDirect.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # 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

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\jdk1.4\include" /I "d:\jdk1.4\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

 # 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"

@@ -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  ../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/invokejvm/invokejvm.dsp b/Win32VC6/invokejvm/invokejvm.dsp
index 8025062..b231170 100755
--- a/Win32VC6/invokejvm/invokejvm.dsp
+++ b/Win32VC6/invokejvm/invokejvm.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "d:\java2\include" /I "d:\java2\include\win32" /I "..\..\CCLassHeaders" /I "..\..\CNativeCode" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN32_" /D "_AFXDLL" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "d:\jdk1.4\include" /I "d:\jdk1.4\include\win32" /I "..\..\CCLassHeaders" /I "..\..\CNativeCode" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN32_" /D "_AFXDLL" /YX /FD /GZ /c

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

 # ADD RSC /l 0x407 /d "_DEBUG" /d "_AFXDLL"

 BSC32=bscmake.exe

@@ -46,7 +46,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 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:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 jvm.lib  ../libs/GL4JavaJauGljJNI13.lib  ../libs/GL4JavaJauGLJNI13.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"d:\java2\lib"

+# ADD LINK32 jvm.lib ../libs/GL4JavaJauGljJNI13.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"d:\java2\lib"

 # Begin Target

 

 # Name "invokejvm - Win32 Debug"