From 3da54244eaa20acb6975835bcaa0b520eb8e80ec Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 5 Feb 2022 16:04:32 +0100 Subject: [PATCH] FIX smf-tool compilation (library ordering) --- tools/smf-load/makefile | 11 +++++++---- tools/smf-load/smfload.cc | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/smf-load/makefile b/tools/smf-load/makefile index 3738776773..a993db0a88 100644 --- a/tools/smf-load/makefile +++ b/tools/smf-load/makefile @@ -3,11 +3,14 @@ CXXFLAGS = -Wall CPPFLAGS = -I $(AD)/libs/evoral -I $(AD)/libs/pbd -I $(AD)/build/libs/pbd CPPFLAGS += `pkg-config --cflags libxml-2.0 glibmm-2.4` -LDFLAGS = -L $(AD)/build/libs/pbd -lpbd -Xlinker -rpath=$(AD)/build/libs/pbd -LDFLAGS += -L $(AD)/build/libs/temporal -ltemporal -Xlinker -rpath=$(AD)/build/libs/temporal -LDFLAGS += -L $(AD)/build/libs/evoral -levoral -Xlinker -rpath=$(AD)/build/libs/evoral +LDFLAGS = -L $(AD)/build/libs/pbd +LDFLAGS += -L $(AD)/build/libs/temporal +LDFLAGS += -L $(AD)/build/libs/evoral -LDLIBS = `pkg-config --libs libxml-2.0 glibmm-2.4` +LDLIBS = -lpbd -Xlinker -rpath=$(AD)/build/libs/pbd +LDLIBS += -ltemporal -Xlinker -rpath=$(AD)/build/libs/temporal +LDLIBS += -levoral -Xlinker -rpath=$(AD)/build/libs/evoral +LDLIBS += `pkg-config --libs libxml-2.0 glibmm-2.4` smfload: smfload.cc libevoral $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ smfload.cc $(LDLIBS) diff --git a/tools/smf-load/smfload.cc b/tools/smf-load/smfload.cc index 3fc82d2f65..6e8ffdcfad 100644 --- a/tools/smf-load/smfload.cc +++ b/tools/smf-load/smfload.cc @@ -21,7 +21,7 @@ main (int argc, char** argv) #if 0 Evoral::SMF smf; smf.open (fn); - printf ("SMF '%s' tracks=%d, ppqn=%d\n", fn, smf.num_tracks (), smf.ppqn()); + printf ("SMF '%s' tracks=%d, ppqn=%d (n_notes: %ld)\n", fn, smf.num_tracks (), smf.ppqn(), smf.n_note_on_events ()); #else FILE* f = g_fopen(fn, "r"); if (!f) {