Skip to content

Commit

Permalink
Merge pull request #66 from ngwese/fix/issue-65
Browse files Browse the repository at this point in the history
change simulator makefile to pull euclidean bits from libavr32
  • Loading branch information
ngwese authored Jan 19, 2017
2 parents 40a1ee9 + cb371ff commit 950c201
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions simulator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ OBJ = tt.o ../src/teletype.o ../src/command.o ../src/helpers.o \
../src/ops/delay.o ../src/ops/hardware.o ../src/ops/metronome.o \
../src/ops/maths.o ../src/ops/patterns.o ../src/ops/queue.o \
../src/ops/stack.o ../src/ops/variables.o \
../src/euclidean/euclidean.o ../src/euclidean/data.o \
../libavr32/src/euclidean/euclidean.o ../libavr32/src/euclidean/data.o \
../libavr32/src/util.o

%.o: %.c $(DEPS)
Expand All @@ -21,6 +21,6 @@ clean:
rm -rf tt.dSYM
rm -f *.o
rm -f ../src/*.o
rm -f ../src/euclidean/*.o
rm -f ../src/ops/*.o
rm -f ../libavr32/src/euclidean/*.o
rm -f ../libavr32/src/*.o
4 changes: 2 additions & 2 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tests: main.o parser_tests.o process_tests.o \
../src/ops/delay.o ../src/ops/hardware.o ../src/ops/metronome.o \
../src/ops/maths.o ../src/ops/patterns.o ../src/ops/queue.o \
../src/ops/stack.o ../src/ops/variables.o \
../src/euclidean/data.o ../src/euclidean/euclidean.o \
../libavr32/src/euclidean/data.o ../libavr32/src/euclidean/euclidean.o \
../libavr32/src/util.o
$(CC) -o $@ $^ $(CFLAGS)

Expand All @@ -20,6 +20,6 @@ clean:
rm -rf tests.dSYM
rm -f *.o
rm -f ../src/*.o
rm -f ../src/euclidean/*.o
rm -f ../src/ops/*.o
rm -f ../libavr32/src/euclidean/*.o
rm -f ../libavr32/src/*.o

0 comments on commit 950c201

Please sign in to comment.