diff options
| author | Sven Gothel <[email protected]> | 2009-08-05 10:29:26 -0700 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-08-05 10:29:26 -0700 |
| commit | a3ce5e8e3bfae850a638c0b40679ed885bceea82 (patch) | |
| tree | 0c472ac41dc94ac248131a59fc7f714c87198bcc /src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java | |
| parent | 47319dab5b769a5a685bc329c8e5a37a710e1687 (diff) | |
Fix: Remove PFD_ defines. Add GL Option: AllowNonGLExtensions <bool> to allow non GL extensions to be passed. Allow ifndef/define pattern to have any characters at the end
Diffstat (limited to 'src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java')
| -rw-r--r-- | src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java b/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java index a31a98760..a6c0cfc97 100644 --- a/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java +++ b/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java @@ -96,11 +96,11 @@ public class BuildStaticGLInfo Pattern.compile("^(GLAPI|GL_API|GL_APICALL|EGLAPI|extern)?(\\s*)((unsigned|const)\\s+)?(\\w+)(\\s*\\*)?(\\s+)(GLAPIENTRY|GL_APIENTRY|APIENTRY|EGLAPIENTRY|WINAPI)?(\\s*)([ew]?gl\\w+)\\s?(\\(.*)"); protected static Pattern associationPattern = - Pattern.compile("\\#ifndef ([CEW]?GL[XU]?_[A-Za-z0-9_]+)\\s*"); + Pattern.compile("\\#ifndef ([CEW]?GL[XU]?_[A-Za-z0-9_]+)(.*)"); protected static int defineIdentifierGroup = 1; protected static Pattern definePattern = - Pattern.compile("\\#define (([CEW]?GL[XU]?|PFD)_[A-Za-z0-9_]+)\\s*([A-Za-z0-9_]+)\\s*"); + Pattern.compile("\\#define ([CEW]?GL[XU]?_[A-Za-z0-9_]+)\\s*([A-Za-z0-9_]+)(.*)"); // Maps function / #define names to the names of the extensions they're declared in protected Map declarationToExtensionMap = new HashMap(); |