PCPP: Add '# <line> <file>' pass through ; Fix NB antlr.jar reference

2 files changed, 12 insertions, 2 deletions

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 181c1d4..d328bc3 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -224,7 +224,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src/java</package-root>
-                <classpath mode="compile">build/classes:${jdk.home}/lib/tools.jar:/home/mbien/netbeans68/java3/ant/lib/ant.jar:lib/antlr-3.2.jar</classpath>
+                <classpath mode="compile">build/classes:${jdk.home}/lib/tools.jar:/usr/share/ant/lib/ant.jar:/home/mbien/netbeans68/java3/ant/lib/ant.jar:lib/antlr.jar</classpath>
                 <built-to>build/classes</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>
diff --git a/src/java/com/jogamp/gluegen/pcpp/PCPP.java b/src/java/com/jogamp/gluegen/pcpp/PCPP.java
index 987d0a9..95a4b43 100644
--- a/src/java/com/jogamp/gluegen/pcpp/PCPP.java
+++ b/src/java/com/jogamp/gluegen/pcpp/PCPP.java
@@ -422,7 +422,17 @@ public class PCPP {
             handleInclude();
             shouldPrint = false;
         } else {
-            // Unknown preprocessor directive (#pragma?) -- ignore
+            int line = -1;
+            try {
+                // try '# <line> "<filename>"' case
+                line = Integer.parseInt(w);
+                String filename = nextWordOrString();
+                print("# " + line + " " + filename);
+                println();
+                shouldPrint = false;
+            } catch (NumberFormatException nfe) {
+                // Unknown preprocessor directive (#pragma?) -- ignore
+            }
         }
         if (shouldPrint) {
             print("# ");