From 9a2ba806a4c8ef6192fd911963f8106d40336ef3 Mon Sep 17 00:00:00 2001
From: Philippe Lieser
Date: Thu, 1 Jun 2017 14:30:00 +0200
Subject: Update VS project to VS2013 Disable secondary LZMA in VS project Fix
building
---
xdelta3/xdelta3-main.h | 2 ++
xdelta3/xdelta3.h | 5 +++++
xdelta3/xdelta3.vcxproj | 13 +++++++++----
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 5b4e34b..7f1e589 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -382,6 +382,7 @@ main_config (void)
XPR(NTR "sizeof(int)=%d\n", (int)sizeof(int));
XPR(NTR "sizeof(long)=%d\n", (int)sizeof(long));
XPR(NTR "sizeof(long long)=%d\n", (int)sizeof(long long));
+ XPR(NTR "sizeof(unsigned long long)=%d\n", (int)sizeof(unsigned long long));
XPR(NTR "sizeof(size_t)=%d\n", (int)sizeof(size_t));
XPR(NTR "sizeof(uint32_t)=%d\n", (int)sizeof(uint32_t));
XPR(NTR "sizeof(uint64_t)=%d\n", (int)sizeof(uint64_t));
@@ -672,6 +673,7 @@ main_strtoxoff (const char* s, xoff_t *xo, char which)
unsigned long long bad = ULONG_MAX;
#else
/* Something wrong with SIZEOF_XOFF_T, SIZEOF_UNSIGNED_LONG, etc. */
+ #error Bad configure script
#endif
if (xx == bad)
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index f98eb2a..b9b6fe0 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -136,6 +136,7 @@
/* _MSV_VER is defined by Microsoft tools, not by Mingw32 */
#ifdef _MSC_VER
typedef signed int ssize_t;
+typedef int pid_t;
#if _MSC_VER < 1600
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
@@ -144,6 +145,7 @@ typedef ULONGLONG uint64_t;
#else /* _MSC_VER >= 1600 */
/* For MSVC10 and above */
#include
+#define inline __inline
#endif /* _MSC_VER < 1600 */
#else /* _MSC_VER not defined */
/* Mingw32 */
@@ -165,6 +167,9 @@ typedef ULONGLONG uint64_t;
#define _FILE_OFFSET_BITS 64
#endif
+static_assert(SIZEOF_SIZE_T == sizeof(size_t), "SIZEOF_SIZE_T not correctly set");
+static_assert(SIZEOF_UNSIGNED_LONG_LONG == sizeof(unsigned long long), "SIZEOF_UNSIGNED_LONG_LONG not correctly set");
+
/* Set a xoff_t typedef and the "Q" printf insert. */
#if defined(_WIN32)
typedef uint64_t xoff_t;
diff --git a/xdelta3/xdelta3.vcxproj b/xdelta3/xdelta3.vcxproj
index 1bff06b..31f97f8 100755
--- a/xdelta3/xdelta3.vcxproj
+++ b/xdelta3/xdelta3.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -77,6 +77,7 @@
Application
true
MultiByte
+ v120
Application
@@ -87,12 +88,14 @@
Application
true
MultiByte
+ v120
Application
false
true
MultiByte
+ v120
Application
@@ -105,13 +108,14 @@
false
true
MultiByte
- Windows7.1SDK
+ v120
Application
false
true
MultiByte
+ v120
Application
@@ -124,6 +128,7 @@
false
true
MultiByte
+ v120
@@ -190,14 +195,14 @@
NotUsing
Level3
Disabled
- WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;SECONDARY_LZMA=1;LZMA_API_STATIC;%(PreprocessorDefinitions)
+ WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;SECONDARY_LZMA=0;LZMA_API_STATIC;SIZEOF_SIZE_T=4;SIZEOF_UNSIGNED_LONG_LONG=8;%(PreprocessorDefinitions)
MultiThreaded
../xz/include
Console
true
- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\..\..\..\src\xz\bin_i486\liblzma_static.lib;%(AdditionalDependencies)
+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
--
cgit v1.2.3