Browse Source

Fixed makefile for cygwin

Max Nuding 12 years ago
parent
commit
ac9b1100b5
1 changed files with 13 additions and 13 deletions
  1. 13
    13
      Cube Control/makefile

+ 13
- 13
Cube Control/makefile View File

@@ -2,19 +2,19 @@ JAVAC = javac
2 2
 JAVADOC = javadoc
3 3
 DOCDIR = doc
4 4
 CC = gcc
5
-TARGET = unix
6
-#TARGET= cygwin
5
+#TARGET = unix
6
+TARGET= cygwin
7 7
 #TARGET = win
8 8
 
9 9
 # Java files to be compiled
10 10
 # Needs to be a complete list so they work as target
11 11
 JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java
12 12
 
13
-ifeq ($(TARGET),win)
14
-INJAR = *.class *.png serialHelper.exe
13
+ifeq ($(TARGET),unix)
14
+INJAR = *.class *.png serialHelper
15 15
 RM = del
16 16
 else
17
-INJAR = *.class *.png serialHelper
17
+INJAR = *.class *.png serialHelper.exe
18 18
 RM = rm
19 19
 endif
20 20
 
@@ -39,20 +39,20 @@ doc/index.html: $(JAVAFILES)
39 39
 	$(JAVADOC) -d $(DOCDIR) $(JAVAFILES)
40 40
 
41 41
 # Compile serial Helper
42
-ifeq ($(TARGET),win)
43
-serialHelper: serialHelper.c helper/winSerial.c
44
-	$(CC) -o serialHelper.exe -D winHelper serialHelper.c
45
-else
42
+ifeq ($(TARGET),unix)
46 43
 serialHelper: serialHelper.c helper/unixSerial.c
47 44
 	$(CC) -o serialHelper serialHelper.c
45
+else
46
+serialHelper: serialHelper.c helper/winSerial.c
47
+	$(CC) -o serialHelper.exe -D winHelper serialHelper.c
48 48
 endif
49 49
 
50 50
 # Delete intermediate files
51 51
 clean:
52
-ifeq ($(TARGET),win)
53
-	$(RM) *.class
54
-	$(RM) serialHelper.exe
55
-else
52
+ifeq ($(TARGET),unix)
56 53
 	$(RM) -f *.class
57 54
 	$(RM) -f serialHelper
55
+else
56
+	$(RM) *.class
57
+	$(RM) serialHelper.exe
58 58
 endif

Loading…
Cancel
Save