浏览代码

Fixed unixSerial

Thomas Buck 13 年前
父节点
当前提交
7cbb06876f
共有 3 个文件被更改,包括 6 次插入3 次删除
  1. 0
    1
      CubeControl/helper/unixSerial.c
  2. 2
    2
      CubeControl/makefile
  3. 4
    0
      README.md

+ 0
- 1
CubeControl/helper/unixSerial.c 查看文件

134
 		tmp[3] = 'v';
134
 		tmp[3] = 'v';
135
 		tmp[4] = '/';
135
 		tmp[4] = '/';
136
 		files[i] = strncat(tmp, files[i], strlen(files[i]));
136
 		files[i] = strncat(tmp, files[i], strlen(files[i]));
137
-		free(tmp);
138
 	}
137
 	}
139
 
138
 
140
 	*siz = size;
139
 	*siz = size;

+ 2
- 2
CubeControl/makefile 查看文件

11
 INJAR = *.class *.png
11
 INJAR = *.class *.png
12
 
12
 
13
 
13
 
14
-all: CubeControl.jar
14
+all: CubeControl.jar libSerial
15
 
15
 
16
 doc: doc/index.html
16
 doc: doc/index.html
17
 
17
 
18
-CubeControl.jar: libSerial HelperUtility.class manifest.txt
18
+CubeControl.jar: HelperUtility.class manifest.txt
19
 	jar -cmf manifest.txt "CubeControl.jar" $(INJAR)
19
 	jar -cmf manifest.txt "CubeControl.jar" $(INJAR)
20
 
20
 
21
 serialInterface.h: HelperUtility.class
21
 serialInterface.h: HelperUtility.class

+ 4
- 0
README.md 查看文件

16
 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.
16
 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.
17
 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.
17
 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.
18
 You obviously need a working JDK and a C Compiler Environment (we use gcc).
18
 You obviously need a working JDK and a C Compiler Environment (we use gcc).
19
+
20
+## Build instructions
21
+
22
+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...

正在加载...
取消
保存