From: mistachkin <mistachkin@noemail.net>
Date: Fri, 23 Mar 2012 12:28:21 +0000 (+0000)
Subject: Update MSVC makefile to support compiling for WinRT using one setting.
X-Git-Tag: version-3.7.13~11^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46b721a29469d75bdacf07610b93261bf19940c7;p=thirdparty%2Fsqlite.git

Update MSVC makefile to support compiling for WinRT using one setting.

FossilOrigin-Name: c10794bfac0989c611ec3ea98d069cb9631a7b15
---

diff --git a/Makefile.msc b/Makefile.msc
index 24bc0b2951..97a79d4261 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -15,6 +15,12 @@ USE_AMALGAMATION = 1
 #
 USE_ICU = 0
 
+# Set this non-0 to compile binaries suitable for the WinRT environment.
+# This setting does not apply to any binaries that require Tcl to operate
+# properly (i.e. the text fixture, etc).
+#
+FOR_WINRT = 0
+
 # Set this to non-0 to create and use PDBs.
 #
 SYMBOLS = 1
@@ -44,11 +50,15 @@ BCC = cl.exe
 TCC = cl.exe -W3 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise
 
 # When compiling the library for use in the WinRT environment,
-# the following compile-time option must be used as well to
+# the following compile-time options must be used as well to
 # disable use of Win32 APIs that are not available and to enable
 # use of Win32 APIs that are specific to Windows 8 and/or WinRT.
+# Also, we need to dynamically link to the MSVC runtime when
+# compiling for WinRT.
 #
-# TCC = $(TCC) -DSQLITE_OS_WINRT=1
+!IF $(FOR_WINRT)!=0
+TCC = $(TCC) -DSQLITE_OS_WINRT=1 -MD
+!ENDIF
 
 # The mksqlite3c.tcl and mksqlite3h.tcl scripts will pull in
 # any extension header files by default.  For non-amalgamation
diff --git a/manifest b/manifest
index 71ee21efaa..9e1571b430 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\sWinRT\scomments\sto\sMSVC\smakefile.
-D 2012-03-20T02:18:42.086
+C Update\sMSVC\smakefile\sto\ssupport\scompiling\sfor\sWinRT\susing\sone\ssetting.
+D 2012-03-23T12:28:21.645
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc a42ae17632258af9ca0c94847e1c072644b38887
+F Makefile.msc 47c5fd7e41e773835f78e2d8d32f67b0c8734113
 F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414
@@ -992,7 +992,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 6f0c1f9761be0402b82945517fdb3a36aeacbaeb
-R 0313ae77c5dbe64845daebd70988142f
+P ddea657bd8fe3762bd460524ac9223f0a5b09752
+R 73aeb52e562bd72810737fc034c57c72
 U mistachkin
-Z cd021cef313ab330e262afa3df1b88ed
+Z de85e312d806eace4ad69be21292db54
diff --git a/manifest.uuid b/manifest.uuid
index e780766964..1b10195f13 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ddea657bd8fe3762bd460524ac9223f0a5b09752
\ No newline at end of file
+c10794bfac0989c611ec3ea98d069cb9631a7b15
\ No newline at end of file