Skip to content

Commit 4c9f8e2

Browse files
j2dollj2doll
committed
testing in visual studio 2019
1 parent 451d609 commit 4c9f8e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+5050
-15904
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
##
44
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
55

6+
!libcurl*/
7+
68
# Prerequisites
79
*.d
810

@@ -73,11 +75,13 @@ dkms.conf
7375
[Rr]eleases/
7476
x64/
7577
x86/
78+
Win32/
7679
bld/
7780
[Bb]in/
7881
[Oo]bj/
7982
[Ll]og/
8083

84+
8185
# Visual Studio 2015/2017 cache/options directory
8286
.vs/
8387
# Uncomment if you have tasks that create the project's static files in wwwroot

‎README.ko.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@ json-downloader.exe data.json
3030
- 첫 번째 인수는 다운로드 할 파일의 URL입니다.
3131
- 두 번째 인수는 로컬에 저장할 파일의 이름입니다.
3232

33-
## 필요한 환경
34-
- Visual Studio 2017 x64
35-
- Windows 10 x64 (어쩌면 Windows 7/8 x64에서도 빌드될 것입니다.)
33+
## 필요한 빌드 환경
34+
- Visual Studio 2019 (x86/x64)
3635

3736
## 라이센스와 링크
3837
- json-downloader는 LGPL 3 라이센스 입니다. [https://github.com/j2doll/json-downloader](https://github.com/j2doll/json-downloader)
3938
- curl는 MIT 스타일 라이센스 입니다. [https://curl.haxx.se/docs/copyright.html](https://curl.haxx.se/docs/copyright.html)
4039
- JSON for Modern C++는 MIT 라이센스 입니다. [https://github.com/nlohmann/json/releases](https://github.com/nlohmann/json/releases)
4140
- spdlog는 MIT 라이센스 입니다. [https://github.com/gabime/spdlog](https://github.com/gabime/spdlog)
42-
- unarr는 LGPL 3 라이센스 입니다. [https://github.com/selmf/unarr](https://github.com/selmf/unarr)

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@ json-downloader.exe data.json
3030
- The first argument is the URL of the file you want to download.
3131
- The second argument is the name of the file to be saved locally.
3232

33-
## Requred Environment
34-
- Visual Studio 2017 x64
35-
- Windows 10 x64 (Maybe it will also build on Windows 7/8 x64.)
33+
## Requred Build Environment
34+
- Visual Studio 2017 (x86/x64)
3635

3736
## License and links
3837
- json-downloader is under LGPL 3 license. [https://github.com/j2doll/json-downloader](https://github.com/j2doll/json-downloader)
3938
- curl is under MIT style license. [https://curl.haxx.se/docs/copyright.html](https://curl.haxx.se/docs/copyright.html)
4039
- JSON for Modern C++ is under MIT license. [https://github.com/nlohmann/json/releases](https://github.com/nlohmann/json/releases)
4140
- spdlog is under MIT license. [https://github.com/gabime/spdlog](https://github.com/gabime/spdlog)
42-
- unarr is under LGPL 3 license. [https://github.com/selmf/unarr](https://github.com/selmf/unarr)

‎json-downloader/json-downloader.sln‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2041
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28803.352
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-downloader", "json-downloader\json-downloader.vcxproj", "{EF5FD35E-4ED0-411A-B256-162933C88054}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|x64 = Debug|x64
11+
Debug|x86 = Debug|x86
1112
Release|x64 = Release|x64
13+
Release|x86 = Release|x86
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1416
{EF5FD35E-4ED0-411A-B256-162933C88054}.Debug|x64.ActiveCfg = Debug|x64
1517
{EF5FD35E-4ED0-411A-B256-162933C88054}.Debug|x64.Build.0 = Debug|x64
18+
{EF5FD35E-4ED0-411A-B256-162933C88054}.Debug|x86.ActiveCfg = Debug|Win32
19+
{EF5FD35E-4ED0-411A-B256-162933C88054}.Debug|x86.Build.0 = Debug|Win32
1620
{EF5FD35E-4ED0-411A-B256-162933C88054}.Release|x64.ActiveCfg = Release|x64
1721
{EF5FD35E-4ED0-411A-B256-162933C88054}.Release|x64.Build.0 = Release|x64
22+
{EF5FD35E-4ED0-411A-B256-162933C88054}.Release|x86.ActiveCfg = Release|Win32
23+
{EF5FD35E-4ED0-411A-B256-162933C88054}.Release|x86.Build.0 = Release|Win32
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE

‎json-downloader/json-downloader/json-downloader.vcxproj‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,32 @@
2323
<ProjectGuid>{EF5FD35E-4ED0-411A-B256-162933C88054}</ProjectGuid>
2424
<Keyword>Win32Proj</Keyword>
2525
<RootNamespace>jsondownloader</RootNamespace>
26-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v141</PlatformToolset>
32+
<PlatformToolset>v142</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v141</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v141</PlatformToolset>
45+
<PlatformToolset>v142</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v141</PlatformToolset>
51+
<PlatformToolset>v142</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
@@ -72,31 +72,36 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
76+
<IntDir>$(Platform)\$(Configuration)\</IntDir>
7577
</PropertyGroup>
7678
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7779
<LinkIncremental>true</LinkIncremental>
78-
<IncludePath>..\..\unarr;..\..\json\include;..\..\spdlog\include;..\..\libcurl-vc14-AMD64-release-static-ipv6-sspi-winssl\include;$(IncludePath)</IncludePath>
7980
</PropertyGroup>
8081
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8182
<LinkIncremental>false</LinkIncremental>
83+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
84+
<IntDir>$(Platform)\$(Configuration)\</IntDir>
8285
</PropertyGroup>
8386
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8487
<LinkIncremental>false</LinkIncremental>
85-
<IncludePath>..\..\unarr;..\..\json\include;..\..\spdlog\include;..\..\libcurl-vc14-AMD64-release-static-ipv6-sspi-winssl\include;$(IncludePath)</IncludePath>
8688
</PropertyGroup>
8789
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8890
<ClCompile>
8991
<PrecompiledHeader>Use</PrecompiledHeader>
9092
<WarningLevel>Level3</WarningLevel>
9193
<Optimization>Disabled</Optimization>
9294
<SDLCheck>true</SDLCheck>
93-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<PreprocessorDefinitions>CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9496
<ConformanceMode>true</ConformanceMode>
9597
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
98+
<AdditionalIncludeDirectories>..\..\libcurl-vc-x86-release-static-ipv6-sspi-winssl\include;..\..\spdlog\include;..\..\json\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9699
</ClCompile>
97100
<Link>
98101
<SubSystem>Console</SubSystem>
99102
<GenerateDebugInformation>true</GenerateDebugInformation>
103+
<AdditionalDependencies>Normaliz.lib;wldap32.lib;crypt32.lib;ws2_32.lib;libcurl_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
104+
<AdditionalLibraryDirectories>..\..\libcurl-vc-x86-release-static-ipv6-sspi-winssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100105
</Link>
101106
</ItemDefinitionGroup>
102107
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -108,12 +113,13 @@
108113
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109114
<ConformanceMode>true</ConformanceMode>
110115
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
116+
<AdditionalIncludeDirectories>..\..\spdlog\include;..\..\json\include;..\..\libcurl-vc-x64-release-static-ipv6-sspi-winssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
111117
</ClCompile>
112118
<Link>
113119
<SubSystem>Console</SubSystem>
114120
<GenerateDebugInformation>true</GenerateDebugInformation>
115-
<AdditionalLibraryDirectories>..\..\unarr\Release;..\..\libcurl-vc14-AMD64-release-static-ipv6-sspi-winssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
116-
<AdditionalDependencies>unarr.lib;libcurl_a.lib;ws2_32.lib;wldap32.lib;crypt32.lib;Normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
121+
<AdditionalLibraryDirectories>..\..\libcurl-vc-x64-release-static-ipv6-sspi-winssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
122+
<AdditionalDependencies>libcurl_a.lib;ws2_32.lib;wldap32.lib;crypt32.lib;Normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
117123
</Link>
118124
</ItemDefinitionGroup>
119125
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -124,15 +130,18 @@
124130
<FunctionLevelLinking>true</FunctionLevelLinking>
125131
<IntrinsicFunctions>true</IntrinsicFunctions>
126132
<SDLCheck>true</SDLCheck>
127-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128134
<ConformanceMode>true</ConformanceMode>
129135
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
136+
<AdditionalIncludeDirectories>..\..\libcurl-vc-x86-release-static-ipv6-sspi-winssl\include;..\..\spdlog\include;..\..\json\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130137
</ClCompile>
131138
<Link>
132139
<SubSystem>Console</SubSystem>
133140
<EnableCOMDATFolding>true</EnableCOMDATFolding>
134141
<OptimizeReferences>true</OptimizeReferences>
135142
<GenerateDebugInformation>true</GenerateDebugInformation>
143+
<AdditionalDependencies>Normaliz.lib;wldap32.lib;crypt32.lib;ws2_32.lib;libcurl_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
144+
<AdditionalLibraryDirectories>..\..\libcurl-vc-x86-release-static-ipv6-sspi-winssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
136145
</Link>
137146
</ItemDefinitionGroup>
138147
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -146,14 +155,15 @@
146155
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147156
<ConformanceMode>true</ConformanceMode>
148157
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
158+
<AdditionalIncludeDirectories>..\..\spdlog\include;..\..\json\include;..\..\libcurl-vc-x64-release-static-ipv6-sspi-winssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
149159
</ClCompile>
150160
<Link>
151161
<SubSystem>Console</SubSystem>
152162
<EnableCOMDATFolding>true</EnableCOMDATFolding>
153163
<OptimizeReferences>true</OptimizeReferences>
154164
<GenerateDebugInformation>true</GenerateDebugInformation>
155-
<AdditionalLibraryDirectories>..\..\unarr\Release;..\..\libcurl-vc14-AMD64-release-static-ipv6-sspi-winssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
156-
<AdditionalDependencies>unarr.lib;libcurl_a.lib;ws2_32.lib;wldap32.lib;crypt32.lib;Normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
165+
<AdditionalLibraryDirectories>..\..\libcurl-vc-x64-release-static-ipv6-sspi-winssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
166+
<AdditionalDependencies>libcurl_a.lib;ws2_32.lib;wldap32.lib;crypt32.lib;Normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
157167
</Link>
158168
</ItemDefinitionGroup>
159169
<ItemGroup>

‎json-downloader/json-downloader/pch.h‎

-64 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)