diff options
| author | Kenneth Russel <[email protected]> | 2003-07-15 15:25:43 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2003-07-15 15:25:43 +0000 |
| commit | 51e246743458b40ebed92ffaebf2f07483becb51 (patch) | |
| tree | 81124790d879ea68e6e4dc50880cf0254f520ff7 /make | |
| parent | 68e29a425b63f1eca8e6879ebfb3324929b3dc2a (diff) | |
Added ContextVariableName configuration option to GLEmitter because of
namespace conflicts with some argument names on X11.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@33 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
| -rw-r--r-- | make/gl-impl-x11.cfg | 9 | ||||
| -rw-r--r-- | make/host.properties | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/make/gl-impl-x11.cfg b/make/gl-impl-x11.cfg index 1468fab2a..e94923c64 100644 --- a/make/gl-impl-x11.cfg +++ b/make/gl-impl-x11.cfg @@ -10,6 +10,7 @@ Include gl-glx-common.cfg EmitProcAddressTable true ProcAddressTableClassName GLProcAddressTable +ContextVariableName _context CustomCCode #include <inttypes.h> CustomCCode #include <X11/Xlib.h> @@ -32,20 +33,20 @@ CustomCCode typedef void* LPVOID; CustomCCode typedef unsigned int* PUINT; CustomJavaCode X11GLImpl public X11GLImpl(X11GLContext context) { -CustomJavaCode X11GLImpl this.context = context; +CustomJavaCode X11GLImpl this._context = context; CustomJavaCode X11GLImpl } CustomJavaCode X11GLImpl public boolean isFunctionAvailable(String glFunctionName) CustomJavaCode X11GLImpl { -CustomJavaCode X11GLImpl return context.isFunctionAvailable(glFunctionName); +CustomJavaCode X11GLImpl return _context.isFunctionAvailable(glFunctionName); CustomJavaCode X11GLImpl } CustomJavaCode X11GLImpl public boolean isExtensionAvailable(String glExtensionName) CustomJavaCode X11GLImpl { -CustomJavaCode X11GLImpl return context.isExtensionAvailable(glExtensionName); +CustomJavaCode X11GLImpl return _context.isExtensionAvailable(glExtensionName); CustomJavaCode X11GLImpl } -CustomJavaCode X11GLImpl private X11GLContext context; +CustomJavaCode X11GLImpl private X11GLContext _context; CustomJavaCode X11GLImpl /** CustomJavaCode X11GLImpl * Provides platform-independent access to the wglAllocateMemoryNV / diff --git a/make/host.properties b/make/host.properties index 01e90955d..0dea67346 100644 --- a/make/host.properties +++ b/make/host.properties @@ -16,9 +16,9 @@ # including the name of the jar # # Windows -antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar +# antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar # Linux -# antlr.jar=/home/kbr/ANTLR/antlr-2.7.2/antlr.jar +antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar # Mac OS X # antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar |