From 3dbb70ff9e2b13c6aaff4f1fb155cc815551b88f Mon Sep 17 00:00:00 2001
From: JongKook Kim <d0nzs00n@gmail.com>
Date: Wed, 8 Dec 2021 08:15:03 +0900
Subject: [PATCH 1/2] fix vs2019 x86 compile error

---
 src/binding/c/lottieanimation_capi.cpp |  2 +-
 src/lottie/lottiemodel.h               |  2 +-
 vs2019/rlottie.vcxproj                 | 14 +++++++++++---
 vs2019/rlottie.vcxproj.filters         |  5 ++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/binding/c/lottieanimation_capi.cpp b/src/binding/c/lottieanimation_capi.cpp
index a54dac51..b1c14288 100644
--- a/src/binding/c/lottieanimation_capi.cpp
+++ b/src/binding/c/lottieanimation_capi.cpp
@@ -268,7 +268,7 @@ lottie_animation_get_markerlist(Lottie_Animation_S *animation)
    animation->mMarkerList->ptr = new LOTMarker[markers.size()]();
 
    for(size_t i = 0; i < markers.size(); i++) {
-       animation->mMarkerList->ptr[i].name = strdup(std::get<0>(markers[i]).c_str());
+       animation->mMarkerList->ptr[i].name = _strdup(std::get<0>(markers[i]).c_str());
        animation->mMarkerList->ptr[i].startframe= std::get<1>(markers[i]);
        animation->mMarkerList->ptr[i].endframe= std::get<2>(markers[i]);
    }
diff --git a/src/lottie/lottiemodel.h b/src/lottie/lottiemodel.h
index c6b8cf6d..56c21a82 100644
--- a/src/lottie/lottiemodel.h
+++ b/src/lottie/lottiemodel.h
@@ -478,7 +478,7 @@ class Object {
                 strncpy(mData._buffer, name, len + 1);
             } else {
                 setShortString(false);
-                mPtr = strdup(name);
+                mPtr = _strdup(name);
             }
         }
     }
diff --git a/vs2019/rlottie.vcxproj b/vs2019/rlottie.vcxproj
index 81a72fba..5f48c8c1 100644
--- a/vs2019/rlottie.vcxproj
+++ b/vs2019/rlottie.vcxproj
@@ -26,13 +26,13 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -76,6 +76,9 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -90,6 +93,7 @@
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4251;4244;4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -103,6 +107,9 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -121,6 +128,7 @@
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4251;4244;4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -249,4 +257,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vs2019/rlottie.vcxproj.filters b/vs2019/rlottie.vcxproj.filters
index d204f54a..24edcfe3 100644
--- a/vs2019/rlottie.vcxproj.filters
+++ b/vs2019/rlottie.vcxproj.filters
@@ -272,6 +272,9 @@
     <ClInclude Include="config.h">
       <Filter>inc</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lottie\lottieloader.h">
+      <Filter>inc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\binding\c\lottieanimation_capi.cpp">
@@ -382,4 +385,4 @@
       <Filter>src\vector\pixman</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

From 27968bf39f16adba35d50a0e501c85b54b93b66b Mon Sep 17 00:00:00 2001
From: JongKook Kim <d0nzs00n@gmail.com>
Date: Wed, 8 Dec 2021 08:22:08 +0900
Subject: [PATCH 2/2] fix vs2019 x86 compile error

---
 src/binding/c/lottieanimation_capi.cpp | 2 +-
 src/lottie/lottiemodel.h               | 2 +-
 vs2019/rlottie.vcxproj                 | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/binding/c/lottieanimation_capi.cpp b/src/binding/c/lottieanimation_capi.cpp
index b1c14288..a54dac51 100644
--- a/src/binding/c/lottieanimation_capi.cpp
+++ b/src/binding/c/lottieanimation_capi.cpp
@@ -268,7 +268,7 @@ lottie_animation_get_markerlist(Lottie_Animation_S *animation)
    animation->mMarkerList->ptr = new LOTMarker[markers.size()]();
 
    for(size_t i = 0; i < markers.size(); i++) {
-       animation->mMarkerList->ptr[i].name = _strdup(std::get<0>(markers[i]).c_str());
+       animation->mMarkerList->ptr[i].name = strdup(std::get<0>(markers[i]).c_str());
        animation->mMarkerList->ptr[i].startframe= std::get<1>(markers[i]);
        animation->mMarkerList->ptr[i].endframe= std::get<2>(markers[i]);
    }
diff --git a/src/lottie/lottiemodel.h b/src/lottie/lottiemodel.h
index 56c21a82..c6b8cf6d 100644
--- a/src/lottie/lottiemodel.h
+++ b/src/lottie/lottiemodel.h
@@ -478,7 +478,7 @@ class Object {
                 strncpy(mData._buffer, name, len + 1);
             } else {
                 setShortString(false);
-                mPtr = _strdup(name);
+                mPtr = strdup(name);
             }
         }
     }
diff --git a/vs2019/rlottie.vcxproj b/vs2019/rlottie.vcxproj
index 5f48c8c1..6eb5838a 100644
--- a/vs2019/rlottie.vcxproj
+++ b/vs2019/rlottie.vcxproj
@@ -78,7 +78,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -93,7 +93,7 @@
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4251;4244;4996</DisableSpecificWarnings>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -109,7 +109,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4251;4244;4996</DisableSpecificWarnings>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>