Support for NVidia AllocateMemoryNV extension and fixed problem with extensions not being loaded

1 files changed, 134 insertions, 130 deletions

diff --git a/Win32VC6/GL4JavaJauGljJNI14/GL4JavaJauGljJNI14.dsp b/Win32VC6/GL4JavaJauGljJNI14/GL4JavaJauGljJNI14.dsp
index 5886a42..ff1df40 100755
--- a/Win32VC6/GL4JavaJauGljJNI14/GL4JavaJauGljJNI14.dsp
+++ b/Win32VC6/GL4JavaJauGljJNI14/GL4JavaJauGljJNI14.dsp
@@ -1,130 +1,134 @@
-# Microsoft Developer Studio Project File - Name="GL4JavaJauGljJNI14" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** NICHT BEARBEITEN **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=GL4JavaJauGljJNI14 - Win32 Release

-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE

-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl

-!MESSAGE 

-!MESSAGE NMAKE /f "GL4JavaJauGljJNI14.mak".

-!MESSAGE 

-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben

-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:

-!MESSAGE 

-!MESSAGE NMAKE /f "GL4JavaJauGljJNI14.mak" CFG="GL4JavaJauGljJNI14 - Win32 Release"

-!MESSAGE 

-!MESSAGE F�r die Konfiguration stehen zur Auswahl:

-!MESSAGE 

-!MESSAGE "GL4JavaJauGljJNI14 - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "../libs"

-# PROP Intermediate_Dir "../temp"

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 jawt.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"d:\java2\lib"

-# SUBTRACT LINK32 /pdb:none /debug

-# Begin Target

-

-# Name "GL4JavaJauGljJNI14 - Win32 Release"

-# Begin Source File

-

-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\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

-

-SOURCE=..\..\CNativeCode\GLUCallbackJNI.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\CNativeCode\jawt_misc.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_JauJNI14_funcs.c

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

-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\OpenGLU_JauJNI14_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

-# End Project

+# Microsoft Developer Studio Project File - Name="GL4JavaJauGljJNI14" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=GL4JavaJauGljJNI14 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "GL4JavaJauGljJNI14.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "GL4JavaJauGljJNI14.mak" CFG="GL4JavaJauGljJNI14 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "GL4JavaJauGljJNI14 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../libs"
+# PROP Intermediate_Dir "../temp"
+# 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:\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"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 jawt.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"d:\jdk1.4\lib"
+# SUBTRACT LINK32 /pdb:none /debug
+# Begin Target
+
+# Name "GL4JavaJauGljJNI14 - Win32 Release"
+# Begin Source File
+
+SOURCE=..\..\CNativeCode\gl4java_utils_DirectBufferCleanup.c
+# End Source File
+# Begin Source File
+
+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\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
+
+SOURCE=..\..\CNativeCode\GLUCallbackJNI.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\CNativeCode\jawt_misc.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_JauJNI14_funcs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\CNativeCode\OpenGL_misc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\CNativeCode\OpenGL_Win32_common.c
+# End Source File
+# Begin Source File
+
+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\OpenGLU_JauJNI14_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
+# End Project