Browse Source

Fix typo; Fix windows build with wine-staging

tags/1.9.7
falkTX 8 years ago
parent
commit
fd8273277e
2 changed files with 5 additions and 1 deletions
  1. +4
    -0
      source/plugin/Makefile
  2. +1
    -1
      source/utils/CarlaLogThread.hpp

+ 4
- 0
source/plugin/Makefile View File

@@ -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)


+ 1
- 1
source/utils/CarlaLogThread.hpp View File

@@ -94,7 +94,7 @@ public:

void stop()
{
if (fStdOut != -1)
if (fStdOut == -1)
return;

stopThread(5000);


Loading…
Cancel
Save