/ Check-in [8eaa2cd3]
Login

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

Overview
Comment:Add vdbesort.c to the MSVC makefile.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8eaa2cd3f454711f2275d03831bca6a36a0b2504
User & Date: mistachkin 2011-08-17 02:19:54
Context
2011-08-17
07:46
Properly process x64 DLL exports, which do not contain a leading underscore, in the MSVC makefile. check-in: d5936324 user: mistachkin tags: trunk
02:19
Add vdbesort.c to the MSVC makefile. check-in: 8eaa2cd3 user: mistachkin tags: trunk
00:40
Use OP_Sort rather than OP_Rewind in order to sort the content of a new index on the CREATE INDEX statement. Add an ALWAYS() to the merge sort logic to document an unreachable branch. check-in: f01766f4 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   158    158            memjournal.lo \
   159    159            mutex.lo mutex_noop.lo mutex_os2.lo mutex_unix.lo mutex_w32.lo \
   160    160            notify.lo opcodes.lo os.lo os_os2.lo os_unix.lo os_win.lo \
   161    161            pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
   162    162            random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
   163    163            table.lo tokenize.lo trigger.lo \
   164    164            update.lo util.lo vacuum.lo \
   165         -         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
   166         -         wal.lo walker.lo where.lo utf.lo vtab.lo
          165  +         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
          166  +         vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
   167    167   
   168    168   # Object files for the amalgamation.
   169    169   #
   170    170   LIBOBJS1 = sqlite3.lo
   171    171   
   172    172   # Determine the real value of LIBOBJ based on the 'configure' script
   173    173   #
................................................................................
   258    258     $(TOP)\src\vacuum.c \
   259    259     $(TOP)\src\vdbe.c \
   260    260     $(TOP)\src\vdbe.h \
   261    261     $(TOP)\src\vdbeapi.c \
   262    262     $(TOP)\src\vdbeaux.c \
   263    263     $(TOP)\src\vdbeblob.c \
   264    264     $(TOP)\src\vdbemem.c \
          265  +  $(TOP)\src\vdbesort.c \
   265    266     $(TOP)\src\vdbetrace.c \
   266    267     $(TOP)\src\vdbeInt.h \
   267    268     $(TOP)\src\vtab.c \
   268    269     $(TOP)\src\wal.c \
   269    270     $(TOP)\src\wal.h \
   270    271     $(TOP)\src\walker.c \
   271    272     $(TOP)\src\where.c
................................................................................
   399    400     $(TOP)\src\tokenize.c \
   400    401     $(TOP)\src\utf.c \
   401    402     $(TOP)\src\util.c \
   402    403     $(TOP)\src\vdbeapi.c \
   403    404     $(TOP)\src\vdbeaux.c \
   404    405     $(TOP)\src\vdbe.c \
   405    406     $(TOP)\src\vdbemem.c \
          407  +  $(TOP)\src\vdbesort.c \
   406    408     $(TOP)\src\vdbetrace.c \
   407    409     $(TOP)\src\where.c \
   408    410     parse.c \
   409    411     $(TOP)\ext\fts3\fts3.c \
   410    412     $(TOP)\ext\fts3\fts3_aux.c \
   411    413     $(TOP)\ext\fts3\fts3_expr.c \
   412    414     $(TOP)\ext\fts3\fts3_tokenizer.c \
................................................................................
   711    713   	$(LTCOMPILE) -c $(TOP)\src\vdbeaux.c
   712    714   
   713    715   vdbeblob.lo:	$(TOP)\src\vdbeblob.c $(HDR)
   714    716   	$(LTCOMPILE) -c $(TOP)\src\vdbeblob.c
   715    717   
   716    718   vdbemem.lo:	$(TOP)\src\vdbemem.c $(HDR)
   717    719   	$(LTCOMPILE) -c $(TOP)\src\vdbemem.c
          720  +
          721  +vdbesort.lo:	$(TOP)\src\vdbesort.c $(HDR)
          722  +	$(LTCOMPILE) -c $(TOP)\src\vdbesort.c
   718    723   
   719    724   vdbetrace.lo:	$(TOP)\src\vdbetrace.c $(HDR)
   720    725   	$(LTCOMPILE) -c $(TOP)\src\vdbetrace.c
   721    726   
   722    727   vtab.lo:	$(TOP)\src\vtab.c $(HDR)
   723    728   	$(LTCOMPILE) -c $(TOP)\src\vtab.c
   724    729