Merge branch 'master' of ssh://abwabwa.org:55555/home/git/ponytracker

Conflicts:
	sources/mainTest/maintest.c
This commit is contained in:
Mika
2014-05-21 20:42:55 +02:00
13 changed files with 151 additions and 84 deletions

View File

@@ -1,19 +1,19 @@
all : ponytracker clean
ponytracker : maintest.o lecture.o motifs.o melodie.o
gcc -std=c99 -L'fmod/lib' -lfmodex64 -Wall maintest.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
gcc -std=c99 -L'../fmod/lib' -lfmodex64 -Wall maintest.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
maintest.o : maintest.c
gcc -std=c99 -Wall -c maintest.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
motifs.o : motifs/motifs.c motifs/motifs.h
gcc -std=c99 -Wall -c motifs/motifs.c
motifs.o : ../motifs/motifs.c ../motifs/motifs.h
gcc -std=c99 -Wall -c ../motifs/motifs.c
melodie.o : melodie/melodie.c melodie/melodie.h
gcc -std=c99 -Wall -c melodie/melodie.c
melodie.o : ../melodie/melodie.c ../melodie/melodie.h
gcc -std=c99 -Wall -c ../melodie/melodie.c
lecture.o : lecture/lecture.c lecture/lecture.h
gcc -std=c99 -Wall -c lecture/lecture.c
lecture.o : ../lecture/lecture.c ../lecture/lecture.h
gcc -std=c99 -Wall -c ../lecture/lecture.c
clean :
rm -f *.o

BIN
sources/mainTest/ponytracker Executable file

Binary file not shown.