Merge pull request #2 from rolandoislas/develop

Merge develop into master
rolandoislas · Jan 2, 2016 · bfdf72b · bfdf72b
2 parents de54174 + 6c5d8e9
commit bfdf72b
Show file tree

Hide file tree

Showing 7 changed files with 279 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 Builds/
-JuceLibraryCode/
+JuceLibraryCode/
+lib/
diff --git a/LightHost.jucer b/LightHost.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="NTe0XB0ij" name="Light Host" projectType="guiapp" version="1.0.0"
+<JUCERPROJECT id="NTe0XB0ij" name="Light Host" projectType="guiapp" version="1.1.0"
               juceLinkage="amalg_multi" juceFolder="../../../juce" buildVST="1"
               buildRTAS="0" buildAU="1" vstFolderMac="~/SDKs/vstsdk2.4" vstFolderPC="c:\SDKs\vstsdk2.4"
               rtasFolderMac="~/SDKs/PT_80_SDK" rtasFolderPC="c:\SDKs\PT_80_SDK"
@@ -24,22 +24,94 @@
                        headerPath="" cppLanguageStandard="c++11" cppLibType="libc++"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
-        <MODULEPATH id="juce_video" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_opengl" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_gui_extra" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_gui_basics" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_graphics" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_events" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_data_structures" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_cryptography" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_core" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_audio_utils" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_audio_processors" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_audio_formats" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_audio_devices" path="../../../../Applications/Projucer/modules"/>
-        <MODULEPATH id="juce_audio_basics" path="../../../../Applications/Projucer/modules"/>
+        <MODULEPATH id="juce_video" path="lib\juce"/>
+        <MODULEPATH id="juce_opengl" path="lib\juce"/>
+        <MODULEPATH id="juce_gui_extra" path="lib\juce"/>
+        <MODULEPATH id="juce_gui_basics" path="lib\juce"/>
+        <MODULEPATH id="juce_graphics" path="lib\juce"/>
+        <MODULEPATH id="juce_events" path="lib\juce"/>
+        <MODULEPATH id="juce_data_structures" path="lib\juce"/>
+        <MODULEPATH id="juce_cryptography" path="lib\juce"/>
+        <MODULEPATH id="juce_core" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_utils" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_processors" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_formats" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_devices" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_basics" path="lib\juce"/>
       </MODULEPATHS>
     </XCODE_MAC>
