Browse Source

Fixed makefile

Thomas Buck 12 years ago
parent
commit
2dd099830e
2 changed files with 38 additions and 16 deletions
  1. 23
    15
      Cube Control/makefile
  2. 15
    1
      README.md

+ 23
- 15
Cube Control/makefile View File

@@ -3,36 +3,44 @@ CC = gcc
3 3
 TARGET = unix
4 4
 #TARGET = win
5 5
 
6
+# Java files to be compiled
7
+ifeq ($(TARGET),win)
6 8
 JAVAFILES = cubeWorker.java layerEditFrame.java frame.java
9
+else
10
+JAVAFILES = *.java
11
+endif
7 12
 
13
+# Windows doesn't like *.class, so we have to maintain a list of all classes :(
8 14
 ifeq ($(TARGET),win)
9
-CLASSES = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class frame$$23.class frame$$24.class AFrame.class Animation.class AnimationUtility.class HelperUtility.class LEDoff.png LEDon.png
15
+INJAR = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class frame$$23.class frame$$24.class AFrame.class Animation.class AnimationUtility.class HelperUtility.class LEDoff.png LEDon.png serialHelper.exe
10 16
 else
11
-CLASSES = 'cubeWorker.class' 'layerEditFrame.class' 'layerEditFrame$$1.class' 'layerEditFrame$$2.class' 'layerEditFrame$$3.class' 'layerEditFrame$$4.class' 'frame.class' 'frame$$1.class' 'frame$$2.class' 'frame$$3.class' 'frame$$4.class' 'frame$$5.class' 'frame$$6.class' 'frame$$7.class' 'frame$$8.class' 'frame$$9.class' 'frame$$10.class' 'frame$$11.class' 'frame$$12.class' 'frame$$13.class' 'frame$$14.class' 'frame$$15.class' 'frame$$16.class' 'frame$$17.class' 'frame$$18.class' 'frame$$19.class' 'frame$$20.class' 'frame$$21.class' 'frame$$22.class' 'frame$$23.class' 'frame$$24.class' 'AFrame.class' 'Animation.class' 'AnimationUtility.class' 'HelperUtility.class' 'LEDoff.png' 'LEDon.png'
17
+INJAR = *.class *.png serialHelper
12 18
 endif
13 19
 
20
+# Spit out jar file, delete intermediate files
14 21
 all: build clean
15 22
 
16
-build: frame.class
17
-ifeq ($(TARGET),win)
18
-	jar -cmf manifest.txt "Cube Control.jar" $(CLASSES) serialHelper.exe
19
-else
20
-	jar -cmf manifest.txt "Cube Control.jar" $(CLASSES) serialHelper
21
-endif
23
+# Compile java files
24
+java: frame.class
22 25
 
23
-ifeq ($(TARGET),win)
24
-frame.class: serialHelper.exe
25
-else
26
-frame.class: serialHelper
27
-endif
26
+# Spit out jar file, dont remove anything after that
27
+build: frame.class serialHelper
28
+	jar -cmf manifest.txt "Cube Control.jar" $(INJAR)
29
+
30
+# Compile java files
31
+frame.class: $(JAVAFILES)
28 32
 	$(JAVAC) $(JAVAFILES)
29 33
 
30
-serialHelper.exe: serialHelper.c helper/winSerial.c
34
+# Compile serial Helper
35
+ifeq ($(TARGET),win)
36
+serialHelper: serialHelper.c helper/winSerial.c
31 37
 	$(CC) -o serialHelper.exe -D winHelper serialHelper.c
32
-
38
+else
33 39
 serialHelper: serialHelper.c helper/unixSerial.c
34 40
 	$(CC) -o serialHelper serialHelper.c
41
+endif
35 42
 
43
+# Delete intermediate files
36 44
 clean:
37 45
 ifeq ($(TARGET),win)
38 46
 	del *.class

+ 15
- 1
README.md View File

@@ -1,3 +1,17 @@
1 1
 # 8x8x8 LED Cube
2 2
 
3
-8x8x8 LED Cube built with an AtMega32.
3
+8x8x8 Single Color LED Cube built with an AtMega32.
4
+
5
+## Hardware
6
+
7
+You can find the schematic as png and Eagle file in this directory.
8
+
9
+## Firmware
10
+
11
+The firmware of the Controller is yet to be developed...
12
+
13
+## Cube Control
14
+
15
+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
+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
+You obviously need a working JDK and a C Compiler Environment (we use gcc).

Loading…
Cancel
Save