mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2024-10-28 08:49:35 +01:00
build: windows: remove qrencode-win32 patching
Changes to a more maintained repo source. Change-Id: Ie9903761ad8cb740b79552f59dc851976c1ef9da
This commit is contained in:
parent
8e33a6125f
commit
e46a123609
5 changed files with 21 additions and 270 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,6 +1,6 @@
|
||||||
[submodule "3rdparty/qrencode-win32"]
|
[submodule "3rdparty/qrencode-win32"]
|
||||||
path = 3rdparty/qrencode-win32
|
path = 3rdparty/qrencode-win32
|
||||||
url = https://github.com/BlueDragon747/qrencode-win32.git
|
url = https://github.com/blizzard4591/qrencode-win32.git
|
||||||
ignore = dirty
|
ignore = dirty
|
||||||
[submodule "3rdparty/libqrencode"]
|
[submodule "3rdparty/libqrencode"]
|
||||||
url = https://github.com/fukuchi/libqrencode.git
|
url = https://github.com/fukuchi/libqrencode.git
|
||||||
|
|
2
3rdparty/qrencode-win32
vendored
2
3rdparty/qrencode-win32
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit d6495a2aa74d058d54ae0f1b9e9e545698de66ce
|
Subproject commit 5ccf9bd4455dfd55a41acfdf0bdbeb85605e10b6
|
|
@ -363,10 +363,6 @@ if(MSVC)
|
||||||
# preprocessor defines
|
# preprocessor defines
|
||||||
add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG)
|
add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG)
|
||||||
|
|
||||||
# dependencies
|
|
||||||
set(QRENCODE_DIR
|
|
||||||
${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)
|
|
||||||
|
|
||||||
# compiler options
|
# compiler options
|
||||||
add_compile_options(
|
add_compile_options(
|
||||||
/wd4068 /wd4099 /wd4189 /wd4267 /wd4577 /wd4467 /wd4715 /wd4828)
|
/wd4068 /wd4099 /wd4189 /wd4267 /wd4577 /wd4467 /wd4715 /wd4828)
|
||||||
|
@ -384,8 +380,10 @@ if(MSVC)
|
||||||
"/NODEFAULTLIB:LIBCMT")
|
"/NODEFAULTLIB:LIBCMT")
|
||||||
|
|
||||||
# client deps
|
# client deps
|
||||||
set(QRENCODE_LIB
|
set(QRENCODE_DIR ${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)
|
||||||
${QRENCODE_DIR}/vc8/qrcodelib/x64/Release-Lib/qrcodelib.lib)
|
file(GLOB_RECURSE QRENCODE_LIB ${QRENCODE_DIR}/qrcodelib.lib)
|
||||||
|
file(GLOB_RECURSE QRENCODE_INCLUDE ${QRENCODE_DIR}/qrencode.h)
|
||||||
|
get_filename_component(QRENCODE_INCLUDE_DIR ${QRENCODE_INCLUDE} DIRECTORY)
|
||||||
|
|
||||||
# daemon
|
# daemon
|
||||||
set(JAMID_SRC_PATH ${DAEMON_DIR}/contrib/msvc/include)
|
set(JAMID_SRC_PATH ${DAEMON_DIR}/contrib/msvc/include)
|
||||||
|
@ -404,7 +402,7 @@ if(MSVC)
|
||||||
include_directories(
|
include_directories(
|
||||||
${JAMID_SRC_PATH}
|
${JAMID_SRC_PATH}
|
||||||
${LIBCLIENT_SRC_DIR}
|
${LIBCLIENT_SRC_DIR}
|
||||||
${QRENCODE_DIR})
|
${QRENCODE_INCLUDE_DIR})
|
||||||
elseif (NOT APPLE)
|
elseif (NOT APPLE)
|
||||||
list(APPEND COMMON_SOURCES
|
list(APPEND COMMON_SOURCES
|
||||||
${APP_SRC_DIR}/xrectsel.c
|
${APP_SRC_DIR}/xrectsel.c
|
||||||
|
|
|
@ -65,6 +65,15 @@ this_dir = os.path.dirname(os.path.realpath(__file__))
|
||||||
repo_root_dir = os.path.abspath(os.path.join(this_dir, os.pardir, os.pardir))
|
repo_root_dir = os.path.abspath(os.path.join(this_dir, os.pardir, os.pardir))
|
||||||
build_dir = os.path.join(repo_root_dir, "build")
|
build_dir = os.path.join(repo_root_dir, "build")
|
||||||
|
|
||||||
|
def get_latest_toolset_version():
|
||||||
|
"""Get the latest toolset version."""
|
||||||
|
# Get the visual studio version. Use only the major version number.
|
||||||
|
# Then: toolset = 2022 ? "v143" : 2019 ? "v142" : 2017 ? "v141" : "v140"
|
||||||
|
vs_ver = get_vs_prop("installationVersion")
|
||||||
|
if vs_ver is None:
|
||||||
|
return None
|
||||||
|
vs_ver = int(vs_ver.split(".")[0])
|
||||||
|
return "v143" if vs_ver >= 16 else "v142" if vs_ver >= 15 else "v141"
|
||||||
|
|
||||||
def find_latest_qt_path():
|
def find_latest_qt_path():
|
||||||
"""Find the latest Qt installation path."""
|
"""Find the latest Qt installation path."""
|
||||||
|
@ -205,29 +214,16 @@ def init_submodules():
|
||||||
|
|
||||||
def build_deps():
|
def build_deps():
|
||||||
"""Build the dependencies for the project."""
|
"""Build the dependencies for the project."""
|
||||||
print('Patching and building qrencode')
|
print('Building qrencode')
|
||||||
apply_cmd = [
|
|
||||||
'git',
|
|
||||||
'apply',
|
|
||||||
'--reject',
|
|
||||||
'--ignore-whitespace',
|
|
||||||
'--whitespace=fix'
|
|
||||||
]
|
|
||||||
qrencode_dir = os.path.join(repo_root_dir, '3rdparty', 'qrencode-win32')
|
qrencode_dir = os.path.join(repo_root_dir, '3rdparty', 'qrencode-win32')
|
||||||
patch_file = os.path.join(repo_root_dir, 'qrencode-win32.patch')
|
|
||||||
apply_cmd.append(patch_file)
|
|
||||||
if execute_cmd(apply_cmd, False, None, qrencode_dir):
|
|
||||||
print("Couldn't patch qrencode-win32.")
|
|
||||||
|
|
||||||
vs_env_vars = {}
|
vs_env_vars = {}
|
||||||
vs_env_vars.update(get_vs_env())
|
vs_env_vars.update(get_vs_env())
|
||||||
|
toolset = get_latest_toolset_version()
|
||||||
msbuild_args = get_ms_build_args("x64", "Release-Lib")
|
print(f'Using toolset {toolset}')
|
||||||
|
msbuild_args = get_ms_build_args("x64", "Release-Lib", toolset)
|
||||||
proj_path = os.path.join(
|
proj_path = os.path.join(
|
||||||
qrencode_dir, "qrencode-win32", "vc8", "qrcodelib", "qrcodelib.vcxproj"
|
qrencode_dir, "qrencode-win32", "vc15", "qrcodelib", "qrcodelib.vcxproj"
|
||||||
)
|
)
|
||||||
|
|
||||||
build_project(msbuild_args, proj_path, vs_env_vars)
|
build_project(msbuild_args, proj_path, vs_env_vars)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,243 +0,0 @@
|
||||||
From 261d830b9b4126d76519db0e6b6b51b5a730eb40 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
|
|
||||||
Date: Tue, 4 Dec 2018 17:42:43 -0500
|
|
||||||
Subject: [PATCH] b
|
|
||||||
|
|
||||||
---
|
|
||||||
.../vc8/qrcodelib/qrcodelib.vcxproj | 129 +++++++++++++++++-
|
|
||||||
1 file changed, 125 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
|
|
||||||
index aabc6b6..8d8293b 100644
|
|
||||||
--- a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
|
|
||||||
+++ b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
|
|
||||||
@@ -5,45 +5,84 @@
|
|
||||||
<Configuration>Debug-Dll</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
+ <ProjectConfiguration Include="Debug-Dll|x64">
|
|
||||||
+ <Configuration>Debug-Dll</Configuration>
|
|
||||||
+ <Platform>x64</Platform>
|
|
||||||
+ </ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug-Lib|Win32">
|
|
||||||
<Configuration>Debug-Lib</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
+ <ProjectConfiguration Include="Debug-Lib|x64">
|
|
||||||
+ <Configuration>Debug-Lib</Configuration>
|
|
||||||
+ <Platform>x64</Platform>
|
|
||||||
+ </ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release-Dll|Win32">
|
|
||||||
<Configuration>Release-Dll</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
+ <ProjectConfiguration Include="Release-Dll|x64">
|
|
||||||
+ <Configuration>Release-Dll</Configuration>
|
|
||||||
+ <Platform>x64</Platform>
|
|
||||||
+ </ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release-Lib|Win32">
|
|
||||||
<Configuration>Release-Lib</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
+ <ProjectConfiguration Include="Release-Lib|x64">
|
|
||||||
+ <Configuration>Release-Lib</Configuration>
|
|
||||||
+ <Platform>x64</Platform>
|
|
||||||
+ </ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}</ProjectGuid>
|
|
||||||
<RootNamespace>qrcodelib</RootNamespace>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
+ <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
- <PlatformToolset>v110_xp</PlatformToolset>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
+ <CharacterSet>MultiByte</CharacterSet>
|
|
||||||
+ <WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
+ </PropertyGroup>
|
|
||||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="Configuration">
|
|
||||||
+ <ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
- <PlatformToolset>v110_xp</PlatformToolset>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
+ <CharacterSet>MultiByte</CharacterSet>
|
|
||||||
+ </PropertyGroup>
|
|
||||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="Configuration">
|
|
||||||
+ <ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
- <PlatformToolset>v110_xp</PlatformToolset>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
+ <CharacterSet>MultiByte</CharacterSet>
|
|
||||||
+ <WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
+ </PropertyGroup>
|
|
||||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="Configuration">
|
|
||||||
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
- <PlatformToolset>v110_xp</PlatformToolset>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
+ <CharacterSet>MultiByte</CharacterSet>
|
|
||||||
+ </PropertyGroup>
|
|
||||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="Configuration">
|
|
||||||
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
@@ -52,15 +91,27 @@
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="PropertySheets">
|
|
||||||
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
+ </ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="PropertySheets">
|
|
||||||
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
+ </ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="PropertySheets">
|
|
||||||
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
+ </ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" 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>
|
|
||||||
<_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
|
|
||||||
@@ -70,11 +121,17 @@
|
|
||||||
<IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
|
|
||||||
+ <LinkIncremental>true</LinkIncremental>
|
|
||||||
+ </PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
|
|
||||||
<OutDir>../.build/$(Configuration)\</OutDir>
|
|
||||||
<IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
|
|
||||||
+ <LinkIncremental>false</LinkIncremental>
|
|
||||||
+ </PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
|
|
||||||
<OutDir>../.build/$(Configuration)\</OutDir>
|
|
||||||
<IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
|
|
||||||
@@ -104,6 +161,26 @@
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
|
|
||||||
+ <ClCompile>
|
|
||||||
+ <Optimization>Disabled</Optimization>
|
|
||||||
+ <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
||||||
+ <PrecompiledHeader>
|
|
||||||
+ </PrecompiledHeader>
|
|
||||||
+ <WarningLevel>Level3</WarningLevel>
|
|
||||||
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
||||||
+ </ClCompile>
|
|
||||||
+ <Link>
|
|
||||||
+ <AdditionalDependencies>libpng15d.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
+ <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
+ <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
|
|
||||||
+ <GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
+ <SubSystem>Windows</SubSystem>
|
|
||||||
+ </Link>
|
|
||||||
+ </ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
@@ -124,6 +201,26 @@
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
|
|
||||||
+ <ClCompile>
|
|
||||||
+ <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
+ <PrecompiledHeader>
|
|
||||||
+ </PrecompiledHeader>
|
|
||||||
+ <WarningLevel>Level3</WarningLevel>
|
|
||||||
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
||||||
+ </ClCompile>
|
|
||||||
+ <Link>
|
|
||||||
+ <AdditionalDependencies>libpng15.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
+ <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
+ <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
|
|
||||||
+ <GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
+ <SubSystem>Windows</SubSystem>
|
|
||||||
+ <OptimizeReferences>true</OptimizeReferences>
|
|
||||||
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
+ </Link>
|
|
||||||
+ </ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
@@ -137,6 +234,19 @@
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'">
|
|
||||||
+ <ClCompile>
|
|
||||||
+ <Optimization>Disabled</Optimization>
|
|
||||||
+ <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
||||||
+ <PrecompiledHeader>
|
|
||||||
+ </PrecompiledHeader>
|
|
||||||
+ <WarningLevel>Level3</WarningLevel>
|
|
||||||
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
||||||
+ </ClCompile>
|
|
||||||
+ </ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
@@ -147,6 +257,17 @@
|
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'">
|
|
||||||
+ <ClCompile>
|
|
||||||
+ <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
||||||
+ <PrecompiledHeader>
|
|
||||||
+ </PrecompiledHeader>
|
|
||||||
+ <WarningLevel>Level3</WarningLevel>
|
|
||||||
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
||||||
+ </ClCompile>
|
|
||||||
+ </ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="qrcodelib.cpp" />
|
|
||||||
<ClCompile Include="..\..\bitstream.c" />
|
|
||||||
--
|
|
||||||
2.19.0.windows.1
|
|
||||||
|
|
Loading…
Reference in a new issue