Skip to content

Commit 032bd59

Browse files
author
D. Richard Hipp
committed
Include the latest Makefile.msc changes and the new "make.bat" script
in the amalgamation tarballs.
1 parent c005a61 commit 032bd59

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

autoconf/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ DIST_FILES := \
282282
README.txt VERSION \
283283
auto.def autosetup configure tea \
284284
sqlite3.h sqlite3.c shell.c sqlite3ext.h \
285-
Makefile.in Makefile.msc Makefile.fallback \
285+
Makefile.in Makefile.msc Makefile.fallback make.bat \
286286
sqlite3.rc sqlite3rc.h Replace.cs \
287287
sqlite3.pc.in sqlite3.1
288288

autoconf/Makefile.msc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,17 +672,21 @@ BCC = $(BCC) /d2guard4 -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
672672
!IF $(DEBUG)>1
673673
TCC = $(TCC) -MDd
674674
BCC = $(BCC) -MDd
675+
ZLIBCFLAGS = -nologo -MDd -W3 -O2 -Oy- -Zi
675676
!ELSE
676677
TCC = $(TCC) -MD
677678
BCC = $(BCC) -MD
679+
ZLIBCFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi
678680
!ENDIF
679681
!ELSE
680682
!IF $(DEBUG)>1
681683
TCC = $(TCC) -MTd
682684
BCC = $(BCC) -MTd
685+
ZLIBCFLAGS = -nologo -MTd -W3 -O2 -Oy- -Zi
683686
!ELSE
684687
TCC = $(TCC) -MT
685688
BCC = $(BCC) -MT
689+
ZLIBCFLAGS = -nologo -MT -W3 -O2 -Oy- -Zi
686690
!ENDIF
687691
!ENDIF
688692

tool/mkautoconfamal.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ cp $TOP/src/sqlite3.rc $TMPSPACE
5959
cp $TOP/tool/Replace.cs $TMPSPACE
6060
cp $TOP/VERSION $TMPSPACE
6161
cp $TOP/main.mk $TMPSPACE
62-
62+
cp $TOP/make.bat $TMPSPACE
63+
tree $TMPSPACE
6364
cd $TMPSPACE
6465

6566
#if true; then

0 commit comments

Comments
 (0)