From fd8273277eebc9c95b365e8cc1b35e5de8311ae7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 28 Dec 2016 05:42:29 +0000 Subject: [PATCH] Fix typo; Fix windows build with wine-staging --- source/plugin/Makefile | 4 ++++ source/utils/CarlaLogThread.hpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/plugin/Makefile b/source/plugin/Makefile index 8d582b3df..8442e7b2f 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -199,7 +199,11 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(LIBS) @$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(LINK_FLAGS) -o $(BINDIR)/carla-lv2-export$(APP_EXT) @echo "Generating LV2 ttl data" +ifeq ($(BUILDING_FOR_WINDOWS),true) + @cd $(BINDIR) && wine ./carla-lv2-export$(APP_EXT) +else @cd $(BINDIR) && ./carla-lv2-export$(APP_EXT) +endif @cd $(BINDIR)/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* . $(BINDIR)/carla-lv2-export$(APP_EXT): $(OBJDIR)/carla-lv2-export.cpp.o $(LIBS) diff --git a/source/utils/CarlaLogThread.hpp b/source/utils/CarlaLogThread.hpp index 35611c1e1..3462c87ac 100644 --- a/source/utils/CarlaLogThread.hpp +++ b/source/utils/CarlaLogThread.hpp @@ -94,7 +94,7 @@ public: void stop() { - if (fStdOut != -1) + if (fStdOut == -1) return; stopThread(5000);