Fossil SCM

Updates to the VC++ makefile.

drh 2011-06-16 19:51 trunk
Commit 82d741db3e8290046bc05960377e92004ebc1231
Parent dbe1e68e43487bf…
2 files changed +6 -6 +88 -3
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+6 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -669,18 +669,18 @@
669669
670670
 all: $(OX) $(APPNAME)
671671
672672
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
673673
 cd $(OX)
674
- link -LINK -OUT:$@ $(LIBDIR) @linkopts
674
+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts
675675
676676
 $(OX)\linkopts: $B\win\Makefile.msc}
677
-writeln -nonewline "\techo "
678
-foreach s [lsort $src] {
679
- writeln -nonewline "$s "
677
+set redir {>}
678
+foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
679
+ writeln "\techo \$(OX)\\$s.obj $redir \$@"
680
+ set redir {>>}
680681
 }
681
-writeln "sqlite3 th th_lang > \$@"
682682
 writeln "\techo \$(LIBS) >> \$@\n\n"
683683
684684
 writeln {
685685
686686
 $(OX):
@@ -697,11 +697,11 @@
697697
698698
 version$E: $B\win\version.c
699699
 $(BCC) $**
700700
701701
 $(OX)\shell$O : $(SRCDIR)\shell.c
702
- $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c shell_.c
702
+ $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
703703
704704
 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
705705
 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
706706
707707
 $(OX)\th$O : $(SRCDIR)\th.c
708708
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -669,18 +669,18 @@
669
670 all: $(OX) $(APPNAME)
671
672 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
673 cd $(OX)
674 link -LINK -OUT:$@ $(LIBDIR) @linkopts
675
676 $(OX)\linkopts: $B\win\Makefile.msc}
677 writeln -nonewline "\techo "
678 foreach s [lsort $src] {
679 writeln -nonewline "$s "
 
680 }
681 writeln "sqlite3 th th_lang > \$@"
682 writeln "\techo \$(LIBS) >> \$@\n\n"
683
684 writeln {
685
686 $(OX):
@@ -697,11 +697,11 @@
697
698 version$E: $B\win\version.c
699 $(BCC) $**
700
701 $(OX)\shell$O : $(SRCDIR)\shell.c
702 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c shell_.c
703
704 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
705 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
706
707 $(OX)\th$O : $(SRCDIR)\th.c
708
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -669,18 +669,18 @@
669
670 all: $(OX) $(APPNAME)
671
672 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
673 cd $(OX)
674 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts
675
676 $(OX)\linkopts: $B\win\Makefile.msc}
677 set redir {>}
678 foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
679 writeln "\techo \$(OX)\\$s.obj $redir \$@"
680 set redir {>>}
681 }
 
