Browse Source

Fixed merge errors

Thomas Buck 13 years ago
parent
commit
47b2a1def8
2 changed files with 2 additions and 3 deletions
  1. 1
    1
      Cube Control/frame.java
  2. 1
    2
      Cube Control/makefile

+ 1
- 1
Cube Control/frame.java View File

53
   private Vector3d lookVect = new Vector3d(1.0, 1.0, 0.0);
53
   private Vector3d lookVect = new Vector3d(1.0, 1.0, 0.0);
54
 
54
 
55
   Led3D(Canvas3D canv) {
55
   Led3D(Canvas3D canv) {
56
-  
56
+
57
     canvas = canv;
57
     canvas = canv;
58
     group = new BranchGroup();
58
     group = new BranchGroup();
59
     // Position viewer, so we are looking at object
59
     // Position viewer, so we are looking at object

+ 1
- 2
Cube Control/makefile View File

10
 JAVAFILES = *.java
10
 JAVAFILES = *.java
11
 endif
11
 endif
12
 
12
 
13
-# Windows doesn't like *.class, so we have to maintain a list of all classes :(
14
 ifeq ($(TARGET),win)
13
 ifeq ($(TARGET),win)
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 Led3D.class LEDoff.png LEDon.png serialHelper.exe
14
+INJAR = *.class *.png serialHelper.exe
16
 else
15
 else
17
 INJAR = *.class *.png serialHelper
16
 INJAR = *.class *.png serialHelper
18
 endif
17
 endif

Loading…
Cancel
Save