Merge branch 'master' of github.com:xythobuz/LED-Cube

CubeControl/helper/unixSerial.c

@@ -134,7 +134,6 @@ char** namesInDev(int *siz) {
 		tmp[3] = 'v';
 		tmp[4] = '/';
 		files[i] = strncat(tmp, files[i], strlen(files[i]));
-		free(tmp);
 	}
 
 	*siz = size;

CubeControl/makefile

@@ -15,11 +15,11 @@ JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java
 INJAR = *.class *.png
 
 
-all: CubeControl.jar
+all: CubeControl.jar libSerial
 
 doc: doc/index.html
 
-CubeControl.jar: libSerial HelperUtility.class manifest.txt
+CubeControl.jar: HelperUtility.class manifest.txt
 	jar -cmf manifest.txt "CubeControl.jar" $(INJAR)
 
 serialInterface.h: HelperUtility.class

README.md

@@ -16,3 +16,7 @@ It will use [Peter Fleury's UART and TWI Library](http://homepage.hispeed.ch/pet
 We also build a software to create and load animations into the cube. This software is written in Java and C and is Compatible between Windows and Unix.
 It's source is in the "Cube Control" directory. It has it's own makefile, in which you can specify the Target OS. "unix" means any Unix like OS (Linux, OS X...), "win" means Windows.
 You obviously need a working JDK and a C Compiler Environment (we use gcc).
+
+## Build instructions
+
+Theres a global makefile in the top folder. If you run it, it will (probably) create CubeControl.jar, CubeFirmware.hex and a OS-dependent serial library (Serial.dll or libSerial.jnilib...). If not, you should take a look at the makefile in CubeControl. Hard-Coded include directorys are probably different than on your system...