+    <VS2015 targetFolder="Builds/VisualStudio2015" vstFolder="" vst3Folder=""
+            smallIcon="pmwje3" bigIcon="kxxp8K" userNotes="Place ASIO SDK headers in juce folder.">
+      <CONFIGURATIONS>
+        <CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
+                       isDebug="1" optimisation="1" targetName="Light Host"/>
+        <CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
+                       isDebug="0" optimisation="3" targetName="Light Host"/>
+      </CONFIGURATIONS>
+      <MODULEPATHS>
+        <MODULEPATH id="juce_video" path="lib\juce"/>
+        <MODULEPATH id="juce_opengl" path="lib\juce"/>
+        <MODULEPATH id="juce_gui_extra" path="lib\juce"/>
+        <MODULEPATH id="juce_gui_basics" path="lib\juce"/>
+        <MODULEPATH id="juce_graphics" path="lib\juce"/>
+        <MODULEPATH id="juce_events" path="lib\juce"/>
+        <MODULEPATH id="juce_data_structures" path="lib\juce"/>
+        <MODULEPATH id="juce_cryptography" path="lib\juce"/>
+        <MODULEPATH id="juce_core" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_utils" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_processors" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_formats" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_devices" path="lib\juce"/>
+        <MODULEPATH id="juce_audio_basics" path="lib\juce"/>
+      </MODULEPATHS>
+    </VS2015>
+    <CODEBLOCKS_LINUX targetFolder="Builds/CodeBlocksLinux" vstFolder="" vst3Folder=""
+                      smallIcon="pmwje3" bigIcon="kxxp8K" userNotes="Header search path for Steinberg SDK not being added to codeblocks.">
+      <CONFIGURATIONS>
+        <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="Light Host"/>
+        <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="Light Host"/>
+      </CONFIGURATIONS>
+      <MODULEPATHS>
+        <MODULEPATH id="juce_video" path="lib/juce"/>
+        <MODULEPATH id="juce_opengl" path="lib/juce"/>
+        <MODULEPATH id="juce_gui_extra" path="lib/juce"/>
+        <MODULEPATH id="juce_gui_basics" path="lib/juce"/>
+        <MODULEPATH id="juce_graphics" path="lib/juce"/>
+        <MODULEPATH id="juce_events" path="lib/juce"/>
+        <MODULEPATH id="juce_data_structures" path="lib/juce"/>
+        <MODULEPATH id="juce_cryptography" path="lib/juce"/>
+        <MODULEPATH id="juce_core" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_utils" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_processors" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_formats" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_devices" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_basics" path="lib/juce"/>
+      </MODULEPATHS>
+    </CODEBLOCKS_LINUX>
+    <LINUX_MAKE targetFolder="Builds/LinuxMakefile" vstFolder="" vst3Folder="">
+      <CONFIGURATIONS>
+        <CONFIGURATION name="Debug" libraryPath="/usr/X11R6/lib/" isDebug="1" optimisation="1"
+                       targetName="Light Host"/>
+        <CONFIGURATION name="Release" libraryPath="/usr/X11R6/lib/" isDebug="0" optimisation="3"
+                       targetName="Light Host"/>
+      </CONFIGURATIONS>
+      <MODULEPATHS>
+        <MODULEPATH id="juce_video" path="lib/juce"/>
+        <MODULEPATH id="juce_opengl" path="lib/juce"/>
+        <MODULEPATH id="juce_gui_extra" path="lib/juce"/>
+        <MODULEPATH id="juce_gui_basics" path="lib/juce"/>
+        <MODULEPATH id="juce_graphics" path="lib/juce"/>
+        <MODULEPATH id="juce_events" path="lib/juce"/>
+        <MODULEPATH id="juce_data_structures" path="lib/juce"/>
+        <MODULEPATH id="juce_cryptography" path="lib/juce"/>
+        <MODULEPATH id="juce_core" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_utils" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_processors" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_formats" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_devices" path="lib/juce"/>
+        <MODULEPATH id="juce_audio_basics" path="lib/juce"/>
+      </MODULEPATHS>
+    </LINUX_MAKE>
   </EXPORTFORMATS>
   <MAINGROUP id="YdWL7hi7p" name="Light Host">
     <GROUP id="{1B23ABDC-E658-7C9C-3584-0C960D2AE323}" name="Source">
@@ -63,7 +135,7 @@
                JUCE_QUICKTIME="disabled" JUCE_USE_FLAC="disabled" JUCE_USE_OGGVORBIS="disabled"
                JUCE_USE_CDBURNER="disabled" JUCE_USE_CDREADER="disabled" JUCE_USE_CAMERA="disabled"
                JUCE_PLUGINHOST_VST="enabled" JUCE_PLUGINHOST_AU="enabled" JUCE_WEB_BROWSER="disabled"
-               JUCE_PLUGINHOST_VST3="enabled"/>
+               JUCE_PLUGINHOST_VST3="enabled" JUCE_ASIO="enabled"/>
   <MODULES>
     <MODULE id="juce_audio_basics" showAllCode="1"/>
     <MODULE id="juce_audio_devices" showAllCode="1"/>
@@ -82,5 +154,6 @@
   </MODULES>
   <LIVE_SETTINGS>
     <OSX headerPath=""/>
+    <WINDOWS/>
   </LIVE_SETTINGS>
 </JUCERPROJECT>
diff --git a/Source/HostStartup.cpp b/Source/HostStartup.cpp
@@ -23,7 +23,9 @@ class PluginHostApp  : public JUCEApplication
         LookAndFeel::setDefaultLookAndFeel (&lookAndFeel);
 
         mainWindow = new IconMenu();
-        Process::setDockIconVisible(false);
+		#if JUCE_MAC
+			Process::setDockIconVisible(false);
+		#endif
 
         File fileToOpen;