diff options
| author | Alin Serdean <aserdean@cloudbasesolutions.com> | 2015-09-22 19:53:30 +0000 |
|---|---|---|
| committer | Gurucharan Shetty <gshetty@nicira.com> | 2015-09-23 07:50:41 -0700 |
| commit | f821fe7f09ad0262b63c41f637aa77e02fa9ebfa (patch) | |
| tree | fd4bd567c800910ba964604c08ee4caf6ecfb8fd /windows | |
| parent | c460a6a7bc751c1917981c326fedf45e15f06aed (diff) | |
| download | openvswitch-f821fe7f09ad0262b63c41f637aa77e02fa9ebfa.tar.gz | |
Add x64 bit configuration to windows installer
This patch defines the x64 in the configuration of the visual studio
solution: ovs-windows-installer.sln
Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/ovs-windows-installer.sln | 4 | ||||
| -rw-r--r-- | windows/ovs-windows-installer/ovs-windows-installer.wixproj | 41 |
2 files changed, 43 insertions, 2 deletions
diff --git a/windows/ovs-windows-installer.sln b/windows/ovs-windows-installer.sln index 298c831bb..09311f983 100644 --- a/windows/ovs-windows-installer.sln +++ b/windows/ovs-windows-installer.sln @@ -1,4 +1,3 @@ -? Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 @@ -7,9 +6,12 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ovs-windows-installer", "ov EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.ActiveCfg = Release|x86 + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.Build.0 = Release|x86 {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.ActiveCfg = Release|x86 {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.Build.0 = Release|x86 EndGlobalSection diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj index af22f4274..30b5d553c 100644 --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj @@ -24,6 +24,45 @@ <Pedantic>False</Pedantic> <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <DefineConstants>Debug</DefineConstants> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <SuppressAllWarnings>False</SuppressAllWarnings> + <Pedantic>False</Pedantic> + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <DefineConstants>Debug</DefineConstants> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <SuppressAllWarnings>False</SuppressAllWarnings> + <Pedantic>False</Pedantic> + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <DefineConstants>Debug</DefineConstants> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <SuppressAllWarnings>False</SuppressAllWarnings> + <Pedantic>False</Pedantic> + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> <ItemGroup> <Compile Include="Binaries.wxs" /> <Compile Include="CustomActions.wxs" /> @@ -76,4 +115,4 @@ <Target Name="AfterBuild"> </Target> --> -</Project>
\ No newline at end of file +</Project> |