| @@ -21,7 +21,7 @@ FL: FL/libfl_widgets.a | |||||
| ntk-chtheme: ntk-chtheme.o $(FLTK_LIBS) FL/libfl_widgets.a | ntk-chtheme: ntk-chtheme.o $(FLTK_LIBS) FL/libfl_widgets.a | ||||
| @ echo -n Linking session handler. | @ echo -n Linking session handler. | ||||
| @ $(CXX) $(CXXFLAGS) $(FLTK_LDFLAGS) $(LIBS) $^ -o $@ -LFL -lfl_widgets && echo $(DONE) | |||||
| @ $(CXX) $(CXXFLAGS) $^ -o $@ $(FLTK_LDFLAGS) $(LIBS) -LFL -lfl_widgets && echo $(DONE) | |||||
| clean: | clean: | ||||
| rm -f $(OBJS) FL/libfl_widgets.a .deps | rm -f $(OBJS) FL/libfl_widgets.a .deps | ||||
| @@ -18,7 +18,7 @@ CFLAGS += $(FLTK_CFLAGS) $(JACK_CFLAGS) $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_C | |||||
| src/mixer: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) | src/mixer: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) | ||||
| @ echo -n Linking mixer... | @ echo -n Linking mixer... | ||||
| @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) | |||||
| @ $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) | |||||
| Mixer: src/mixer | Mixer: src/mixer | ||||
| @@ -29,7 +29,7 @@ clean: | |||||
| src/sequencer: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) | src/sequencer: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) | ||||
| @ echo -n Linking sequencer... | @ echo -n Linking sequencer... | ||||
| @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) | |||||
| $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) | |||||
| ifeq ($(JACK_MIDI_PROTO_API),yes) | ifeq ($(JACK_MIDI_PROTO_API),yes) | ||||
| @@ -18,11 +18,11 @@ CFLAGS += $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS) $(FLTK_CFLAGS) | |||||
| src/nsmd: src/nsmd.o nonlib/libnonlib.a | src/nsmd: src/nsmd.o nonlib/libnonlib.a | ||||
| @ echo -n Linking session handler. | @ echo -n Linking session handler. | ||||
| @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -Lnonlib -lnonlib && echo $(DONE) | |||||
| @ $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -Lnonlib -lnonlib && echo $(DONE) | |||||
| src/session-manager: src/session-manager.o nonlib/libnonlib.a $(FLTK_LIBS) | src/session-manager: src/session-manager.o nonlib/libnonlib.a $(FLTK_LIBS) | ||||
| @ echo -n Linking session handler. | @ echo -n Linking session handler. | ||||
| @ $(CXX) $(CXXFLAGS) $(FLTK_LDFLAGS) $(XPM_LIBS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) | |||||
| @ $(CXX) $(CXXFLAGS) $^ -o $@ $(FLTK_LDFLAGS) $(XPM_LIBS) $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) | |||||
| src/nsm-proxy: src/nsm-proxy.o nonlib/libnonlib.a | src/nsm-proxy: src/nsm-proxy.o nonlib/libnonlib.a | ||||
| @ echo -n Linking NSM Proxy. | @ echo -n Linking NSM Proxy. | ||||
| @@ -36,10 +36,10 @@ src/nsm-proxy-gui: src/NSM_Proxy_UI.o src/nsm-proxy-gui.o nonlib/libnonlib.a $(F | |||||
| @ $(CXX) $(CXXFLAGS) $(FLTK_LDFLAGS) $(XPM_LIBS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) | @ $(CXX) $(CXXFLAGS) $(FLTK_LDFLAGS) $(XPM_LIBS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) | ||||
| src/send_osc: src/send_osc.o nonlib/libnonlib.a | src/send_osc: src/send_osc.o nonlib/libnonlib.a | ||||
| @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -Lnonlib -lnonlib && echo $(DONE) | |||||
| @ $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -Lnonlib -lnonlib && echo $(DONE) | |||||
| src/jackpatch: src/jackpatch.o | src/jackpatch: src/jackpatch.o | ||||
| @ $(CXX) $(CXXFLAGS) $(JACK_LIBS) $(LIBLO_LIBS) $^ -o $@ && echo $(DONE) | |||||
| @ $(CXX) $(CXXFLAGS) $^ -o $@ $(JACK_LIBS) $(LIBLO_LIBS) && echo $(DONE) | |||||
| Session: src/send_osc src/nsmd src/session-manager src/jackpatch src/nsm-proxy src/nsm-proxy-gui | Session: src/send_osc src/nsmd src/session-manager src/jackpatch src/nsm-proxy src/nsm-proxy-gui | ||||
| @@ -31,7 +31,7 @@ endif | |||||
| src/timeline: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) | src/timeline: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) | ||||
| @ echo -n Linking timeline... | @ echo -n Linking timeline... | ||||
| @ $(CXX) $(CXXFLAGS) $(INCLUDES) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) | |||||
| $(CXX) $(CXXFLAGS) $(INCLUDES) $^ -o $@ $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) | |||||
| Timeline: src/timeline | Timeline: src/timeline | ||||