diff --git a/mixer/makefile.inc b/mixer/makefile.inc index 746584d..b8b30aa 100644 --- a/mixer/makefile.inc +++ b/mixer/makefile.inc @@ -10,7 +10,7 @@ Mixer_OBJS:=$(Mixer_SRCS:.C=.o) Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS) -src/mixer: $(Mixer_OBJS) FL nonlib +src/mixer: $(Mixer_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a @ echo -n Linking mixer... @ $(CXX) $(CXXFLAGS) $(Mixer_LIBS) $(Mixer_OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) diff --git a/timeline/makefile.inc b/timeline/makefile.inc index d9eb45e..f6325b0 100644 --- a/timeline/makefile.inc +++ b/timeline/makefile.inc @@ -12,7 +12,7 @@ Timeline_OBJS:=$(Timeline_SRCS:.C=.o) Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) -src/timeline: $(Timeline_OBJS) FL +src/timeline: $(Timeline_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a @ echo -n Linking timeline... @ $(CXX) $(CXXFLAGS) $(INCLUDES) $(Timeline_LIBS) $(Timeline_OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) diff --git a/timeline/src/TLE.fl b/timeline/src/TLE.fl index 7a3f5ad..f2b7859 100644 --- a/timeline/src/TLE.fl +++ b/timeline/src/TLE.fl @@ -24,7 +24,7 @@ comment {// decl {const float STATUS_UPDATE_FREQ = 0.1f;} {} -decl {\#include "Fl_Menu_Settings.H"} {} +decl {\#include "Fl_Menu_Settings.H"} {} decl {\#include "color_scheme.H"} {} @@ -715,7 +715,7 @@ ab.run();} } Fl_Button seek_blinker { label SEEK - xywh {640 50 50 15} box ROUNDED_BOX down_box ROUNDED_BOX color 10 selection_color 2 labelfont 2 labelcolor 39 deactivate + xywh {640 50 50 15} box ROUNDED_BOX down_box ROUNDED_BOX color 10 selection_color 2 labelfont 2 labelcolor 39 deactivate hide code0 {\#include "FL/Fl_Blinker.H"} code1 {o->interval( Fl_Blinker::FAST );} class Fl_Blinker