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

1 files changed, 15 insertions, 11 deletions

diff --git a/src/java/com/sun/gluegen/opengl/GLEmitter.java b/src/java/com/sun/gluegen/opengl/GLEmitter.java
index 935706bd2..ffe1ed61c 100644
--- a/src/java/com/sun/gluegen/opengl/GLEmitter.java
+++ b/src/java/com/sun/gluegen/opengl/GLEmitter.java
@@ -325,20 +325,24 @@ public class GLEmitter extends ProcAddressEmitter
           if(null!=enumName) {
               newComment.append(enumName);
           } else {
-              newComment.append("ENUM");
+              newComment.append("CORE ENUM");
           }
         } else {
-          // Note: All GL defines must be contained within an extension marker !
-          // #ifndef GL_EXT_lala
-          // #define GL_EXT_lala 1
-          // ...
-          // #endif
-          if(JavaConfiguration.DEBUG_IGNORES) {
-              StringBuffer sb = new StringBuffer();
-              JavaEmitter.addStrings2Buffer(sb, ", ", symbolRenamed, def.getAliasedNames());
-              System.err.println("Dropping marker: "+sb.toString());
+          if(getGLConfig().getAllowNonGLExtensions()) {
+              newComment.append("CORE DEF");
+          } else {
+              // Note: All GL defines must be contained within an extension marker !
+              // #ifndef GL_EXT_lala
+              // #define GL_EXT_lala 1
+              // ...
+              // #endif
+              if(JavaConfiguration.DEBUG_IGNORES) {
+                  StringBuffer sb = new StringBuffer();
+                  JavaEmitter.addStrings2Buffer(sb, ", ", symbolRenamed, def.getAliasedNames());
+                  System.err.println("Dropping marker: "+sb.toString());
+              }
+              return;
           }
-          return;
         }
       }
       newComment.append("</code>");