Browse Source

Fixed makefile

makefile now builds a jar archive...
Thomas Buck 12 years ago
parent
commit
6688d29088
2 changed files with 14 additions and 5 deletions
  1. 13
    5
      Cube Control/makefile
  2. 1
    0
      Cube Control/manifest.txt

+ 13
- 5
Cube Control/makefile View File

@@ -1,18 +1,26 @@
1 1
 JAVAC = javac
2 2
 CC = gcc
3
-#TARGET = unix
4
-TARGET = win
3
+TARGET = unix
4
+#TARGET = win
5 5
 
6 6
 
7
-all: java
7
+all: build clean
8 8
 
9
-java: serialHelper
9
+build: frame.class
10
+ifeq ($(TARGET),win)
11
+	jar -cmf manifest.txt "Cube Control.jar" *.class serialHelper.exe
12
+else
13
+	jar -cmf manifest.txt "Cube Control.jar" *.class serialHelper
14
+endif
15
+
16
+frame.class: serialHelper
10 17
 	$(JAVAC) *.java
11 18
 
12
-serialHelper:
13 19
 ifeq ($(TARGET),win)
20
+serialHelper.exe:
14 21
 	$(CC) -o serialHelper.exe -D winHelper serialHelper.c
15 22
 else
23
+serialHelper:
16 24
 	$(CC) -o serialHelper serialHelper.c
17 25
 endif
18 26
 

+ 1
- 0
Cube Control/manifest.txt View File

@@ -0,0 +1 @@
1
+Main-Class: frame

Loading…
Cancel
Save