Misc

falkTX · Aug 12, 2014 · af44f4f · af44f4f
1 parent b9d4b4b
commit af44f4f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh
@@ -14,15 +14,13 @@ fi
 export WIN32=true
 
 export PATH=$MINGW_PATH/bin:$MINGW_PATH/$MINGW/bin:$PATH
-export AR=$MINGW-ar
 export CC=$MINGW-gcc
 export CXX=$MINGW-g++
-export MOC=$MINGW-moc
-export RCC=$MINGW-rcc
-export UIC=$MINGW-uic
-export STRIP=$MINGW-strip
 export WINDRES=$MINGW-windres
 
+export CFLAGS=-DPTW32_STATIC_LIB
+export CXXFLAGS=-DPTW32_STATIC_LIB
+
 export WINEARCH=win32
 export WINEPREFIX=~/.winepy3_x86
 export PYTHON_EXE="wine C:\\\\Python34\\\\python.exe"

diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh
@@ -15,15 +15,13 @@ export WIN32=true
 export WIN64=true
 
 export PATH=$MINGW_PATH/bin:$MINGW_PATH/$MINGW/bin:$PATH
-export AR=$MINGW-ar
 export CC=$MINGW-gcc
 export CXX=$MINGW-g++
-export MOC=$MINGW-moc
-export RCC=$MINGW-rcc
-export UIC=$MINGW-uic
-export STRIP=$MINGW-strip
 export WINDRES=$MINGW-windres
 
+export CFLAGS=-DPTW32_STATIC_LIB
+export CXXFLAGS=-DPTW32_STATIC_LIB
+
 export WINEARCH=win64
 export WINEPREFIX=~/.winepy3_x64
 export PYTHON_EXE="wine C:\\\\Python34\\\\python.exe"

diff --git a/source/backend/engine/CarlaEngineJuce.cpp b/source/backend/engine/CarlaEngineJuce.cpp
@@ -80,7 +80,13 @@ class CarlaEngineJuce : public CarlaEngine,
     CarlaEngineJuce(AudioIODeviceType* const devType)
         : CarlaEngine(),
           AudioIODeviceCallback(),
-          fDeviceType(devType)
+          fDevice(),
+          fDeviceType(devType),
+          fMidiIns(),
+          fMidiInEvents(),
+          fMidiOuts(),
+          fMidiOutMutex(),
+          leakDetector_CarlaEngineJuce()
     {
         carla_debug("CarlaEngineJuce::CarlaEngineJuce(%p)", devType);
 
@@ -761,7 +767,8 @@ class CarlaEngineJuce : public CarlaEngine,
         RtLinkedList<RtMidiEvent> dataPending;
 
         RtMidiEvents()
-            : dataPool(512, 512),
+            : mutex(),
+              dataPool(512, 512),
               data(dataPool),
               dataPending(dataPool) {}
 
@@ -797,7 +804,7 @@ class CarlaEngineJuce : public CarlaEngine,
     LinkedList<MidiOutPort> fMidiOuts;
     CarlaMutex              fMidiOutMutex;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaEngineJuce)
+    CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaEngineJuce)
 };
 
 // -----------------------------------------

diff --git a/source/backend/plugin/LinuxSamplerPlugin.cpp b/source/backend/plugin/LinuxSamplerPlugin.cpp
@@ -471,7 +471,7 @@ class LinuxSamplerPlugin : public CarlaPlugin
     {
         CARLA_SAFE_ASSERT_RETURN(index >= -1 && index < static_cast<int32_t>(pData->prog.count),);
 
-        const int8_t channel(kIsGIG ? pData->ctrlChannel : 0);
+        const int8_t channel(kIsGIG ? pData->ctrlChannel : int8_t(0));
 
         if (index >= 0 && channel >= 0 && channel < MAX_MIDI_CHANNELS)
         {