From 044c01d85d6dee5ddc6136896e4db4578de2bcf4 Mon Sep 17 00:00:00 2001 From: Raspbeguy Date: Wed, 9 Apr 2014 16:06:55 +0200 Subject: [PATCH] Petite correction mu makefile du dossier GUI --- sources/GUI/makefile | 2 +- sources/GUI/premierTest.c | 2 +- sources/lecture/lecture.c | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sources/GUI/makefile b/sources/GUI/makefile index fa26de8..101fde0 100644 --- a/sources/GUI/makefile +++ b/sources/GUI/makefile @@ -7,4 +7,4 @@ premierTest.o : premierTest.c gcc -Wall -c premierTest.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` clean : premierTest - rm *~ *.o + rm -f *.o diff --git a/sources/GUI/premierTest.c b/sources/GUI/premierTest.c index 140f228..aa803a0 100644 --- a/sources/GUI/premierTest.c +++ b/sources/GUI/premierTest.c @@ -21,7 +21,7 @@ int main( int argc, char *argv[] ) { return 0; } -void lecture () +void lancerLecture () { gtk_main_quit(); } diff --git a/sources/lecture/lecture.c b/sources/lecture/lecture.c index a05a33d..944b20b 100644 --- a/sources/lecture/lecture.c +++ b/sources/lecture/lecture.c @@ -1,3 +1,6 @@ +#ifndef _LECTURE_H +#define _LECTURE_H + #include "lecture.h" void lireTick (Motif* m, int tmp, Mix_Chunk* chunk[], int nbrPortees) { // On va lire les ticks (plus petite division temporelle de la playlist) de haut en bas @@ -29,3 +32,5 @@ void lecture (int nombreChaines, Motif* melodie[]) { Mix_CloseAudio(); SDL_Quit(); } + +#endif