Skip to content

Commit 6604175

Browse files
Roman KubiakRoman Kubiak
Roman Kubiak
authored and
Roman Kubiak
committed
Windows package should now be produced, need to set proper version
string and release a build
1 parent 504d96f commit 6604175

13 files changed

Lines changed: 143 additions & 85 deletions

Builds/Win/Release.sln renamed to Builds/Win/Ctrlr.sln

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Express 14 for Windows Desktop
44
VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Standalone", "Standalone\Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Standalone", "Standalone\Ctrlr_Standalone.vcxproj", "{AE5BFF94-9212-18D5-D78C-303C614D5D47}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ctrlr_Plugin_VST", "Vst\Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VST", "Vst\Ctrlr_Plugin_VST.vcxproj", "{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Win32 = Debug|Win32
1313
Debug|x64 = Debug|x64
14-
Release_Nightly|Win32 = Release_Nightly|Win32
15-
Release_Nightly|x64 = Release_Nightly|x64
1614
Release|Win32 = Release|Win32
1715
Release|x64 = Release|x64
1816
EndGlobalSection
@@ -21,23 +19,17 @@ Global
2119
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|Win32.Build.0 = Debug|Win32
2220
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.ActiveCfg = Debug|x64
2321
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Debug|x64.Build.0 = Debug|x64
24-
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
25-
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
26-
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.ActiveCfg = Release_Nightly|x64
27-
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release_Nightly|x64.Build.0 = Release_Nightly|x64
2822
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.ActiveCfg = Release|Win32
2923
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|Win32.Build.0 = Release|Win32
3024
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|x64.ActiveCfg = Release|x64
3125
{AE5BFF94-9212-18D5-D78C-303C614D5D47}.Release|x64.Build.0 = Release|x64
3226
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|Win32.ActiveCfg = Debug|Win32
3327
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|Win32.Build.0 = Debug|Win32
3428
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Debug|x64.ActiveCfg = Debug|Win32
35-
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.ActiveCfg = Release_Nightly|Win32
36-
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|Win32.Build.0 = Release_Nightly|Win32
37-
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release_Nightly|x64.ActiveCfg = Release_Nightly|Win32
3829
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.ActiveCfg = Release|Win32
3930
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|Win32.Build.0 = Release|Win32
40-
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.ActiveCfg = Release|Win32
31+
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.ActiveCfg = Release|x64
32+
{AD9FFFDE-F7EE-C624-5C11-B9A140EE7547}.Release|x64.Build.0 = Release|x64
4133
EndGlobalSection
4234
GlobalSection(SolutionProperties) = preSolution
4335
HideSolutionNode = FALSE

‎Builds/Win/Standalone/Ctrlr_Standalone.vcxproj‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<PropertyGroup Label="Globals">
3030
<ProjectGuid>{AE5BFF94-9212-18D5-D78C-303C614D5D47}</ProjectGuid>
3131
<PlatformToolset>v140_xp</PlatformToolset>
32+
<WindowsTargetPlatformVersion>1</WindowsTargetPlatformVersion>
33+
<ProjectName>Standalone</ProjectName>
3234
</PropertyGroup>
3335
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3436
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -76,8 +78,8 @@
7678
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Ctrlr-Debug-$(Platform)$(NATIVE_ARCH)</TargetName>
7779
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
7880
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
79-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
80-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
81+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Ctrlr-$(Platform)</TargetName>
82+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ctrlr-$(Platform)</TargetName>
8183
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
8284
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
8385
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|Win32'">Ctrlr-$(Platform)$(NATIVE_ARCH)</TargetName>
@@ -86,6 +88,17 @@
8688
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|x64'">true</GenerateManifest>
8789
<PlatformToolset>v140_xp</PlatformToolset>
8890
</PropertyGroup>
91+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Nightly|x64'">
92+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
93+
<IntDir>$(Configuration)\</IntDir>
94+
</PropertyGroup>
95+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
96+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
97+
<IntDir>$(Configuration)-$(Platform)\</IntDir>
98+
</PropertyGroup>
99+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
100+
<IntDir>$(Configuration)-$(Platform)\</IntDir>
101+
</PropertyGroup>
89102
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90103
<Midl>
91104
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -98,7 +111,7 @@
98111
<Optimization>Disabled</Optimization>
99112
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
100113
<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>
101-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;CTRLR_NIGHTLY=1;JucePlugin_Build_Standalone;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102115
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
103116
<RuntimeTypeInfo>true</RuntimeTypeInfo>
104117
<PrecompiledHeader />
@@ -149,7 +162,7 @@
149162
<Optimization>Disabled</Optimization>
150163
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
151164
<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>
152-
<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>
165+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153166
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
154167
<RuntimeTypeInfo>true</RuntimeTypeInfo>
155168
<PrecompiledHeader>
@@ -196,7 +209,7 @@
196209
<ClCompile>
197210
<Optimization>Full</Optimization>
198211
<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>
199-
<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>
212+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200213
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
201214
<RuntimeTypeInfo>true</RuntimeTypeInfo>
202215
<PrecompiledHeader />
@@ -206,14 +219,14 @@
206219
<WarningLevel>Level4</WarningLevel>
207220
<SuppressStartupBanner>true</SuppressStartupBanner>
208221
<MultiProcessorCompilation>false</MultiProcessorCompilation>
209-
<AdditionalOptions>/Yu"stdafx.h" /MP /Fp"stdafx.pch" /Zm2000 /bigobj </AdditionalOptions>
210-
<MinimalRebuild>true</MinimalRebuild>
222+
<AdditionalOptions>/MP /Zm2000 /bigobj </AdditionalOptions>
223+
<MinimalRebuild>false</MinimalRebuild>
211224
</ClCompile>
212225
<ResourceCompile>
213226
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
214227
</ResourceCompile>
215228
<Link>
216-
<OutputFile>$(OutDir)\Ctrlr-$(Platform)$(NATIVE_ARCH).exe</OutputFile>
229+
<OutputFile>$(OutDir)\Ctrlr-$(Platform).exe</OutputFile>
217230
<SuppressStartupBanner>true</SuppressStartupBanner>
218231
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
219232
<GenerateDebugInformation>false</GenerateDebugInformation>
@@ -241,7 +254,7 @@
241254
<ClCompile>
242255
<Optimization>Full</Optimization>
243256
<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>
244-
<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>
257+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;JucePlugin_Build_Standalone;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245258
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
246259
<RuntimeTypeInfo>true</RuntimeTypeInfo>
247260
<PrecompiledHeader>
@@ -252,14 +265,14 @@
252265
<WarningLevel>Level4</WarningLevel>
253266
<SuppressStartupBanner>true</SuppressStartupBanner>
254267
<MultiProcessorCompilation>false</MultiProcessorCompilation>
255-
<AdditionalOptions>/Yu"stdafx.h" /MP /Fp"stdafx.pch" /Zm2000 /bigobj </AdditionalOptions>
256-
<MinimalRebuild>true</MinimalRebuild>
268+
<AdditionalOptions>/MP /Zm2000 /bigobj </AdditionalOptions>
269+
<MinimalRebuild>false</MinimalRebuild>
257270
</ClCompile>
258271
<ResourceCompile>
259272
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
260273
</ResourceCompile>
261274
<Link>
262-
<OutputFile>$(OutDir)\Ctrlr-$(Platform)$(NATIVE_ARCH).exe</OutputFile>
275+
<OutputFile>$(OutDir)\Ctrlr-$(Platform).exe</OutputFile>
263276
<SuppressStartupBanner>true</SuppressStartupBanner>
264277
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
265278
<GenerateDebugInformation>false</GenerateDebugInformation>
@@ -286,7 +299,7 @@
286299
<ClCompile>
287300
<Optimization>Full</Optimization>
288301
<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>
289-
<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>
302+
<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>
290303
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
291304
<RuntimeTypeInfo>true</RuntimeTypeInfo>
292305
<PrecompiledHeader />
@@ -335,7 +348,7 @@
335348
<ClCompile>
336349
<Optimization>Full</Optimization>
337350
<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>
338-
<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>
351+
<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>
339352
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
340353
<RuntimeTypeInfo>true</RuntimeTypeInfo>
341354
<PrecompiledHeader>
@@ -416,7 +429,7 @@
416429
<ClCompile Include="..\..\..\Source\Core\stdafx_luabind.cpp">
417430
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
418431
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.h</PrecompiledHeaderFile>
419-
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.pch</PrecompiledHeaderOutputFile>
432+
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx_luabind.h.pch</PrecompiledHeaderOutputFile>
420433
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
421434
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx_luabind.h</PrecompiledHeaderFile>
422435
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx_luabind.h.pch</PrecompiledHeaderOutputFile>
@@ -3284,7 +3297,6 @@
32843297
<ClInclude Include="..\..\..\Source\Core\CtrlrFontManager.h" />
32853298
<ClInclude Include="..\..\..\Source\Core\CtrlrIDManager.h" />
32863299
<ClInclude Include="..\..\..\Source\Core\CtrlrIDs.h" />
3287-
<ClInclude Include="..\..\..\Source\Core\CtrlrInlineUtilities.h" />
32883300
<ClInclude Include="..\..\..\Source\Core\CtrlrLog.h" />
32893301
<ClInclude Include="..\..\..\Source\Core\CtrlrMacros.h" />
32903302
<ClInclude Include="..\..\..\Source\Core\CtrlrMainPage.h" />

0 commit comments

Comments
 (0)