Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark MSVS *.props files as using CR LF as well.

Browse Source 
For consistency with *.vcxproj and *.sln.
This commit is contained in:
Vadim Zeitlin
2015-03-19 21:43:29 +01:00
parent 3ee12b2ca9
commit f1cc587a99
3 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -4,6 +4,7 @@
*.bcc eol=crlf *.bcc eol=crlf
*.dsw eol=crlf *.dsw eol=crlf
*.gcc eol=crlf *.gcc eol=crlf
*.props eol=crlf
*.rc eol=crlf *.rc eol=crlf
*.sln eol=crlf *.sln eol=crlf
*.vc eol=crlf *.vc eol=crlf

22
build/msw/wx_config.props
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

206
build/msw/wx_setup.props
View File

@@ -1,103 +1,103 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<wxShortVersionString>31</wxShortVersionString> <wxShortVersionString>31</wxShortVersionString>
<wxToolkitPrefix>msw</wxToolkitPrefix> <wxToolkitPrefix>msw</wxToolkitPrefix>
<wxCompilerPrefix>vc</wxCompilerPrefix> <wxCompilerPrefix>vc</wxCompilerPrefix>
<wxCfg> <wxCfg>
</wxCfg> </wxCfg>
<wxVendor>custom</wxVendor> <wxVendor>custom</wxVendor>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'"> <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'">
<wxArchSuffix> <wxArchSuffix>
</wxArchSuffix> </wxArchSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='x64'"> <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='x64'">
<wxArchSuffix>_x64</wxArchSuffix> <wxArchSuffix>_x64</wxArchSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Itanium'"> <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Itanium'">
<wxArchSuffix>_ia64</wxArchSuffix> <wxArchSuffix>_ia64</wxArchSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug') and '$(CharacterSet)'=='Unicode'"> <PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug') and '$(CharacterSet)'=='Unicode'">
<wxSuffix>ud</wxSuffix> <wxSuffix>ud</wxSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug') and '$(CharacterSet)'!='Unicode'"> <PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug') and '$(CharacterSet)'!='Unicode'">
<wxSuffix>d</wxSuffix> <wxSuffix>d</wxSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Release' or '$(Configuration)'=='DLL Release') and '$(CharacterSet)'=='Unicode'"> <PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Release' or '$(Configuration)'=='DLL Release') and '$(CharacterSet)'=='Unicode'">
<wxSuffix>u</wxSuffix> <wxSuffix>u</wxSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Release' or '$(Configuration)'=='DLL Release') and '$(CharacterSet)'!='Unicode'"> <PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Release' or '$(Configuration)'=='DLL Release') and '$(CharacterSet)'!='Unicode'">
<wxSuffix> <wxSuffix>
</wxSuffix> </wxSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug'">
<wxSuffixDebug>d</wxSuffixDebug> <wxSuffixDebug>d</wxSuffixDebug>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'!='Debug' and '$(Configuration)'!='DLL Debug'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'!='Debug' and '$(Configuration)'!='DLL Debug'">
<wxSuffixDebug> <wxSuffixDebug>
</wxSuffixDebug> </wxSuffixDebug>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Debug'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Debug'">
<wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_dll$(wxCfg)\</wxOutDir> <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_dll$(wxCfg)\</wxOutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Release'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Release'">
<wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_dll$(wxCfg)\</wxOutDir> <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_dll$(wxCfg)\</wxOutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Debug'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Debug'">
<wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_lib$(wxCfg)\</wxOutDir> <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_lib$(wxCfg)\</wxOutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Release'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Release'">
<wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_lib$(wxCfg)\</wxOutDir> <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_lib$(wxCfg)\</wxOutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Debug'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Debug'">
<wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)dll\</wxIntRootDir> <wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)dll\</wxIntRootDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Release'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Release'">
<wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)dll\</wxIntRootDir> <wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)dll\</wxIntRootDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Debug'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Debug'">
<wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)\</wxIntRootDir> <wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)\</wxIntRootDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Release'"> <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Release'">
<wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)\</wxIntRootDir> <wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)\</wxIntRootDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<wxIncSubDir>$(wxToolkitPrefix)$(wxSuffix)</wxIncSubDir> <wxIncSubDir>$(wxToolkitPrefix)$(wxSuffix)</wxIncSubDir>
<wxToolkitDllNamePrefix>wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_</wxToolkitDllNamePrefix> <wxToolkitDllNamePrefix>wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_</wxToolkitDllNamePrefix>
<wxToolkitDllNameSuffix>_$(wxCompilerPrefix)$(wxArchSuffix)_$(wxVendor)</wxToolkitDllNameSuffix> <wxToolkitDllNameSuffix>_$(wxCompilerPrefix)$(wxArchSuffix)_$(wxVendor)</wxToolkitDllNameSuffix>
<wxToolkitLibNamePrefix>wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_</wxToolkitLibNamePrefix> <wxToolkitLibNamePrefix>wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_</wxToolkitLibNamePrefix>
<wxBaseLibNamePrefix>wxbase$(wxShortVersionString)$(wxSuffix)</wxBaseLibNamePrefix> <wxBaseLibNamePrefix>wxbase$(wxShortVersionString)$(wxSuffix)</wxBaseLibNamePrefix>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<BuildMacro Include="wxShortVersionString"> <BuildMacro Include="wxShortVersionString">
<Value>$(wxShortVersionString)</Value> <Value>$(wxShortVersionString)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="wxArchSuffix"> <BuildMacro Include="wxArchSuffix">
<Value>$(wxArchSuffix)</Value> <Value>$(wxArchSuffix)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="wxToolkitPrefix"> <BuildMacro Include="wxToolkitPrefix">
<Value>$(wxToolkitPrefix)</Value> <Value>$(wxToolkitPrefix)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="wxCompilerPrefix"> <BuildMacro Include="wxCompilerPrefix">
<Value>$(wxCompilerPrefix)</Value> <Value>$(wxCompilerPrefix)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="wxCfg"> <BuildMacro Include="wxCfg">
<Value>$(wxCfg)</Value> <Value>$(wxCfg)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="wxVendor"> <BuildMacro Include="wxVendor">
<Value>$(wxVendor)</Value> <Value>$(wxVendor)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="wxOutDir"> <BuildMacro Include="wxOutDir">
<Value>$(wxOutDir)</Value> <Value>$(wxOutDir)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="wxIntRootDir"> <BuildMacro Include="wxIntRootDir">
<Value>$(wxIntRootDir)</Value> <Value>$(wxIntRootDir)</Value>
</BuildMacro> </BuildMacro>
</ItemGroup> </ItemGroup>
</Project> </Project>