From 37e7572d447ffabe3e6a62a47da94cd7991fd94e Mon Sep 17 00:00:00 2001 From: Raspbeguy Date: Wed, 9 Apr 2014 19:32:30 +0200 Subject: [PATCH] =?UTF-8?q?R=C3=A9solution=20de=202=20BIG=20PROBL=C3=88MES?= =?UTF-8?q?.=20Conclusion,=20les=20majuscules=20et=20les=20doubles=20makef?= =?UTF-8?q?ile=20c'est=20pas=20des=20bonnes=20id=C3=A9es.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/GUI/ponytracker.glade | 8 ++++---- sources/Makefile | 31 ++++++------------------------- sources/lecture/lecture.c | 5 ----- sources/main.c | 10 +++++----- 4 files changed, 15 insertions(+), 39 deletions(-) diff --git a/sources/GUI/ponytracker.glade b/sources/GUI/ponytracker.glade index 962c73b..8c4d709 100644 --- a/sources/GUI/ponytracker.glade +++ b/sources/GUI/ponytracker.glade @@ -2,7 +2,7 @@ - + False @@ -439,7 +439,7 @@ - + False @@ -968,7 +968,7 @@ - + False @@ -1528,7 +1528,7 @@ - + False diff --git a/sources/Makefile b/sources/Makefile index 5291d24..8a7df02 100644 --- a/sources/Makefile +++ b/sources/Makefile @@ -1,38 +1,19 @@ -linux : ponytracker-linux clean +all : ponytracker clean -mac : ponytracker-mac clean - -ponytracker-mac : main.o-mac lecture.o-mac motifs.o-mac melodie.o-mac +ponytracker : main.o lecture.o motifs.o melodie.o gcc -std=c99 -L/opt/local/lib -Wall main.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` -lSDL2 -lSDL2main -lSDL2_mixer # gcc -std=c99 -L=/home/ebrunet/temp/SDL-2.0.3-8621/installation/lib -lsdl2 -lsdl_mixer -lsdlmain -Wall main.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` -ponytracker-linux : main.o lecture.o motif.o melodie.o - gcc -std=c99 -L/opt/local/lib -Wall main.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` -lSDL2 -lSDL2main -lSDL2_mixer - -main.o-mac : main.c +main.o : main.c gcc -std=c99 -I/opt/local/include -Wall -c main.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` -motifs.o-mac : motifs/motifs.c motifs/motifs.h +motifs.o : motifs/motifs.c motifs/motifs.h gcc -std=c99 -I/opt/local/include -Wall -c motifs/motifs.c -melodie.o-mac : melodie/melodie.c melodie/melodie.h +melodie.o : melodie/melodie.c melodie/melodie.h gcc -std=c99 -I/opt/local/include -Wall -c melodie/melodie.c -lecture.o-mac : lecture/lecture.c lecture/lecture.h - gcc -std=c99 -I/opt/local/include -Wall -c lecture/lecture.c - -# Pour linux, modifier les chemins des librairies et des include (j'ai juste fait un copier coller des chemins sur mac, je m'ai pas de quoi tester es chemins linux) - -main.o-linux : main.c - gcc -std=c99 -I/opt/local/include -Wall -c main.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` - -motifs.o-linux : motifs/motifs.c motifs/motifs.h - gcc -std=c99 -I/opt/local/include -Wall -c motifs/motifs.c - -melodie.o-linux : melodie/melodie.c melodie/melodie.h - gcc -std=c99 -I/opt/local/include -Wall -c melodie/melodie.c - -lecture.o-linux : lecture/lecture.c lecture/lecture.h +lecture.o : lecture/lecture.c lecture/lecture.h gcc -std=c99 -I/opt/local/include -Wall -c lecture/lecture.c clean : diff --git a/sources/lecture/lecture.c b/sources/lecture/lecture.c index 944b20b..a05a33d 100644 --- a/sources/lecture/lecture.c +++ b/sources/lecture/lecture.c @@ -1,6 +1,3 @@ -#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 @@ -32,5 +29,3 @@ void lecture (int nombreChaines, Motif* melodie[]) { Mix_CloseAudio(); SDL_Quit(); } - -#endif diff --git a/sources/main.c b/sources/main.c index 0b3133d..72a0f8a 100644 --- a/sources/main.c +++ b/sources/main.c @@ -55,7 +55,7 @@ int main( int argc, char *argv[] ){ gtk_builder_add_from_file( monBuilder, "GUI/ponytracker.glade", NULL); gtk_builder_connect_signals( monBuilder, NULL); - maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetrePrincipale")); + maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetreprincipale")); gtk_widget_show_all (maFenetre); gtk_main(); @@ -74,7 +74,7 @@ void fenetreSample ( int argc, char *argv[] ) gtk_builder_add_from_file( monBuilderSample, "GUI/ponytracker.glade", NULL); gtk_builder_connect_signals( monBuilderSample, NULL); - maFenetreSample = GTK_WIDGET( gtk_builder_get_object( monBuilderSample, "ajoutSample")); + maFenetreSample = GTK_WIDGET( gtk_builder_get_object( monBuilderSample, "ajoutsample")); gtk_widget_show_all (maFenetreSample); } @@ -91,7 +91,7 @@ void fenetreInstrument ( int argc, char *argv[] ) gtk_builder_add_from_file( monBuilderInstrument, "GUI/ponytracker.glade", NULL); gtk_builder_connect_signals( monBuilderInstrument, NULL); - maFenetreInstrument = GTK_WIDGET( gtk_builder_get_object( monBuilderInstrument, "ajoutInstrument")); + maFenetreInstrument = GTK_WIDGET( gtk_builder_get_object( monBuilderInstrument, "ajoutinstrument")); gtk_widget_show_all (maFenetreInstrument); } @@ -108,7 +108,7 @@ void fenetreMotif ( int argc, char *argv[] ) gtk_builder_add_from_file( monBuilderMotif, "GUI/ponytracker.glade", NULL); gtk_builder_connect_signals( monBuilderMotif, NULL); - maFenetreMotif = GTK_WIDGET( gtk_builder_get_object( monBuilderMotif, "ajoutMotif")); + maFenetreMotif = GTK_WIDGET( gtk_builder_get_object( monBuilderMotif, "ajoutmotif")); gtk_widget_show_all (maFenetreMotif); } @@ -121,5 +121,5 @@ void lancerLecture () courant = 0; taille = 0; debut(melodie, liste, nbrPortees); - //lecture(nbrPortees,melodie);*/ + lecture(nbrPortees,melodie); }