Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhancements to the MSVC makefile. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
39e8a5d93fa370afb03223bf0c20ea0f |
| User & Date: | mistachkin 2015-10-16 20:13:57 |
Context
|
2015-10-16
| ||
| 23:55 | Fix a comment in expr.c and add a CORRUPT_DB to an assert() in btree.c. (check-in: 0df371d1 user: drh tags: trunk) | |
| 20:55 | Merge the 3.9.1 updates from trunk. (check-in: bf866e6c user: drh tags: begin-concurrent) | |
| 20:53 | Merge recent enhancements from trunk. Version now 3.9.1. (check-in: 26fa091d user: drh tags: cursor-hints) | |
| 20:13 | Enhancements to the MSVC makefile. (check-in: 39e8a5d9 user: mistachkin tags: trunk) | |
| 20:12 | Merge the 3.9.1 changes into trunk. (This only updates the version number and configure script since all the other changes in 3.9.1 were cherrypicked from trunk.) (check-in: eb231742 user: drh tags: trunk) | |
Changes
Changes to Makefile.msc.
288 288 289 289 NSDKLIBPATH = $(NSDKLIBPATH:\\=\) 290 290 291 291 # C compiler and options for use in building executables that 292 292 # will run on the platform that is doing the build. 293 293 # 294 294 !IF $(USE_FULLWARN)!=0 295 -BCC = $(NCC) -nologo -W4 295 +BCC = $(NCC) -nologo -W4 $(CCOPTS) $(BCCOPTS) 296 296 !ELSE 297 -BCC = $(NCC) -nologo -W3 297 +BCC = $(NCC) -nologo -W3 $(CCOPTS) $(BCCOPTS) 298 298 !ENDIF 299 299 300 300 # Check if assembly code listings should be generated for the source 301 301 # code files to be compiled. 302 302 # 303 303 !IF $(USE_LISTINGS)!=0 304 304 BCC = $(BCC) -FAcs ................................................................................ 318 318 !ENDIF 319 319 320 320 # C compiler and options for use in building executables that 321 321 # will run on the target platform. (BCC and TCC are usually the 322 322 # same unless your are cross-compiling.) 323 323 # 324 324 !IF $(USE_FULLWARN)!=0 325 -TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 325 +TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $(TCCOPTS) 326 326 !ELSE 327 -TCC = $(CC) -nologo -W3 327 +TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS) 328 328 !ENDIF 329 329 330 330 TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src -fp:precise 331 -RCC = $(RC) -DSQLITE_OS_WIN=1 -I$(TOP) -I$(TOP)\src 331 +RCC = $(RC) -DSQLITE_OS_WIN=1 -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS) 332 332 333 333 # Check if we want to use the "stdcall" calling convention when compiling. 334 334 # This is not supported by the compilers for non-x86 platforms. It should 335 335 # also be noted here that building any target with these "stdcall" options 336 336 # will most likely fail if the Tcl library is also required. This is due 337 337 # to how the Tcl library functions are declared and exported (i.e. without 338 338 # an explicit calling convention, which results in "cdecl"). ................................................................................ 796 796 LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(PSDKLIBPATH)" 797 797 !ENDIF 798 798 !ENDIF 799 799 800 800 # If either debugging or symbols are enabled, enable PDBs. 801 801 # 802 802 !IF $(DEBUG)>1 || $(SYMBOLS)!=0 803 -LDFLAGS = /DEBUG 803 +LDFLAGS = /DEBUG $(LDOPTS) 804 +!ELSE 805 +LDFLAGS = $(LDOPTS) 804 806 !ENDIF 805 807 806 808 # Start with the Tcl related linker options. 807 809 # 808 810 !IF $(NO_TCL)==0 809 811 LTLIBPATHS = /LIBPATH:$(TCLLIBDIR) 810 812 LTLIBS = $(LIBTCL)