From: mistachkin <mistachkin@noemail.net>
Date: Wed, 17 Aug 2011 07:46:48 +0000 (+0000)
Subject: Properly process x64 DLL exports, which do not contain a leading underscore, in the... 
X-Git-Tag: version-3.7.8~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a3eb4aef3cad4d4d1adeb4364bfa8ca7f4ee130;p=thirdparty%2Fsqlite.git

Properly process x64 DLL exports, which do not contain a leading underscore, in the MSVC makefile.

FossilOrigin-Name: d5936324d27a16ce251f56f5813176c82215d901
---

diff --git a/Makefile.msc b/Makefile.msc
index 326ae9d2bb..60fe09dcd1 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -897,7 +897,7 @@ dll: sqlite3.dll
 sqlite3.def: libsqlite3.lib
 	echo EXPORTS > sqlite3.def
 	dumpbin /all libsqlite3.lib \
-		| $(NAWK) "/ 1 _sqlite3_/ { sub(/^.* _/,\"\");print }" \
+		| $(NAWK) "/ 1 _?sqlite3_/ { sub(/^.* _?/,\"\");print }" \
 		| sort >> sqlite3.def
 
 sqlite3.dll: $(LIBOBJ) sqlite3.def
diff --git a/manifest b/manifest
index 3e76ee2ab1..2022a36dd8 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\svdbesort.c\sto\sthe\sMSVC\smakefile.
-D 2011-08-17T02:19:54.041
+C Properly\sprocess\sx64\sDLL\sexports,\swhich\sdo\snot\scontain\sa\sleading\sunderscore,\sin\sthe\sMSVC\smakefile.
+D 2011-08-17T07:46:48.807
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc fea2e0a074809d785dd7471a3b0d72acca4c9073
+F Makefile.msc 386444f1e1a1536d19a426030d93fd6e03b7d3b5
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
@@ -960,7 +960,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P f01766f42342f043bf0cbe1e07224963011f01b7
-R c793a5c60ca1ad78ac8923cca825ce9c
+P 8eaa2cd3f454711f2275d03831bca6a36a0b2504
+R 0fe48656420959bd5de542be5b4efaf6
 U mistachkin
-Z 34f393e16d3ab18b8e040e48a688f767
+Z 5230d32cf6c6e4c6fcefed256acd0f20
diff --git a/manifest.uuid b/manifest.uuid
index d2f7c86b6b..afdbd317e3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8eaa2cd3f454711f2275d03831bca6a36a0b2504
\ No newline at end of file
+d5936324d27a16ce251f56f5813176c82215d901
\ No newline at end of file