Sébastien Blin | 1f91576 | 2020-08-03 13:27:42 -0400 | [diff] [blame^] | 1 | From 261d830b9b4126d76519db0e6b6b51b5a730eb40 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> |
| 3 | Date: Tue, 4 Dec 2018 17:42:43 -0500 |
| 4 | Subject: [PATCH] b |
| 5 | |
| 6 | --- |
| 7 | .../vc8/qrcodelib/qrcodelib.vcxproj | 129 +++++++++++++++++- |
| 8 | 1 file changed, 125 insertions(+), 4 deletions(-) |
| 9 | |
| 10 | diff --git a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj |
| 11 | index aabc6b6..8d8293b 100644 |
| 12 | --- a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj |
| 13 | +++ b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj |
| 14 | @@ -5,45 +5,84 @@ |
| 15 | <Configuration>Debug-Dll</Configuration>
|
| 16 | <Platform>Win32</Platform>
|
| 17 | </ProjectConfiguration>
|
| 18 | + <ProjectConfiguration Include="Debug-Dll|x64">
|
| 19 | + <Configuration>Debug-Dll</Configuration>
|
| 20 | + <Platform>x64</Platform>
|
| 21 | + </ProjectConfiguration>
|
| 22 | <ProjectConfiguration Include="Debug-Lib|Win32">
|
| 23 | <Configuration>Debug-Lib</Configuration>
|
| 24 | <Platform>Win32</Platform>
|
| 25 | </ProjectConfiguration>
|
| 26 | + <ProjectConfiguration Include="Debug-Lib|x64">
|
| 27 | + <Configuration>Debug-Lib</Configuration>
|
| 28 | + <Platform>x64</Platform>
|
| 29 | + </ProjectConfiguration>
|
| 30 | <ProjectConfiguration Include="Release-Dll|Win32">
|
| 31 | <Configuration>Release-Dll</Configuration>
|
| 32 | <Platform>Win32</Platform>
|
| 33 | </ProjectConfiguration>
|
| 34 | + <ProjectConfiguration Include="Release-Dll|x64">
|
| 35 | + <Configuration>Release-Dll</Configuration>
|
| 36 | + <Platform>x64</Platform>
|
| 37 | + </ProjectConfiguration>
|
| 38 | <ProjectConfiguration Include="Release-Lib|Win32">
|
| 39 | <Configuration>Release-Lib</Configuration>
|
| 40 | <Platform>Win32</Platform>
|
| 41 | </ProjectConfiguration>
|
| 42 | + <ProjectConfiguration Include="Release-Lib|x64">
|
| 43 | + <Configuration>Release-Lib</Configuration>
|
| 44 | + <Platform>x64</Platform>
|
| 45 | + </ProjectConfiguration>
|
| 46 | </ItemGroup>
|
| 47 | <PropertyGroup Label="Globals">
|
| 48 | <ProjectGuid>{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}</ProjectGuid>
|
| 49 | <RootNamespace>qrcodelib</RootNamespace>
|
| 50 | <Keyword>Win32Proj</Keyword>
|
| 51 | + <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
|
| 52 | </PropertyGroup>
|
| 53 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
| 54 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="Configuration">
|
| 55 | <ConfigurationType>StaticLibrary</ConfigurationType>
|
| 56 | - <PlatformToolset>v110_xp</PlatformToolset>
|
| 57 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 58 | + <CharacterSet>MultiByte</CharacterSet>
|
| 59 | + <WholeProgramOptimization>true</WholeProgramOptimization>
|
| 60 | + </PropertyGroup>
|
| 61 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="Configuration">
|
| 62 | + <ConfigurationType>StaticLibrary</ConfigurationType>
|
| 63 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 64 | <CharacterSet>MultiByte</CharacterSet>
|
| 65 | <WholeProgramOptimization>true</WholeProgramOptimization>
|
| 66 | </PropertyGroup>
|
| 67 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="Configuration">
|
| 68 | <ConfigurationType>StaticLibrary</ConfigurationType>
|
| 69 | - <PlatformToolset>v110_xp</PlatformToolset>
|
| 70 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 71 | + <CharacterSet>MultiByte</CharacterSet>
|
| 72 | + </PropertyGroup>
|
| 73 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="Configuration">
|
| 74 | + <ConfigurationType>StaticLibrary</ConfigurationType>
|
| 75 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 76 | <CharacterSet>MultiByte</CharacterSet>
|
| 77 | </PropertyGroup>
|
| 78 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="Configuration">
|
| 79 | <ConfigurationType>DynamicLibrary</ConfigurationType>
|
| 80 | - <PlatformToolset>v110_xp</PlatformToolset>
|
| 81 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 82 | + <CharacterSet>MultiByte</CharacterSet>
|
| 83 | + <WholeProgramOptimization>true</WholeProgramOptimization>
|
| 84 | + </PropertyGroup>
|
| 85 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="Configuration">
|
| 86 | + <ConfigurationType>DynamicLibrary</ConfigurationType>
|
| 87 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 88 | <CharacterSet>MultiByte</CharacterSet>
|
| 89 | <WholeProgramOptimization>true</WholeProgramOptimization>
|
| 90 | </PropertyGroup>
|
| 91 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="Configuration">
|
| 92 | <ConfigurationType>DynamicLibrary</ConfigurationType>
|
| 93 | - <PlatformToolset>v110_xp</PlatformToolset>
|
| 94 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 95 | + <CharacterSet>MultiByte</CharacterSet>
|
| 96 | + </PropertyGroup>
|
| 97 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="Configuration">
|
| 98 | + <ConfigurationType>DynamicLibrary</ConfigurationType>
|
| 99 | + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
| 100 | <CharacterSet>MultiByte</CharacterSet>
|
| 101 | </PropertyGroup>
|
| 102 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
| 103 | @@ -52,15 +91,27 @@ |
| 104 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="PropertySheets">
|
| 105 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 106 | </ImportGroup>
|
| 107 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="PropertySheets">
|
| 108 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 109 | + </ImportGroup>
|
| 110 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="PropertySheets">
|
| 111 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 112 | </ImportGroup>
|
| 113 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="PropertySheets">
|
| 114 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 115 | + </ImportGroup>
|
| 116 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="PropertySheets">
|
| 117 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 118 | </ImportGroup>
|
| 119 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="PropertySheets">
|
| 120 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 121 | + </ImportGroup>
|
| 122 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="PropertySheets">
|
| 123 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 124 | </ImportGroup>
|
| 125 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="PropertySheets">
|
| 126 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
| 127 | + </ImportGroup>
|
| 128 | <PropertyGroup Label="UserMacros" />
|
| 129 | <PropertyGroup>
|
| 130 | <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
|
| 131 | @@ -70,11 +121,17 @@ |
| 132 | <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
|
| 133 | <LinkIncremental>true</LinkIncremental>
|
| 134 | </PropertyGroup>
|
| 135 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
|
| 136 | + <LinkIncremental>true</LinkIncremental>
|
| 137 | + </PropertyGroup>
|
| 138 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
|
| 139 | <OutDir>../.build/$(Configuration)\</OutDir>
|
| 140 | <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
|
| 141 | <LinkIncremental>false</LinkIncremental>
|
| 142 | </PropertyGroup>
|
| 143 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
|
| 144 | + <LinkIncremental>false</LinkIncremental>
|
| 145 | + </PropertyGroup>
|
| 146 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
|
| 147 | <OutDir>../.build/$(Configuration)\</OutDir>
|
| 148 | <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
|
| 149 | @@ -104,6 +161,26 @@ |
| 150 | <TargetMachine>MachineX86</TargetMachine>
|
| 151 | </Link>
|
| 152 | </ItemDefinitionGroup>
|
| 153 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
|
| 154 | + <ClCompile>
|
| 155 | + <Optimization>Disabled</Optimization>
|
| 156 | + <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
| 157 | + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
| 158 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
| 159 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
| 160 | + <PrecompiledHeader>
|
| 161 | + </PrecompiledHeader>
|
| 162 | + <WarningLevel>Level3</WarningLevel>
|
| 163 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
| 164 | + </ClCompile>
|
| 165 | + <Link>
|
| 166 | + <AdditionalDependencies>libpng15d.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
| 167 | + <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
| 168 | + <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
|
| 169 | + <GenerateDebugInformation>true</GenerateDebugInformation>
|
| 170 | + <SubSystem>Windows</SubSystem>
|
| 171 | + </Link>
|
| 172 | + </ItemDefinitionGroup>
|
| 173 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
|
| 174 | <ClCompile>
|
| 175 | <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
| 176 | @@ -124,6 +201,26 @@ |
| 177 | <TargetMachine>MachineX86</TargetMachine>
|
| 178 | </Link>
|
| 179 | </ItemDefinitionGroup>
|
| 180 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
|
| 181 | + <ClCompile>
|
| 182 | + <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
| 183 | + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
| 184 | + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
| 185 | + <PrecompiledHeader>
|
| 186 | + </PrecompiledHeader>
|
| 187 | + <WarningLevel>Level3</WarningLevel>
|
| 188 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
| 189 | + </ClCompile>
|
| 190 | + <Link>
|
| 191 | + <AdditionalDependencies>libpng15.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
| 192 | + <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
| 193 | + <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
|
| 194 | + <GenerateDebugInformation>true</GenerateDebugInformation>
|
| 195 | + <SubSystem>Windows</SubSystem>
|
| 196 | + <OptimizeReferences>true</OptimizeReferences>
|
| 197 | + <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
| 198 | + </Link>
|
| 199 | + </ItemDefinitionGroup>
|
| 200 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
|
| 201 | <ClCompile>
|
| 202 | <Optimization>Disabled</Optimization>
|
| 203 | @@ -137,6 +234,19 @@ |
| 204 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
| 205 | </ClCompile>
|
| 206 | </ItemDefinitionGroup>
|
| 207 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'">
|
| 208 | + <ClCompile>
|
| 209 | + <Optimization>Disabled</Optimization>
|
| 210 | + <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
| 211 | + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
| 212 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
| 213 | + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
| 214 | + <PrecompiledHeader>
|
| 215 | + </PrecompiledHeader>
|
| 216 | + <WarningLevel>Level3</WarningLevel>
|
| 217 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
| 218 | + </ClCompile>
|
| 219 | + </ItemDefinitionGroup>
|
| 220 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'">
|
| 221 | <ClCompile>
|
| 222 | <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
| 223 | @@ -147,6 +257,17 @@ |
| 224 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
| 225 | </ClCompile>
|
| 226 | </ItemDefinitionGroup>
|
| 227 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'">
|
| 228 | + <ClCompile>
|
| 229 | + <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
| 230 | + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
| 231 | + <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
| 232 | + <PrecompiledHeader>
|
| 233 | + </PrecompiledHeader>
|
| 234 | + <WarningLevel>Level3</WarningLevel>
|
| 235 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
| 236 | + </ClCompile>
|
| 237 | + </ItemDefinitionGroup>
|
| 238 | <ItemGroup>
|
| 239 | <ClCompile Include="qrcodelib.cpp" />
|
| 240 | <ClCompile Include="..\..\bitstream.c" />
|
| 241 | -- |
| 242 | 2.19.0.windows.1 |
| 243 | |