diff options
Diffstat (limited to 'win32')
-rw-r--r-- | win32/VS2015/celt.vcxproj | 48 | ||||
-rw-r--r-- | win32/VS2015/generate_version.vcxproj | 65 | ||||
-rw-r--r-- | win32/VS2015/opus.sln | 32 | ||||
-rw-r--r-- | win32/VS2015/opus.vcxproj | 48 | ||||
-rw-r--r-- | win32/VS2015/silk_common.vcxproj | 48 | ||||
-rw-r--r-- | win32/VS2015/silk_fixed.vcxproj | 32 | ||||
-rw-r--r-- | win32/VS2015/silk_float.vcxproj | 54 |
7 files changed, 260 insertions, 67 deletions
diff --git a/win32/VS2015/celt.vcxproj b/win32/VS2015/celt.vcxproj index 273ee4df..1499f56d 100644 --- a/win32/VS2015/celt.vcxproj +++ b/win32/VS2015/celt.vcxproj @@ -249,8 +249,10 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -291,8 +293,10 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -334,8 +338,10 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -377,8 +383,10 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -426,8 +434,10 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -475,8 +485,10 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -525,8 +537,10 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -575,8 +589,10 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> diff --git a/win32/VS2015/generate_version.vcxproj b/win32/VS2015/generate_version.vcxproj new file mode 100644 index 00000000..820dc192 --- /dev/null +++ b/win32/VS2015/generate_version.vcxproj @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Any|Win32"> + <Configuration>Any</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}</ProjectGuid> + <RootNamespace>generate_version</RootNamespace> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Any|Win32'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Any|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Any|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + <CustomBuildStep> + <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> + </CustomBuildStep> + <CustomBuildStep> + <Message>Generating version.h</Message> + </CustomBuildStep> + <CustomBuildStep> + <TreatOutputAsContent>false</TreatOutputAsContent> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemGroup> + <CustomBuild Include="..\genversion.bat"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Any|Win32'">"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Any|Win32'">Generating version.h</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Any|Win32'">$(ProjectDir)..\..\win32\version.h</Outputs> + </CustomBuild> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/win32/VS2015/opus.sln b/win32/VS2015/opus.sln index 24bead43..25ec6f14 100644 --- a/win32/VS2015/opus.sln +++ b/win32/VS2015/opus.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "opus.vcxproj", "{219EC965-228A-1824-174D-96449D05F88A}" ProjectSection(ProjectDependencies) = postProject @@ -12,6 +12,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "opus.vcxproj", "{21 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "celt", "celt.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}" + ProjectSection(ProjectDependencies) = postProject + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} = {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus_demo", "opus_demo.vcxproj", "{016C739D-6389-43BF-8D88-24B2BF6F620F}" ProjectSection(ProjectDependencies) = postProject @@ -46,10 +49,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opus_encode", "test_op EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_float", "silk_float.vcxproj", "{9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}" + ProjectSection(ProjectDependencies) = postProject + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} = {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_common", "silk_common.vcxproj", "{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}" + ProjectSection(ProjectDependencies) = postProject + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} = {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_fixed", "silk_fixed.vcxproj", "{8484C90D-1561-402F-A91D-2DB10F8C5171}" + ProjectSection(ProjectDependencies) = postProject + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} = {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_version", "generate_version.vcxproj", "{77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -207,6 +221,22 @@ Global {8484C90D-1561-402F-A91D-2DB10F8C5171}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {8484C90D-1561-402F-A91D-2DB10F8C5171}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 {8484C90D-1561-402F-A91D-2DB10F8C5171}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Debug|Win32.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Debug|Win32.Build.0 = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Debug|x64.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Debug|x64.Build.0 = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.DebugDLL|Win32.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.DebugDLL|Win32.Build.0 = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.DebugDLL|x64.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.DebugDLL|x64.Build.0 = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Release|Win32.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Release|Win32.Build.0 = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Release|x64.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.Release|x64.Build.0 = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.ReleaseDLL|Win32.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.ReleaseDLL|Win32.Build.0 = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.ReleaseDLL|x64.ActiveCfg = Any|Win32 + {77C41C23-C4D0-4B86-9E1B-16BCD80FC0CA}.ReleaseDLL|x64.Build.0 = Any|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/VS2015/opus.vcxproj b/win32/VS2015/opus.vcxproj index 0559aa60..2621fc10 100644 --- a/win32/VS2015/opus.vcxproj +++ b/win32/VS2015/opus.vcxproj @@ -188,8 +188,10 @@ <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -236,8 +238,10 @@ <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -283,8 +287,10 @@ <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -331,8 +337,10 @@ <EnableCOMDATFolding>false</EnableCOMDATFolding> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -386,8 +394,10 @@ <LinkStatus>false</LinkStatus> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -439,8 +449,10 @@ <LargeAddressAware>true</LargeAddressAware> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -490,8 +502,10 @@ <LinkStatus>false</LinkStatus> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -542,8 +556,10 @@ <LargeAddressAware>true</LargeAddressAware> </Link> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> diff --git a/win32/VS2015/silk_common.vcxproj b/win32/VS2015/silk_common.vcxproj index 2df939b0..47487380 100644 --- a/win32/VS2015/silk_common.vcxproj +++ b/win32/VS2015/silk_common.vcxproj @@ -190,8 +190,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -235,8 +237,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -281,8 +285,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -327,8 +333,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -379,8 +387,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -431,8 +441,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -484,8 +496,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -537,8 +551,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> diff --git a/win32/VS2015/silk_fixed.vcxproj b/win32/VS2015/silk_fixed.vcxproj index ba1b5152..17a57db0 100644 --- a/win32/VS2015/silk_fixed.vcxproj +++ b/win32/VS2015/silk_fixed.vcxproj @@ -186,6 +186,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> <ClCompile> @@ -219,6 +223,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> @@ -253,6 +261,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> <ClCompile> @@ -287,6 +299,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -327,6 +343,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> <ClCompile> @@ -367,6 +387,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> @@ -408,6 +432,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> <ClCompile> @@ -449,6 +477,10 @@ <Lib> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\include\opus_types.h" /> diff --git a/win32/VS2015/silk_float.vcxproj b/win32/VS2015/silk_float.vcxproj index e55e76d1..562ac4c3 100644 --- a/win32/VS2015/silk_float.vcxproj +++ b/win32/VS2015/silk_float.vcxproj @@ -147,12 +147,14 @@ <OutDir>$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <CustomBuildBeforeTargets>Compile</CustomBuildBeforeTargets> + <CustomBuildBeforeTargets> + </CustomBuildBeforeTargets> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <OutDir>$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <CustomBuildBeforeTargets>Compile</CustomBuildBeforeTargets> + <CustomBuildBeforeTargets> + </CustomBuildBeforeTargets> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <OutDir>$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> @@ -189,8 +191,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -234,8 +238,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -280,8 +286,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -326,8 +334,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -378,8 +388,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -430,8 +442,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -483,8 +497,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> @@ -536,8 +552,10 @@ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> </Lib> <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> + <Command> + </Command> + <Message> + </Message> </PreBuildEvent> <CustomBuildStep> <Command> |