raspbeguy
/
ponytracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Résolution de 2 BIG PROBLÈMES. Conclusion, les majuscules et les doubles makefile c'est pas des bonnes idées.

This commit is contained in:
Raspbeguy 2014-04-09 19:32:30 +02:00
parent 044c01d85d
commit 37e7572d44
4 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/GUI/ponytracker.glade
View File

@ -2,7 +2,7 @@
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.6"/>
<object class="GtkWindow" id="ajoutInstrument">
<object class="GtkWindow" id="ajoutinstrument">
<property name="can_focus">False</property>
<child>
<object class="GtkGrid" id="grid4">
@ -439,7 +439,7 @@
</object>
</child>
</object>
<object class="GtkWindow" id="ajoutMotif">
<object class="GtkWindow" id="ajoutmotif">
<property name="can_focus">False</property>
<child>
<object class="GtkGrid" id="grid7">
@ -968,7 +968,7 @@
</object>
</child>
</object>
<object class="GtkWindow" id="ajoutSample">
<object class="GtkWindow" id="ajoutsample">
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="box1">
@ -1528,7 +1528,7 @@
</object>
</child>
</object>
<object class="GtkWindow" id="fenetrePrincipale">
<object class="GtkWindow" id="fenetreprincipale">
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="box2">

31
sources/Makefile
View File

@ -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 :

5
sources/lecture/lecture.c
View File

@ -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

10
sources/main.c
View File

@ -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);
}