682 writeln "\techo \$(LIBS) >> \$@\n\n"
683
684 writeln {
685
686 $(OX):
@@ -697,11 +697,11 @@
697
698 version$E: $B\win\version.c
699 $(BCC) $**
700
701 $(OX)\shell$O : $(SRCDIR)\shell.c
702 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
703
704 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
705 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
706
707 $(OX)\th$O : $(SRCDIR)\th.c
708
M win/Makefile.msc
+88 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -47,14 +47,99 @@
4747
4848
 all: $(OX) $(APPNAME)
4949
5050
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
5151
 cd $(OX)
52
- link -LINK -OUT:$@ $(LIBDIR) @linkopts
52
+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts
5353
5454
 $(OX)\linkopts: $B\win\Makefile.msc
55
- echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
55
+ echo $(OX)\add.obj > $@
56
+ echo $(OX)\allrepo.obj >> $@
57
+ echo $(OX)\attach.obj >> $@
58
+ echo $(OX)\bag.obj >> $@
59
+ echo $(OX)\bisect.obj >> $@
60
+ echo $(OX)\blob.obj >> $@
61
+ echo $(OX)\branch.obj >> $@
62
+ echo $(OX)\browse.obj >> $@
63
+ echo $(OX)\captcha.obj >> $@
64
+ echo $(OX)\cgi.obj >> $@
65
+ echo $(OX)\checkin.obj >> $@
66
+ echo $(OX)\checkout.obj >> $@
67
+ echo $(OX)\clearsign.obj >> $@
68
+ echo $(OX)\clone.obj >> $@
69
+ echo $(OX)\comformat.obj >> $@
70
+ echo $(OX)\configure.obj >> $@
71
+ echo $(OX)\content.obj >> $@
72
+ echo $(OX)\db.obj >> $@
73
+ echo $(OX)\delta.obj >> $@
74
+ echo $(OX)\deltacmd.obj >> $@
75
+ echo $(OX)\descendants.obj >> $@
76
+ echo $(OX)\diff.obj >> $@
77
+ echo $(OX)\diffcmd.obj >> $@
78
+ echo $(OX)\doc.obj >> $@
79
+ echo $(OX)\encode.obj >> $@
80
+ echo $(OX)\event.obj >> $@
81
+ echo $(OX)\export.obj >> $@
82
+ echo $(OX)\file.obj >> $@
83
+ echo $(OX)\finfo.obj >> $@
84
+ echo $(OX)\glob.obj >> $@
85
+ echo $(OX)\graph.obj >> $@
86
+ echo $(OX)\gzip.obj >> $@
87
+ echo $(OX)\http.obj >> $@
88
+ echo $(OX)\http_socket.obj >> $@
89
+ echo $(OX)\http_ssl.obj >> $@
90
+ echo $(OX)\http_transport.obj >> $@
91
+ echo $(OX)\import.obj >> $@
92
+ echo $(OX)\info.obj >> $@
93
+ echo $(OX)\leaf.obj >> $@
94
+ echo $(OX)\login.obj >> $@
95
+ echo $(OX)\main.obj >> $@
96
+ echo $(OX)\manifest.obj >> $@
97
+ echo $(OX)\md5.obj >> $@
98
+ echo $(OX)\merge.obj >> $@
99
+ echo $(OX)\merge3.obj >> $@
100
+ echo $(OX)\name.obj >> $@
101
+ echo $(OX)\path.obj >> $@
102
+ echo $(OX)\pivot.obj >> $@
103
+ echo $(OX)\popen.obj >> $@
104
+ echo $(OX)\pqueue.obj >> $@
105
+ echo $(OX)\printf.obj >> $@
106
+ echo $(OX)\rebuild.obj >> $@
107
+ echo $(OX)\report.obj >> $@
108
+ echo $(OX)\rss.obj >> $@
109
+ echo $(OX)\schema.obj >> $@
110
+ echo $(OX)\search.obj >> $@
111
+ echo $(OX)\setup.obj >> $@
112
+ echo $(OX)\sha1.obj >> $@
113
+ echo $(OX)\shell.obj >> $@
114
+ echo $(OX)\shun.obj >> $@
115
+ echo $(OX)\skins.obj >> $@
116
+ echo $(OX)\sqlcmd.obj >> $@
117
+ echo $(OX)\sqlite3.obj >> $@
118
+ echo $(OX)\stash.obj >> $@
119
+ echo $(OX)\stat.obj >> $@
120
+ echo $(OX)\style.obj >> $@
121
+ echo $(OX)\sync.obj >> $@
122
+ echo $(OX)\tag.obj >> $@
123
+ echo $(OX)\tar.obj >> $@
124
+ echo $(OX)\th.obj >> $@
125
+ echo $(OX)\th_lang.obj >> $@
126
+ echo $(OX)\th_main.obj >> $@
127
+ echo $(OX)\timeline.obj >> $@
128
+ echo $(OX)\tkt.obj >> $@
129
+ echo $(OX)\tktsetup.obj >> $@
130
+ echo $(OX)\undo.obj >> $@
131
+ echo $(OX)\update.obj >> $@
132
+ echo $(OX)\url.obj >> $@
133
+ echo $(OX)\user.obj >> $@
134
+ echo $(OX)\verify.obj >> $@
135
+ echo $(OX)\vfile.obj >> $@
136
+ echo $(OX)\wiki.obj >> $@
137
+ echo $(OX)\wikiformat.obj >> $@
138
+ echo $(OX)\winhttp.obj >> $@
139
+ echo $(OX)\xfer.obj >> $@
140
+ echo $(OX)\zip.obj >> $@
56141
 echo $(LIBS) >> $@
57142
58143
59144
60145
@@ -72,11 +157,11 @@
72157
73158
 version$E: $B\win\version.c
74159
 $(BCC) $**
75160
76161
 $(OX)\shell$O : $(SRCDIR)\shell.c
77
- $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c shell_.c
162
+ $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
78163
79164
 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
80165
 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
81166
82167
 $(OX)\th$O : $(SRCDIR)\th.c
83168
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -47,14 +47,99 @@
47
48 all: $(OX) $(APPNAME)
49
50 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
51 cd $(OX)
52 link -LINK -OUT:$@ $(LIBDIR) @linkopts
53
54 $(OX)\linkopts: $B\win\Makefile.msc
55 echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
56 echo $(LIBS) >> $@
57
58
59
60
@@ -72,11 +157,11 @@
72
73 version$E: $B\win\version.c
74 $(BCC) $**
75
76 $(OX)\shell$O : $(SRCDIR)\shell.c
77 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c shell_.c
78
79 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
80 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
81
82 $(OX)\th$O : $(SRCDIR)\th.c
83
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -47,14 +47,99 @@
47
48 all: $(OX) $(APPNAME)
49
50 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
51 cd $(OX)
52 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts
53
54 $(OX)\linkopts: $B\win\Makefile.msc
55 echo $(OX)\add.obj > $@
56 echo $(OX)\allrepo.obj >> $@
57 echo $(OX)\attach.obj >> $@
58 echo $(OX)\bag.obj >> $@
59 echo $(OX)\bisect.obj >> $@
60 echo $(OX)\blob.obj >> $@
61 echo $(OX)\branch.obj >> $@
62 echo $(OX)\browse.obj >> $@
63 echo $(OX)\captcha.obj >> $@
64 echo $(OX)\cgi.obj >> $@
65 echo $(OX)\checkin.obj >> $@
66 echo $(OX)\checkout.obj >> $@
67 echo $(OX)\clearsign.obj >> $@
68 echo $(OX)\clone.obj >> $@
69 echo $(OX)\comformat.obj >> $@
70 echo $(OX)\configure.obj >> $@
71 echo $(OX)\content.obj >> $@
72 echo $(OX)\db.obj >> $@
73 echo $(OX)\delta.obj >> $@
74 echo $(OX)\deltacmd.obj >> $@
75 echo $(OX)\descendants.obj >> $@
76 echo $(OX)\diff.obj >> $@
77 echo $(OX)\diffcmd.obj >> $@
78 echo $(OX)\doc.obj >> $@
79 echo $(OX)\encode.obj >> $@
80 echo $(OX)\event.obj >> $@
81 echo $(OX)\export.obj >> $@
82 echo $(OX)\file.obj >> $@
83 echo $(OX)\finfo.obj >> $@
84 echo $(OX)\glob.obj >> $@
85 echo $(OX)\graph.obj >> $@
86 echo $(OX)\gzip.obj >> $@
87 echo $(OX)\http.obj >> $@
88 echo $(OX)\http_socket.obj >> $@
89 echo $(OX)\http_ssl.obj >> $@
90 echo $(OX)\http_transport.obj >> $@
91 echo $(OX)\import.obj >> $@
92 echo $(OX)\info.obj >> $@
93 echo $(OX)\leaf.obj >> $@
94 echo $(OX)\login.obj >> $@
95 echo $(OX)\main.obj >> $@
96 echo $(OX)\manifest.obj >> $@
97 echo $(OX)\md5.obj >> $@
98 echo $(OX)\merge.obj >> $@
99 echo $(OX)\merge3.obj >> $@
100 echo $(OX)\name.obj >> $@
101 echo $(OX)\path.obj >> $@
102 echo $(OX)\pivot.obj >> $@
103 echo $(OX)\popen.obj >> $@
104 echo $(OX)\pqueue.obj >> $@
105 echo $(OX)\printf.obj >> $@
106 echo $(OX)\rebuild.obj >> $@
107 echo $(OX)\report.obj >> $@
108 echo $(OX)\rss.obj >> $@
109 echo $(OX)\schema.obj >> $@
110 echo $(OX)\search.obj >> $@
111 echo $(OX)\setup.obj >> $@
112 echo $(OX)\sha1.obj >> $@
113 echo $(OX)\shell.obj >> $@
114 echo $(OX)\shun.obj >> $@
115 echo $(OX)\skins.obj >> $@
116 echo $(OX)\sqlcmd.obj >> $@
117 echo $(OX)\sqlite3.obj >> $@
118 echo $(OX)\stash.obj >> $@
119 echo $(OX)\stat.obj >> $@
120 echo $(OX)\style.obj >> $@
121 echo $(OX)\sync.obj >> $@
122 echo $(OX)\tag.obj >> $@
123 echo $(OX)\tar.obj >> $@
124 echo $(OX)\th.obj >> $@
125 echo $(OX)\th_lang.obj >> $@
126 echo $(OX)\th_main.obj >> $@
127 echo $(OX)\timeline.obj >> $@
128 echo $(OX)\tkt.obj >> $@
129 echo $(OX)\tktsetup.obj >> $@
130 echo $(OX)\undo.obj >> $@
131 echo $(OX)\update.obj >> $@
132 echo $(OX)\url.obj >> $@
133 echo $(OX)\user.obj >> $@
134 echo $(OX)\verify.obj >> $@
135 echo $(OX)\vfile.obj >> $@
136 echo $(OX)\wiki.obj >> $@
137 echo $(OX)\wikiformat.obj >> $@
138 echo $(OX)\winhttp.obj >> $@
139 echo $(OX)\xfer.obj >> $@
140 echo $(OX)\zip.obj >> $@
141 echo $(LIBS) >> $@
142
143
144
145
@@ -72,11 +157,11 @@
157
158 version$E: $B\win\version.c
159 $(BCC) $**
160
161 $(OX)\shell$O : $(SRCDIR)\shell.c
162 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
163
164 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
165 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
166
167 $(OX)\th$O : $(SRCDIR)\th.c
168

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button