Skip to content

Commit

Permalink
Windows package should now be produced, need to set proper version
Browse files Browse the repository at this point in the history
string and release a build
  • Loading branch information
Roman Kubiak authored and Roman Kubiak committed Mar 30, 2017
1 parent 504d96f commit 6604175
Show file tree
Hide file tree
Showing 13 changed files with 143 additions and 85 deletions.
16 changes: 4 additions & 12 deletions Builds/Win/Release.sln → Builds/Win/Ctrlr.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 14 for Windows Desktop
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Standalone", "Standalone\Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Standalone", "Standalone\Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Plugin_VST", "Vst\Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VST", "Vst\Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release_Nightly|Win32 = Release_Nightly|Win32
Release_Nightly|x64 = Release_Nightly|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
Expand All @@ -21,23 +19,17 @@ Global
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|Win32.Build.0 = Debug|Win32
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.ActiveCfg = Debug|x64
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.Build.0 = Debug|x64
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.ActiveCfg = Release_Nightly|x64
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.Build.0 = Release_Nightly|x64
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.ActiveCfg = Release|Win32
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.Build.0 = Release|Win32
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|x64.ActiveCfg = Release|x64
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|x64.Build.0 = Release|x64
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|Win32.ActiveCfg = Debug|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|Win32.Build.0 = Debug|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|x64.ActiveCfg = Debug|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|x64.ActiveCfg = Release_Nightly|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.ActiveCfg = Release|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.Build.0 = Release|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.ActiveCfg = Release|Win32
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.ActiveCfg = Release|x64
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
44 changes: 28 additions & 16 deletions Builds/Win/Standalone/Ctrlr_Standalone.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{AE5BFF94-9212-18D5-D78C-303C614D5D47}</ProjectGuid>
<PlatformToolset>v140_xp</PlatformToolset>
<WindowsTargetPlatformVersion>1</WindowsTargetPlatformVersion>
<ProjectName>Standalone</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -76,8 +78,8 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Ctrlr-Debug-$(Platform)$(NATIVE_ARCH)</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-$(Platform)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-$(Platform)</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|Win32'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
Expand All @@ -86,6 +88,17 @@
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|x64'">true</GenerateManifest>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|x64'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)-$(Platform)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(Configuration)-$(Platform)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -98,7 +111,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
Expand Down Expand Up @@ -149,7 +162,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
Expand Down Expand Up @@ -196,7 +209,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
Expand All @@ -206,14 +219,14 @@
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<MultiProcessorCompilation>false</MultiProcessorCompilation>
<AdditionalOptions>/Yu"stdafx.h" /MP /Fp"stdafx.pch" /Zm2000 /bigobj </AdditionalOptions>
<MinimalRebuild>true</MinimalRebuild>
<AdditionalOptions>/MP /Zm2000 /bigobj </AdditionalOptions>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<OutputFile>$(OutDir)\Ctrlr-$(Platform)$(NATIVE_ARCH).exe</OutputFile>
<OutputFile>$(OutDir)\Ctrlr-$(Platform).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down Expand Up @@ -241,7 +254,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
Expand All @@ -252,14 +265,14 @@
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<MultiProcessorCompilation>false</MultiProcessorCompilation>
<AdditionalOptions>/Yu"stdafx.h" /MP /Fp"stdafx.pch" /Zm2000 /bigobj </AdditionalOptions>
<MinimalRebuild>true</MinimalRebuild>
<AdditionalOptions>/MP /Zm2000 /bigobj </AdditionalOptions>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<OutputFile>$(OutDir)\Ctrlr-$(Platform)$(NATIVE_ARCH).exe</OutputFile>
<OutputFile>$(OutDir)\Ctrlr-$(Platform).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand All @@ -286,7 +299,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
Expand Down Expand Up @@ -335,7 +348,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../JUCE/modules;../../../Source/misc/boost;../../../Source/Lua;../../../Source/Misc/include;../../../Source/MIDI;../../../Source;../../../Source/UIComponents;../../../Source/Core;../../../Source/Plugin;../../../Source/Application;../../../Source/Misc/libusb/include;../../../Source/Misc/liblo/include;../../../Source/Misc/lua/include;../../../Source/Misc/lua/src;../../../Source/Misc/luabind;../../../Source/Misc/juce;../../../Source/Misc/vst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;JUCE_FORCE_DEBUG=0;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;JUCER_VS2015_19DE27A1=1;JUCE_APP_VERSION=5.4.0;JUCE_APP_VERSION_HEX=0x50400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
Expand Down Expand Up @@ -416,7 +429,7 @@
<ClCompile Include="..\..\..\Source\Core\stdafx_luabind.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.h.pch</PrecompiledHeaderOutputFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx_luabind.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx_luabind.h.pch</PrecompiledHeaderOutputFile>
Expand Down Expand Up @@ -3284,7 +3297,6 @@
<ClInclude Include="..\..\..\Source\Core\CtrlrFontManager.h" />
<ClInclude Include="..\..\..\Source\Core\CtrlrIDManager.h" />
<ClInclude Include="..\..\..\Source\Core\CtrlrIDs.h" />
<ClInclude Include="..\..\..\Source\Core\CtrlrInlineUtilities.h" />
<ClInclude Include="..\..\..\Source\Core\CtrlrLog.h" />
<ClInclude Include="..\..\..\Source\Core\CtrlrMacros.h" />
<ClInclude Include="..\..\..\Source\Core\CtrlrMainPage.h" />
Expand Down
Loading

0 comments on commit 6604175

Please sign in to comment.