cleanup

6 files changed, 11 insertions, 16 deletions

diff --git a/build.xml b/build.xml
index 227e42df..efed11fa 100644
--- a/build.xml
+++ b/build.xml
@@ -56,18 +56,18 @@
     <target name="-post-compile" depends="c.configure.linux.amd64">
 
         <property name="output.lib.name" value="jocl"/>
-        <property name="obj" value="${build.dir}/obj"/>
-        <property name="obj.jocl" value="${obj}/${output.lib.name}"/>
+        <property name="obj.dir" value="${build.dir}/obj"/>
+        <property name="obj.jocl.dir" value="${obj.dir}/${output.lib.name}"/>
 
         <property name="c.compiler.optimise" value="none"/>
         <property name="c.compiler.debug" value="false"/>
 
-        <mkdir dir="${obj.jocl}" />
+        <mkdir dir="${obj.jocl.dir}" />
 
         <echo message=" - - - compiling JOCL natives - - - "/>
 
         <cc outtype="shared"
-            objdir="${obj.jocl}"
+            objdir="${obj.jocl.dir}"
             outfile="${obj}/${output.lib.name}"
             optimize="${c.compiler.optimise}"
             debug="${c.compiler.debug}"
@@ -79,7 +79,7 @@
 
             <compiler extends="${compiler.cfg.id}" >
 
-                <sysincludepath path="${basedir}/resources/jvm_stubs"/>
+                <includepath path="${basedir}/resources/jvm_stubs"/>
 
                 <includepath path="${basedir}/resources"/>
                 <includepath path="${basedir}/resources/CL"/>
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index b1910954..2ca5eda9 100644
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,7 +1,3 @@
-libs.junit.classpath=\
-    ${base}/junit/junit-3.8.2.jar
-libs.junit.javadoc=\
-    ${base}/junit/junit-3.8.2-api.zip
 libs.junit_4.classpath=\
     ${base}/junit_4/junit-4.5.jar
 libs.junit_4.javadoc=\
diff --git a/manifest.mf b/manifest.mf
index 328e8e5b..d89ffed9 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,3 +1,2 @@
 Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
+Implementation-Version: 0.1
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index fddd80d7..5c3119b4 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -5,4 +5,4 @@ [email protected]
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=174e0dcd
 nbproject/build-impl.xml.script.CRC32=f73fecee
-nbproject/[email protected]
+nbproject/[email protected]
diff --git a/nbproject/project.properties b/nbproject/project.properties
index b4e8c720..7fd3fea7 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,7 +1,7 @@
 application.title=JOCL
 application.vendor=Michael Bien
 build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java,**/*.form,**/*.c
 # This directory is removed when the project is cleaned:
 build.dir=build
 build.generated.dir=${build.dir}/generated
diff --git a/resources/CL/stdint.h b/resources/CL/stdint.h
index d3de5327..f8bee857 100644
--- a/resources/CL/stdint.h
+++ b/resources/CL/stdint.h
@@ -6,14 +6,14 @@
     // typedef unsigned __int64 uint64_t;
 #else
 
-    typedef signed char       int8_t;
+    typedef signed   char     int8_t;
     typedef unsigned short    int16_t;
-    typedef int               int32_t;
+    typedef          int      int32_t;
     typedef unsigned char     uint8_t;
     typedef unsigned short    uint16_t;
     typedef unsigned int      uint32_t;
 
-    typedef int               intptr_t;
+    typedef          int      intptr_t;
     typedef unsigned int      uintptr_t;
 
     typedef unsigned int      size_t;