From 22b252119a094100139d3655de64b5adb00d8c8d Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sat, 10 Oct 2015 18:11:32 +1100
Subject: [PATCH] project: Update for recent upstream merge.

---
 SMP/config.asm                 | 1 +
 SMP/config.h                   | 1 +
 SMP/libavcodec.vcxproj         | 6 ++++++
 SMP/libavcodec.vcxproj.filters | 9 +++++++++
 4 files changed, 17 insertions(+)

diff --git a/SMP/config.asm b/SMP/config.asm
index 619751cc09..1d55df63d4 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -316,6 +316,7 @@
 %define HAVE_SYSCONF 0
 %define HAVE_SYSCTL 0
 %define HAVE_USLEEP 0
+%define HAVE_UTGETOSTYPEFROMSTRING 0
 %define HAVE_VIRTUALALLOC 1
 %define HAVE_WGLGETPROCADDRESS 1
 %define HAVE_PTHREADS 0
diff --git a/SMP/config.h b/SMP/config.h
index cdba4fba7e..394bfeb541 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -347,6 +347,7 @@
 #define HAVE_SYSCONF 0
 #define HAVE_SYSCTL 0
 #define HAVE_USLEEP 0
+#define HAVE_UTGETOSTYPEFROMSTRING 0
 #define HAVE_VIRTUALALLOC 1
 #define HAVE_WGLGETPROCADDRESS 1
 #define HAVE_PTHREADS 0
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index 893a1290b3..102f256ecc 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -119,6 +119,7 @@
     <YASM Include="..\libavcodec\x86\proresdsp.asm" />
     <YASM Include="..\libavcodec\x86\rv40dsp.asm" />
     <YASM Include="..\libavcodec\x86\svq1enc.asm" />
+    <YASM Include="..\libavcodec\x86\takdsp.asm" />
     <YASM Include="..\libavcodec\x86\ttadsp.asm" />
     <YASM Include="..\libavcodec\x86\v210enc.asm" />
     <YASM Include="..\libavcodec\x86\v210.asm" />
@@ -1226,6 +1227,9 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\tak.c">
     </ClCompile>
+    <ClCompile Include="..\libavcodec\takdsp.c">
+      <ObjectFileName>$(IntDir)\libavcodec_takdsp.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\targa.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\targaenc.c">
@@ -1723,6 +1727,8 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\svq1enc_init.c">
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\takdsp_init.c">
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\ttadsp_init.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\v210-init.c">
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index e6b32f57d8..cce8b81add 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -201,6 +201,9 @@
     <YASM Include="..\libavcodec\x86\svq1enc.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\takdsp.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\ttadsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -1835,6 +1838,9 @@
     <ClCompile Include="..\libavcodec\tak.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\takdsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\targa.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2564,6 +2570,9 @@
     <ClCompile Include="..\libavcodec\x86\svq1enc_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\takdsp_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\ttadsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-- 
GitLab