Further MSVC makefile changes to support Windows Phone 8.1.

FossilOrigin-Name: a9c81815e1b7a9c05da61f75edac45cb1a954135

diff --git a/Makefile.msc b/Makefile.msc
index a2d623e653df0f90149d73d95340d1b42ce7cb3c..218abe1f8c0101a0f623c05b670948bf4a26c9b4 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -16,6 +16,12 @@ TOP = .
 USE_AMALGAMATION = 1
 !ENDIF
 
+# Set this non-0 to use the libraries necessary for Windows Phone 8.1.
+#
+!IFNDEF USE_WP81_OPTS
+USE_WP81_OPTS = 0
+!ENDIF
+
 # Set this non-0 to split the SQLite amalgamation file into chunks to
 # be used for debugging with Visual Studio.
 #
@@ -132,6 +138,12 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 ############################### END OF OPTIONS ################################
 ###############################################################################
 
+# This assumes that MSVC is always installed in 32-bit Program Files directory
+# and sets the variable for use in locating other 32-bit installs accordingly.
+#
+PROGRAMFILES_X86 = $(VCINSTALLDIR)\..\..
+PROGRAMFILES_X86 = $(PROGRAMFILES_X86:\\=\)
+
 # Check for the predefined command macro CC.  This should point to the compiler
 # binary for the target platform.  If it is not defined, simply define it to
 # the legacy default value 'cl.exe'.
@@ -550,6 +562,33 @@ LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(STORELIBPATH)"
 !ENDIF
 !ENDIF
 
+# When compiling for Windows Phone 8.1, an extra library path is
+# required.
+#
+!IF $(USE_WP81_OPTS)!=0
+!IFNDEF WP81LIBPATH
+!IF "$(PLATFORM)"=="x86"
+WP81LIBPATH = $(PROGRAMFILES_X86)\Windows Phone Kits\8.1\lib\x86
+!ELSEIF "$(PLATFORM)"=="ARM"
+WP81LIBPATH = $(PROGRAMFILES_X86)\Windows Phone Kits\8.1\lib\ARM
+!ELSE
+WP81LIBPATH = $(PROGRAMFILES_X86)\Windows Phone Kits\8.1\lib\x86
+!ENDIF
+!ENDIF
+!ENDIF
+
+# When compiling for Windows Phone 8.1, some extra linker options
+# are also required.
+#
+!IF $(USE_WP81_OPTS)!=0
+!IFDEF WP81LIBPATH
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(WP81LIBPATH)"
+!ENDIF
+LTLINKOPTS = $(LTLINKOPTS) /DYNAMICBASE
+LTLINKOPTS = $(LTLINKOPTS) WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelHost.lib
+LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:ole32.lib
+!ENDIF
+
 # If either debugging or symbols are enabled, enable PDBs.
 #
 !IF $(DEBUG)>0 || $(SYMBOLS)!=0

diff --git a/manifest b/manifest
index 7f6738b740183dc511ed52ecf71ef37a1c6361d4..3eb473a1360993bfedae252ba6af8d5203aa2d49 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Merge\supdates\sfrom\strunk.
-D 2014-05-09T20:54:07.623
+C Further\sMSVC\smakefile\schanges\sto\ssupport\sWindows\sPhone\s8.1.
+D 2014-05-09T23:31:55.574
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc f4b4d99d61cfe4ec508600dccd1a0ab2dc8a8b9b
+F Makefile.msc 26164f8288a7380b05587534ca3974c3837e5bd0
 F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
 F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@ -1170,7 +1170,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
-P 69698ae90c415cb32d2c144725853483da65f0ff c3dce2e7390eec3a337be1b99f80ad5f721cc647
-R 5a8ec6fb329eaf82ce72337357145445
+P f4fea7bb8a4b118bdceff400a6c49c6291c0d58e
+R cc5d4172ed1063b929dacadc942922f5
 U mistachkin
-Z 30139e1f65fbd864d0f9d58c85a7550e
+Z e9a82f6e684a32dc44406c7db15e32b2

diff --git a/manifest.uuid b/manifest.uuid
index 8c9091248cece4f7ca556b7167b45d9df1384425..36d319c95e54e7dac3f21d938d00d856167bad42 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4fea7bb8a4b118bdceff400a6c49c6291c0d58e
\ No newline at end of file
+a9c81815e1b7a9c05da61f75edac45cb1a954135
\ No newline at end of file