JavaCL-JNA: Fix build

ochafik · ochafik · commit 0e74309a9d6b · 2013-07-22T00:23:31.000+01:00
diff --git a/Core/pom.xml b/Core/pom.xml
@@ -35,6 +35,19 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
 	  <version>1.6-SNAPSHOT</version>
 	  <scope>compile</scope>
 	</dependency>
+		
+       <dependency>
+         <groupId>org.jogamp.gluegen</groupId>
+         <artifactId>gluegen-rt-main</artifactId>
+         <version>2.0.2-rc12</version>
+        <scope>test</scope>
+       </dependency>
+       <dependency>
+         <groupId>org.jogamp.jogl</groupId>
+         <artifactId>jogl-all-main</artifactId>
+         <version>2.0.2-rc12</version>
+			<scope>test</scope>
+       </dependency>
 	
   </dependencies>
   
diff --git a/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java b/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java
@@ -447,7 +447,7 @@ public SampleUserProgram(CLContext context) throws IOException {
                     if (macroName.equals("__LINE__") ||
                             macroName.equals("__FILE__") ||
                             macroName.equals("__COUNTER__") ||
-                            config.preprocessorConfig.macros.containsKey(macroName))
+                            config.preprocessorConfig.explicitMacros.containsKey(macroName))
                         continue;
                     
                     String[] parts = macroName.split("_+");
diff --git a/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGeneratorMojo.java b/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGeneratorMojo.java
@@ -131,7 +131,7 @@ public void generateAll(File root, File javaOutDir, File openCLOutDir) throws IO
             if (!javaOutDir.exists())
                 javaOutDir.mkdirs();
             config.outputDir = javaOutDir;
-            config.addSourceFile(file, null, false, true);
+            config.addSourceFile(file, null, false, true, true);
             config.addRootDir(root);
             
             final String fileName = file.getName();
diff --git a/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/cl_buffer_region.java b/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/cl_buffer_region.java
@@ -17,6 +17,10 @@ public cl_buffer_region(NativeSize origin, NativeSize size) {
 		this.origin = origin;
 		this.size = size;
 	}
+	
+	public java.util.List<String> getFieldOrder() {
+		return java.util.Arrays.asList("origin", "size");
+	}
 	protected ByReference newByReference() { return new ByReference(); }
 	protected ByValue newByValue() { return new ByValue(); }
 	protected cl_buffer_region newInstance() { return new cl_buffer_region(); }
diff --git a/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/cl_image_format.java b/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/cl_image_format.java
@@ -22,6 +22,10 @@ public cl_image_format(int image_channel_order, int image_channel_data_type) {
 		this.image_channel_order = image_channel_order;
 		this.image_channel_data_type = image_channel_data_type;
 	}
+	
+	public java.util.List<String> getFieldOrder() {
+		return java.util.Arrays.asList("image_channel_order", "image_channel_data_type");
+	}
 	protected ByReference newByReference() { return new ByReference(); }
 	protected ByValue newByValue() { return new ByValue(); }
 	protected cl_image_format newInstance() { return new cl_image_format(); }
diff --git a/OpenGLDemos/pom.xml b/OpenGLDemos/pom.xml
@@ -28,6 +28,17 @@
       <artifactId>swing-layout</artifactId>
       <version>1.0.3</version>
     </dependency>
+		
+       <dependency>
+         <groupId>org.jogamp.gluegen</groupId>
+         <artifactId>gluegen-rt-main</artifactId>
+         <version>2.0.2-rc12</version>
+       </dependency>
+       <dependency>
+         <groupId>org.jogamp.jogl</groupId>
+         <artifactId>jogl-all-main</artifactId>
+         <version>2.0.2-rc12</version>
+       </dependency>
   </dependencies>
 
   <build>
