Merge pull request #185 from keinstein/keinsteins_fixes

Keinsteins fixes

.gitignore

@@ -1,6 +1,8 @@
 Source/Core/CtrlrRevision.h
 Source/Misc/boost/**
 !Source/Misc/boost/boost.zip
-Builds/VisualStudio2017/**
-!Builds/VisualStudio2017/Ctrlr.sln
-!Builds/VisualStudio2017/resources.rc
+
+Builds/*/*/*
+
+CMakeFiles
+CMakeCache.txt

Builds/LinuxMakefile/Makefile

@@ -40,29 +40,29 @@ ifeq ($(CONFIG),Debug)
   JUCE_CPPFLAGS_VST :=  "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
   JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden
   JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined
-  JUCE_TARGET_VST := Ctrlr.so
+  JUCE_TARGET_VST := Ctrlr-Debug.so
   JUCE_VSTDESTDIR := $(HOME)/.vst
-  JUCE_COPYCMD_VST := $(JUCE_OUTDIR)/Ctrlr.so $(JUCE_VSTDESTDIR)
+  JUCE_COPYCMD_VST := $(JUCE_OUTDIR)/Ctrlr-Debug.so $(JUCE_VSTDESTDIR)
 
   JUCE_CPPFLAGS_VST3 :=  "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=1" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
   JUCE_CFLAGS_VST3 := -fPIC -fvisibility=hidden
   JUCE_LDFLAGS_VST3 := -shared -Wl,--no-undefined
-  JUCE_VST3DIR := Ctrlr.vst3
+  JUCE_VST3DIR := Ctrlr-Debug.vst3
   VST3_PLATFORM_ARCH := $(shell $(CXX) make_helpers/arch_detection.cpp 2>&1 | tr '\n' ' ' | sed "s/.*JUCE_ARCH \([a-zA-Z0-9_-]*\).*/\1/")
   JUCE_VST3SUBDIR := Contents/$(VST3_PLATFORM_ARCH)-linux
-  JUCE_TARGET_VST3 := $(JUCE_VST3DIR)/$(JUCE_VST3SUBDIR)/Ctrlr.so
+  JUCE_TARGET_VST3 := $(JUCE_VST3DIR)/$(JUCE_VST3SUBDIR)/Ctrlr-Debug.so
   JUCE_VST3DESTDIR := $(HOME)/.vst3
   JUCE_COPYCMD_VST3 := $(JUCE_OUTDIR)/$(JUCE_VST3DIR) $(JUCE_VST3DESTDIR)
 
   JUCE_CPPFLAGS_STANDALONE_PLUGIN :=  "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=1" "-DJucePlugin_Build_Unity=0"
-  JUCE_TARGET_STANDALONE_PLUGIN := Ctrlr
+  JUCE_TARGET_STANDALONE_PLUGIN := Ctrlr-Debug
 
   JUCE_CPPFLAGS_SHARED_CODE :=  "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=1" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=1" "-DJucePlugin_Build_Unity=0" "-DJUCE_SHARED_CODE=1"
-  JUCE_TARGET_SHARED_CODE := Ctrlr.a
+  JUCE_TARGET_SHARED_CODE := Ctrlr-Debug.a
 
-  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -g -ggdb -O0 -w $(CFLAGS)
+  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -g -ggdb -O0 -Wall -Wextra -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wsign-compare -Woverloaded-virtual -Wreorder -Wsign-conversion -Wunreachable-code -Wzero-as-null-pointer-constant -Wcast-align -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-ignored-qualifiers -Wswitch-enum -Wredundant-decls -w $(CFLAGS)
   JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=gnu++14 $(CXXFLAGS)
-  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -lrt -ldl -lpthread -lz -ludev -lbfd $(LDFLAGS)
+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -lrt -ldl -lpthread -ludev -l:libbfd.a -liberty -lz -lX11 $(LDFLAGS)
 
   CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
 endif
@@ -104,7 +104,7 @@ ifeq ($(CONFIG),Release)
 
   JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -O3 -w $(CFLAGS)
   JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=gnu++14 $(CXXFLAGS)
-  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -lrt -ldl -lpthread -lz -ludev -lbfd $(LDFLAGS)
+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -lrt -ldl -lpthread -ludev -l:libbfd.a -liberty -lz -lX11 $(LDFLAGS)
 
   CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
 endif

Builds/LinuxMakefile/build.sh

@@ -1,52 +1,8 @@
 #!/bin/bash
-MAXJOBS=`cat /proc/cpuinfo | grep processor | wc -l`
+MAXJOBS=`nproc`
 echo "CTRLR[linux]: Building for $HOSTTYPE, JOBS $MAXJOBS"
-
-if [ "$1" == "-f" ]; then
-	echo "CTRLR[linux]: Compile PCH"
-	echo "stadfx.h"
-	g++  -w -std=c++14 -D "LINUX=1" -D "NDEBUG=1" \
-		-D "JUCE_FORCE_DEBUG=0" -D "CTRLR_NIGHTLY=1" \
-		-D "JucePlugin_Build_Standalone" -D "LUA_USE_LINUX" \
-		-D "_LINUX=1" -D "JUCER_LINUX_MAKE_CC96CACF=1" \
-		-I /usr/include -I /usr/include/freetype2 \
-		-I ../../JuceLibraryCode \
-		-I ../../JUCE/modules \
-		-I ../../Source/Misc/boost -I ../../../../Source/Lua/luabind \
-		-I ../../Source/Misc -I ../../../../Source/MIDI \
-		-I ../../Source -I ../../../../Source/UIComponents \
-		-I ../../Source/Core -I ../../../../Source/Plugin \
-		-I ../../Source/Application \
-		-I ../../Source/Misc/include \
-		-I ../../Source/Misc/lua/include \
-		-march=native -Os -fpermissive \
-		-o "../../Source/Core/stdafx.h.gch" -c "../../Source/Core/stdafx.h"
-	echo "stdafx_luabind.h"
-	g++  -w -std=c++14 -D "LINUX=1" -D "NDEBUG=1" \
-		-D "JUCE_FORCE_DEBUG=0" -D "CTRLR_NIGHTLY=1" \
-		-D "JucePlugin_Build_Standalone" -D "LUA_USE_LINUX" \
-		-D "_LINUX=1" -D "JUCER_LINUX_MAKE_CC96CACF=1" \
-		-I /usr/include -I /usr/include/freetype2 \
-		-I ../../JuceLibraryCode \
-		-I ../../JUCE/modules \
-		-I ../../Source/Misc/boost \
-		-I ../../Source/Misc/luabind \
-		-I ../../Source/Misc -I ../../../../Source/MIDI \
-		-I ../../Source -I ../../../../Source/UIComponents \
-		-I ../../Source/Core -I ../../../../Source/Plugin \
-		-I ../../Source/Application \
-		-I ../../Source/Misc/include \
-		-I ../../Source/Misc/lua/include \
-		-march=native -Os -fpermissive \
-		-o "../../Source/Core/stdafx_luabind.h.gch" -c "../../Source/Core/stdafx_luabind.h"
-else
-	echo "CTRLR[linux]: PCH not rebuilt, use -f to force"
-fi
-
-echo "CTRLR[linux]: Build now"
-echo
 #make -j$JOBS CONFIG=Release ARCH=$HOSTTYPE BINDIR=$BUILDDIR LIBDIR=$BUILDDIR OBJDIR=$BUILDDIR
-make CONFIG=Release -j$MAXJOBS
+make CONFIG=Release -j$MAXJOBS "$@"
 if [ $? -ne 0 ]; then
 	echo -e "CTRLR[linux]: build failed\n"
 	exit 1