Change packing, include nknob.c in build

This commit is contained in:
Nick Lanham 2012-02-22 12:53:52 +01:00
parent 57dae2306c
commit 8081a768c4
2 changed files with 4 additions and 4 deletions

View File

@ -10,8 +10,8 @@ $(BUNDLE): manifest.ttl drmr.ttl drmr.so drmr_ui.so knob.png
drmr.so: drmr.c drmr_hydrogen.c drmr.so: drmr.c drmr_hydrogen.c
$(CC) -shared -Wall -fPIC -DPIC drmr.c drmr_hydrogen.c `pkg-config --cflags --libs lv2-plugin sndfile samplerate` -lexpat -lm -o drmr.so $(CC) -shared -Wall -fPIC -DPIC drmr.c drmr_hydrogen.c `pkg-config --cflags --libs lv2-plugin sndfile samplerate` -lexpat -lm -o drmr.so
drmr_ui.so: drmr_ui.c drmr_hydrogen.c drmr_ui.so: drmr_ui.c drmr_hydrogen.c nknob.c
$(CC) -shared -Wall -fPIC -DPIC drmr_ui.c drmr_hydrogen.c `pkg-config --cflags --libs lv2-plugin gtk+-2.0 sndfile samplerate` -lexpat -lm -o drmr_ui.so $(CC) -DINSTALL_DIR=\"$(INSTALL_DIR)\" -shared -Wall -fPIC -DPIC drmr_ui.c drmr_hydrogen.c nknob.c `pkg-config --cflags --libs lv2-plugin gtk+-2.0 sndfile samplerate` -lexpat -lm -o drmr_ui.so
htest: drmr_hydrogen.c htest: drmr_hydrogen.c
$(CC) -D_TEST_HYDROGEN_PARSER -Wall -fPIC -DPIC drmr_hydrogen.c `pkg-config --cflags --libs sndfile samplerate` -lexpat -lm -o htest $(CC) -D_TEST_HYDROGEN_PARSER -Wall -fPIC -DPIC drmr_hydrogen.c `pkg-config --cflags --libs sndfile samplerate` -lexpat -lm -o htest

View File

@ -125,10 +125,10 @@ static void fill_sample_table(DrMrUi* ui, int samples, char** names,GtkWidget**
pan_label = gtk_label_new("Pan"); pan_label = gtk_label_new("Pan");
pan_vbox = gtk_vbox_new(false,0); pan_vbox = gtk_vbox_new(false,0);
gtk_box_pack_start(GTK_BOX(gain_vbox),gain_slider,true,true,0); gtk_box_pack_start(GTK_BOX(gain_vbox),gain_slider,false,false,0);
gtk_box_pack_start(GTK_BOX(gain_vbox),gain_label,false,false,0); gtk_box_pack_start(GTK_BOX(gain_vbox),gain_label,false,false,0);
gtk_box_pack_start(GTK_BOX(pan_vbox),pan_slider,true,true,0); gtk_box_pack_start(GTK_BOX(pan_vbox),pan_slider,false,false,0);
gtk_box_pack_start(GTK_BOX(pan_vbox),pan_label,false,false,0); gtk_box_pack_start(GTK_BOX(pan_vbox),pan_label,false,false,0);
gtk_box_pack_start(GTK_BOX(hbox),gain_vbox,true,true,0); gtk_box_pack_start(GTK_BOX(hbox),gain_vbox,true,true,0);