/ Check-in [9eac4a6b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Updates to nmake makefile to allow options to be passed to lib.exe.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9eac4a6bbe111d951ad23395ba82c868473c5b9b
User & Date: shaneh 2011-06-21 18:12:07
Context
2011-06-21
19:30
Update a few of the uri tests to work on Windows. check-in: a2a0cd4a user: shaneh tags: trunk
18:12
Updates to nmake makefile to allow options to be passed to lib.exe. check-in: 9eac4a6b user: shaneh tags: trunk
15:54
Give the osLocaltime() function file scope in date.c. check-in: 15774845 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   110    110   
   111    111   # If a platform was set, force the linker to target that.
   112    112   # Note that the vcvars*.bat family of batch files typically
   113    113   # set this for you.  Otherwise, the linker will attempt
   114    114   # to deduce the binary type based on the object files.
   115    115   !IF "$(PLATFORM)"!=""
   116    116   LTLINKOPTS = /MACHINE:$(PLATFORM)
          117  +LTLIBOPTS = /MACHINE:$(PLATFORM)
   117    118   !ENDIF
   118    119   
   119    120   # nawk compatible awk.
   120    121   NAWK = .\gawk.exe
   121    122   
   122    123   # You should not have to change anything below this line
   123    124   ###############################################################################
................................................................................
   437    438   
   438    439   # This is the default Makefile target.  The objects listed here
   439    440   # are what get build when you type just "make" with no arguments.
   440    441   #
   441    442   all:	libsqlite3.lib sqlite3.exe libtclsqlite3.lib
   442    443   
   443    444   libsqlite3.lib:	$(LIBOBJ)
   444         -	$(LTLIB) -OUT:$@ $(LIBOBJ) $(TLIBS)
          445  +	$(LTLIB) $(LTLIBOPTS) /OUT:$@ $(LIBOBJ) $(TLIBS)
   445    446   
   446    447   libtclsqlite3.lib:	tclsqlite.lo libsqlite3.lib
   447         -	$(LTLIB) /LIBPATH:$(TCLLIBDIR) -OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS)
          448  +	$(LTLIB) $(LTLIBOPTS) /LIBPATH:$(TCLLIBDIR) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS)
   448    449   
   449    450   sqlite3.exe:	$(TOP)\src\shell.c libsqlite3.lib sqlite3.h
   450    451   	$(LTLINK) $(READLINE_FLAGS) \
   451    452   		$(TOP)\src\shell.c \
   452    453   		/link $(LTLINKOPTS) libsqlite3.lib $(LIBREADLINE) $(TLIBS)
   453    454   
   454    455   # This target creates a directory named "tsrc" and fills it with
................................................................................
   867    868   sqlite3.def: libsqlite3.lib
   868    869   	echo EXPORTS >sqlite3.def
   869    870   	dumpbin /all libsqlite3.lib \
   870    871   		| $(NAWK) "/ 1 _sqlite3_/ { sub(/^.* _/,\"\");print }" \
   871    872   		| sort >>sqlite3.def
   872    873   
   873    874   sqlite3.dll: $(LIBOBJ) sqlite3.def
   874         -	link /DLL /OUT:$@ /DEF:sqlite3.def $(LIBOBJ)
          875  +	link $(LTLINKOPTS) /DLL /DEF:sqlite3.def /OUT:$@ $(LIBOBJ)