Update project.

+ Update JUCE Librarys. + Support for VisualStudio2017 + Support to build Stand-alone executable program.
COx2 · Dec 7, 2017 · ad655ed · ad655ed
1 parent 7499f83
commit ad655ed
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 38 deletions.
diff --git a/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.sln b/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.sln
@@ -1,31 +1,36 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLSLPlugIn", "GLSLPlugIn.vcxproj", "{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2015
+
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLSLPlugIn - Standalone Plugin", "GLSLPlugIn_StandalonePlugin.vcxproj", "{13EFE056-BD0C-2DDC-B34F-FF75F87BD559}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3DF7A433-1875-F38E-F741-4102889384EE} = {3DF7A433-1875-F38E-F741-4102889384EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLSLPlugIn - VST", "GLSLPlugIn_VST.vcxproj", "{556A2753-05E1-AAB7-14DC-1E8D345211EC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3DF7A433-1875-F38E-F741-4102889384EE} = {3DF7A433-1875-F38E-F741-4102889384EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLSLPlugIn - Shared Code", "GLSLPlugIn_SharedCode.vcxproj", "{3DF7A433-1875-F38E-F741-4102889384EE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|Win32.Build.0 = Debug|Win32
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x64.ActiveCfg = Debug|x64
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x64.Build.0 = Debug|x64
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x86.ActiveCfg = Debug|Win32
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x86.Build.0 = Debug|Win32
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|Win32.ActiveCfg = Release|Win32
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|Win32.Build.0 = Release|Win32
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x64.ActiveCfg = Release|x64
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x64.Build.0 = Release|x64
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x86.ActiveCfg = Release|Win32
-		{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x86.Build.0 = Release|Win32
+		{556A2753-05E1-AAB7-14DC-1E8D345211EC}.Debug|x64.ActiveCfg = Debug|x64
+		{556A2753-05E1-AAB7-14DC-1E8D345211EC}.Debug|x64.Build.0 = Debug|x64
+		{556A2753-05E1-AAB7-14DC-1E8D345211EC}.Release|x64.ActiveCfg = Release|x64
+		{556A2753-05E1-AAB7-14DC-1E8D345211EC}.Release|x64.Build.0 = Release|x64
+		{13EFE056-BD0C-2DDC-B34F-FF75F87BD559}.Debug|x64.ActiveCfg = Debug|x64
+		{13EFE056-BD0C-2DDC-B34F-FF75F87BD559}.Debug|x64.Build.0 = Debug|x64
+		{13EFE056-BD0C-2DDC-B34F-FF75F87BD559}.Release|x64.ActiveCfg = Release|x64
+		{13EFE056-BD0C-2DDC-B34F-FF75F87BD559}.Release|x64.Build.0 = Release|x64
+		{3DF7A433-1875-F38E-F741-4102889384EE}.Debug|x64.ActiveCfg = Debug|x64
+		{3DF7A433-1875-F38E-F741-4102889384EE}.Debug|x64.Build.0 = Debug|x64
+		{3DF7A433-1875-F38E-F741-4102889384EE}.Release|x64.ActiveCfg = Release|x64
+		{3DF7A433-1875-F38E-F741-4102889384EE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/GLSLPlugIn/Builds/VisualStudio2015/resources.rc b/GLSLPlugIn/Builds/VisualStudio2015/resources.rc
@@ -14,6 +14,7 @@ BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "CompanyName",  "JUCE JAPAN\0"
+      VALUE "LegalCopyright",  "JUCE JAPAN\0"
       VALUE "FileDescription",  "GLSLPlugIn\0"
       VALUE "FileVersion",  "1.0.0\0"
       VALUE "ProductName",  "GLSLPlugIn\0"

diff --git a/GLSLPlugIn/GLSLPlugIn.jucer b/GLSLPlugIn/GLSLPlugIn.jucer
@@ -9,8 +9,8 @@
               pluginProducesMidiOut="0" pluginIsMidiEffectPlugin="0" pluginEditorRequiresKeys="1"
               pluginAUExportPrefix="GLSLPlugInAU" pluginRTASCategory="" aaxIdentifier="com.yourcompany.GLSLPlugIn"
               pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.2.0"
-              companyName="JUCE JAPAN" displaySplashScreen="0" reportAppUsage="1"
-              splashScreenColour="Dark" buildStandalone="0" enableIAA="0" cppLanguageStandard="14"
+              companyName="JUCE JAPAN" displaySplashScreen="0" reportAppUsage="0"
+              splashScreenColour="Dark" buildStandalone="1" enableIAA="0" cppLanguageStandard="14"
               companyCopyright="JUCE JAPAN">
   <MAINGROUP id="WmusS6" name="GLSLPlugIn">
     <GROUP id="{62F07D67-6522-5A3F-73EE-B626DF753D2B}" name="Source">
@@ -38,13 +38,41 @@
     </GROUP>
   </MAINGROUP>
   <EXPORTFORMATS>
+    <VS2017 targetFolder="Builds/VisualStudio2017" windowsTargetPlatformVersion="10.0.16299.0">
+      <CONFIGURATIONS>
+        <CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
+                       debugInformationFormat="ProgramDatabase" enablePluginBinaryCopyStep="0"
+                       linkTimeOptimisation="0" isDebug="1" optimisation="1" targetName="GLSLPlugIn"/>
+        <CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
+                       debugInformationFormat="ProgramDatabase" enablePluginBinaryCopyStep="0"
+                       linkTimeOptimisation="1" isDebug="0" optimisation="3" targetName="GLSLPlugIn"/>
+      </CONFIGURATIONS>
+      <MODULEPATHS>
+        <MODULEPATH id="juce_video" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_opengl" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_gui_extra" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_gui_basics" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_graphics" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_events" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_dsp" path="../../../../../../../Applications/JUCE/modules"/>
+        <MODULEPATH id="juce_data_structures" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_cryptography" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_core" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_audio_processors" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_audio_plugin_client" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_audio_formats" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_audio_devices" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_audio_basics" path="../JUCE/modules"/>
+        <MODULEPATH id="juce_audio_utils" path="../../../JUCEs/JUCE_latest/modules"/>
+      </MODULEPATHS>
+    </VS2017>
     <VS2015 targetFolder="Builds/VisualStudio2015" windowsTargetPlatformVersion="8.1">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
                        isDebug="1" optimisation="1" targetName="GLSLPlugIn" debugInformationFormat="ProgramDatabase"
                        enablePluginBinaryCopyStep="0"/>
         <CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
-                       isDebug="0" optimisation="3" targetName="GLSLPlugIn" postbuildCommand="copy &quot;$(TargetPath)&quot; &quot;C:\Program Files\VSTplugins x64\My Build VST\&quot;"
+                       isDebug="0" optimisation="3" targetName="GLSLPlugIn" postbuildCommand=""
                        debugInformationFormat="ProgramDatabase" enablePluginBinaryCopyStep="0"
                        linkTimeOptimisation="1"/>
       </CONFIGURATIONS>
@@ -64,6 +92,7 @@
         <MODULEPATH id="juce_audio_processors" path="../JUCE/modules"/>
         <MODULEPATH id="juce_audio_plugin_client" path="../JUCE/modules"/>
         <MODULEPATH id="juce_dsp" path="../../../../../../../Applications/JUCE/modules"/>
+        <MODULEPATH id="juce_audio_utils" path="../../../JUCEs/JUCE_latest/modules"/>
       </MODULEPATHS>
     </VS2015>
     <XCODE_MAC targetFolder="Builds/MacOSX">
@@ -89,6 +118,7 @@
         <MODULEPATH id="juce_audio_devices" path="../../juce"/>
         <MODULEPATH id="juce_audio_basics" path="../../juce"/>
         <MODULEPATH id="juce_dsp" path="../../../../../../../Applications/JUCE/modules"/>
+        <MODULEPATH id="juce_audio_utils" path="../../../JUCEs/JUCE_latest/modules"/>
       </MODULEPATHS>
     </XCODE_MAC>
   </EXPORTFORMATS>
@@ -99,6 +129,7 @@
     <MODULE id="juce_audio_plugin_client" showAllCode="1" useLocalCopy="0"
             useGlobalPath="1"/>
     <MODULE id="juce_audio_processors" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
+    <MODULE id="juce_audio_utils" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
     <MODULE id="juce_core" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
     <MODULE id="juce_cryptography" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
     <MODULE id="juce_data_structures" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>

diff --git a/GLSLPlugIn/JuceLibraryCode/AppConfig.h b/GLSLPlugIn/JuceLibraryCode/AppConfig.h
@@ -39,7 +39,7 @@
 #endif
 
 #ifndef JUCE_REPORT_APP_USAGE
- #define JUCE_REPORT_APP_USAGE 1
+ #define JUCE_REPORT_APP_USAGE 0
 #endif
 
 
@@ -53,6 +53,7 @@
 #define JUCE_MODULE_AVAILABLE_juce_audio_formats            1
 #define JUCE_MODULE_AVAILABLE_juce_audio_plugin_client      1
 #define JUCE_MODULE_AVAILABLE_juce_audio_processors         1
+#define JUCE_MODULE_AVAILABLE_juce_audio_utils              1
 #define JUCE_MODULE_AVAILABLE_juce_core                     1
 #define JUCE_MODULE_AVAILABLE_juce_cryptography             1
 #define JUCE_MODULE_AVAILABLE_juce_data_structures          1
@@ -154,6 +155,17 @@
  //#define JUCE_PLUGINHOST_AU 1
 #endif
 
+//==============================================================================
+// juce_audio_utils flags:
+
+#ifndef    JUCE_USE_CDREADER
+ //#define JUCE_USE_CDREADER 1
+#endif
+
+#ifndef    JUCE_USE_CDBURNER
+ //#define JUCE_USE_CDBURNER 1
+#endif
+
 //==============================================================================
 // juce_core flags:
 
@@ -297,7 +309,7 @@
  #define JucePlugin_Build_AAX              0
 #endif
 #ifndef  JucePlugin_Build_Standalone
- #define JucePlugin_Build_Standalone       0
+ #define JucePlugin_Build_Standalone       1
 #endif
 #ifndef  JucePlugin_Enable_IAA
  #define JucePlugin_Enable_IAA             0

diff --git a/GLSLPlugIn/JuceLibraryCode/BinaryData.cpp b/GLSLPlugIn/JuceLibraryCode/BinaryData.cpp
@@ -9,15 +9,15 @@ namespace BinaryData
 
 //================== base.obj ==================
 static const unsigned char temp_binary_data_0[] =
-"g board\n"
-"\n"
-"v -1.000000 -1.000000 0.000000\n"
-"v 1.000000 1.000000 0.000000\n"
-"v 1.000000 -1.000000 0.000000\n"
-"v -1.000000 1.000000 0.000000\n"
-"vn 0.000000 0.000000 -1.000000\n"
-"f 1//1 2//1 3//1\n"
-"f 1//1 4//1 2//1\n";
+"g board\r\n"
+"\r\n"
+"v -1.000000 -1.000000 0.000000\r\n"
+"v 1.000000 1.000000 0.000000\r\n"
+"v 1.000000 -1.000000 0.000000\r\n"
+"v -1.000000 1.000000 0.000000\r\n"
+"vn 0.000000 0.000000 -1.000000\r\n"
+"f 1//1 2//1 3//1\r\n"
+"f 1//1 4//1 2//1\r\n";
 
 const char* base_obj = (const char*) temp_binary_data_0;
 
@@ -32,7 +32,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
 
     switch (hash)
     {
-        case 0x99691289:  numBytes = 194; return base_obj;
+        case 0x99691289:  numBytes = 203; return base_obj;
         default: break;
     }
 

diff --git a/GLSLPlugIn/JuceLibraryCode/BinaryData.h b/GLSLPlugIn/JuceLibraryCode/BinaryData.h
@@ -9,7 +9,7 @@
 namespace BinaryData
 {
     extern const char*   base_obj;
-    const int            base_objSize = 194;
+    const int            base_objSize = 203;
 
     // Points to the start of a list of resource names.
     extern const char* namedResourceList[];

diff --git a/GLSLPlugIn/JuceLibraryCode/JuceHeader.h b/GLSLPlugIn/JuceLibraryCode/JuceHeader.h
@@ -19,6 +19,7 @@
 #include <juce_audio_formats/juce_audio_formats.h>
 #include <juce_audio_plugin_client/juce_audio_plugin_client.h>
 #include <juce_audio_processors/juce_audio_processors.h>
+#include <juce_audio_utils/juce_audio_utils.h>
 #include <juce_core/juce_core.h>
 #include <juce_cryptography/juce_cryptography.h>
 #include <juce_data_structures/juce_data_structures.h>

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 ## glslEditor_AudioPlugin ##
 GLSL for Audio Plugin
 
-Project Name : GLSL Editor Audio Plugin
+Project Name : GLSL Editor Audio Plugin (+stand-alone)
 
 Product Name : None
 
@@ -13,6 +13,8 @@ License : GPL v3
 
 [JUCE JAPAN / Outlaw Faction](http://oufac.com/ "Outlaw Faction")
 
+Require : JUCE v5.2.0
+
 ## What is this project? ##
 GLSL Editor running on VST/AU plugin host Applications Cubase, StudioOne, Ableton Live, Logic, and more...
 This Editor already defined uniform variables, and GLSL code compatible for "GLSL Sandbox".
@@ -21,6 +23,13 @@ http://glslsandbox.com/
 This demo movie has copy and paste the glsl codes from "GLSL Sandbox Gallery".
 ![Alt Text](VST_GLSL_0134.gif)
 
+## Support Format
+
++ VST
++ VST3
++ AudioUnit
++ Stand-alone executable
+
 ## Usage / uniform variables
 Some uniform variables are specific to the GLSL Sandbox and others are provided by this plugin.