Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Attempt to build with MSVC. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | jimtcl |
| Files: | files | file ages | folders |
| SHA1: |
e36ad719cf308a10ff757000c9276240 |
| User & Date: | mistachkin 2011-11-05 01:30:43.117 |
References
|
2011-11-05
| ||
| 03:22 | Be sure to escape any backslashes when emitting #line preprocessor directives in the translate.c tool, cherrypick from [e36ad719cf]. ... (check-in: c2bed5b3db user: mistachkin tags: trunk) | |
Context
|
2011-11-05
| ||
| 01:59 | Fix more compilation issues with MSVC. ... (check-in: 0039d32b88 user: mistachkin tags: jimtcl) | |
| 01:30 | Attempt to build with MSVC. ... (check-in: e36ad719cf user: mistachkin tags: jimtcl) | |
| 00:23 | Police various compiler warnings. ... (check-in: 536fb1d6e0 user: mistachkin tags: jimtcl) | |
Changes
Changes to src/jim-win32compat.h.
1 2 3 4 5 6 7 8 | #ifndef JIM_WIN32COMPAT_H #define JIM_WIN32COMPAT_H /* Compatibility for Windows (mingw and msvc, not cygwin */ /* Note that at this point we don't yet have access to jimautoconf.h */ #if defined(_WIN32) || defined(WIN32) #ifndef STRICT | | | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | #ifndef JIM_WIN32COMPAT_H #define JIM_WIN32COMPAT_H /* Compatibility for Windows (mingw and msvc, not cygwin */ /* Note that at this point we don't yet have access to jimautoconf.h */ #if defined(_WIN32) || defined(WIN32) #ifndef STRICT #define STRICT #endif /* STRICT */ #define HAVE_DLOPEN void *dlopen(const char *path, int mode); int dlclose(void *handle); void *dlsym(void *handle, const char *symbol); char *dlerror(void); |
| ︙ | ︙ | |||
36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 |
#define JIM_WIDE_MIN LLONG_MIN
#define JIM_WIDE_MAX LLONG_MAX
#define JIM_WIDE_MODIFIER "I64d"
#include <io.h>
#define HAVE_GETTIMEOFDAY
struct timeval {
long tv_sec;
long tv_usec;
};
int gettimeofday(struct timeval *tv, void *unused);
#define HAVE_OPENDIR
struct dirent {
char *d_name;
};
typedef struct DIR {
long handle; /* -1 for failed rewind */
struct _finddata_t info;
struct dirent result; /* d_name null iff first time */
char *name; /* null-terminated char string */
} DIR;
DIR *opendir(const char *name);
int closedir(DIR *dir);
struct dirent *readdir(DIR *dir);
#endif /* _MSC_VER */
#endif /* WIN32 */
#endif
| > > > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 |
#define JIM_WIDE_MIN LLONG_MIN
#define JIM_WIDE_MAX LLONG_MAX
#define JIM_WIDE_MODIFIER "I64d"
#include <io.h>
#define HAVE_GETTIMEOFDAY
#ifndef TIMEVAL_H
struct timeval {
long tv_sec;
long tv_usec;
};
#endif /* TIMEVAL_H */
int gettimeofday(struct timeval *tv, void *unused);
#define HAVE_OPENDIR
#ifndef DIRENT_H
struct dirent {
char *d_name;
};
typedef struct DIR {
long handle; /* -1 for failed rewind */
struct _finddata_t info;
struct dirent result; /* d_name null iff first time */
char *name; /* null-terminated char string */
} DIR;
DIR *opendir(const char *name);
int closedir(DIR *dir);
struct dirent *readdir(DIR *dir);
#endif /* DIRENT_H */
#endif /* _MSC_VER */
#endif /* WIN32 */
#endif
|
Changes to src/translate.c.
| ︙ | ︙ | |||
158 159 160 161 162 163 164 165 166 167 168 169 |
}
}
}
}
int main(int argc, char **argv){
if( argc==2 ){
FILE *in = fopen(argv[1], "r");
if( in==0 ){
fprintf(stderr,"can not open %s\n", argv[1]);
exit(1);
}
| > | > > > > > > > > | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 |
}
}
}
}
int main(int argc, char **argv){
if( argc==2 ){
char *arg;
FILE *in = fopen(argv[1], "r");
if( in==0 ){
fprintf(stderr,"can not open %s\n", argv[1]);
exit(1);
}
printf("#line 1 \"");
for(arg=argv[1]; *arg; arg++){
if( *arg!='\\' ){
printf("%c", *arg);
}else{
printf("\\\\");
}
}
printf("\"\n");
trans(in, stdout);
fclose(in);
}else{
trans(stdin, stdout);
}
return 0;
}
|
Changes to win/Makefile.msc.
1 2 3 4 5 6 7 8 9 10 11 12 | # DO NOT EDIT # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh src/makemake.tcl" # to regenerate this file. B = .. SRCDIR = $B\src OBJDIR = . OX = . O = .obj E = .exe | < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < | | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | # DO NOT EDIT # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh src/makemake.tcl" # to regenerate this file. B = .. SRCDIR = $B\src OBJDIR = . OX = . O = .obj E = .exe # Uncomment below for SSL support SSL = SSLLIB = #SSL = -DFOSSIL_ENABLE_SSL=1 #SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib # zlib options # When using precompiled from http://zlib.net/zlib125-dll.zip #ZINCDIR = C:\zlib125-dll\include #ZLIBDIR = C:\zlib125-dll\lib #ZLIB = zdll.lib ZINCDIR = $(SRCDIR)\..\zlib-1.2.5 ZLIBDIR = $(SRCDIR)\..\zlib-1.2.5 ZLIB = zlib.lib INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) CFLAGS = -nologo -MT -O2 -DTIMEVAL_H -DDIRENT_H BCC = $(CC) $(CFLAGS) TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) LIBDIR = -LIBPATH:$(ZLIBDIR) SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\jimtcl$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O APPNAME = $(OX)\fossil$(E) all: $(OX) $(APPNAME) $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts cd $(OX) link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts $(OX)\linkopts: $B\win\Makefile.msc echo $(OX)\add$O >$@ echo $(OX)\allrepo$O >> $@ echo $(OX)\attach$O >> $@ echo $(OX)\bag$O >> $@ echo $(OX)\bisect$O >> $@ echo $(OX)\blob$O >> $@ echo $(OX)\branch$O >> $@ echo $(OX)\browse$O >> $@ echo $(OX)\captcha$O >> $@ echo $(OX)\cgi$O >> $@ echo $(OX)\checkin$O >> $@ echo $(OX)\checkout$O >> $@ echo $(OX)\clearsign$O >> $@ echo $(OX)\clone$O >> $@ echo $(OX)\comformat$O >> $@ echo $(OX)\configure$O >> $@ echo $(OX)\content$O >> $@ echo $(OX)\db$O >> $@ echo $(OX)\delta$O >> $@ echo $(OX)\deltacmd$O >> $@ echo $(OX)\descendants$O >> $@ echo $(OX)\diff$O >> $@ echo $(OX)\diffcmd$O >> $@ echo $(OX)\doc$O >> $@ echo $(OX)\encode$O >> $@ echo $(OX)\event$O >> $@ echo $(OX)\export$O >> $@ echo $(OX)\file$O >> $@ echo $(OX)\finfo$O >> $@ echo $(OX)\glob$O >> $@ echo $(OX)\graph$O >> $@ echo $(OX)\gzip$O >> $@ echo $(OX)\http$O >> $@ echo $(OX)\http_socket$O >> $@ echo $(OX)\http_ssl$O >> $@ echo $(OX)\http_transport$O >> $@ echo $(OX)\import$O >> $@ echo $(OX)\info$O >> $@ echo $(OX)\jimtcl$O >> $@ echo $(OX)\json$O >> $@ echo $(OX)\json_artifact$O >> $@ echo $(OX)\json_branch$O >> $@ echo $(OX)\json_diff$O >> $@ echo $(OX)\json_login$O >> $@ echo $(OX)\json_query$O >> $@ echo $(OX)\json_report$O >> $@ echo $(OX)\json_tag$O >> $@ echo $(OX)\json_timeline$O >> $@ echo $(OX)\json_user$O >> $@ echo $(OX)\json_wiki$O >> $@ echo $(OX)\leaf$O >> $@ echo $(OX)\login$O >> $@ echo $(OX)\main$O >> $@ echo $(OX)\manifest$O >> $@ echo $(OX)\md5$O >> $@ echo $(OX)\merge$O >> $@ echo $(OX)\merge3$O >> $@ echo $(OX)\name$O >> $@ echo $(OX)\path$O >> $@ echo $(OX)\pivot$O >> $@ echo $(OX)\popen$O >> $@ echo $(OX)\pqueue$O >> $@ echo $(OX)\printf$O >> $@ echo $(OX)\rebuild$O >> $@ echo $(OX)\report$O >> $@ echo $(OX)\rss$O >> $@ echo $(OX)\schema$O >> $@ echo $(OX)\search$O >> $@ echo $(OX)\setup$O >> $@ echo $(OX)\sha1$O >> $@ echo $(OX)\shell$O >> $@ echo $(OX)\shun$O >> $@ echo $(OX)\skins$O >> $@ echo $(OX)\sqlcmd$O >> $@ echo $(OX)\sqlite3$O >> $@ echo $(OX)\stash$O >> $@ echo $(OX)\stat$O >> $@ echo $(OX)\style$O >> $@ echo $(OX)\sync$O >> $@ echo $(OX)\tag$O >> $@ echo $(OX)\tar$O >> $@ echo $(OX)\th_main$O >> $@ echo $(OX)\timeline$O >> $@ echo $(OX)\tkt$O >> $@ echo $(OX)\tktsetup$O >> $@ echo $(OX)\undo$O >> $@ echo $(OX)\update$O >> $@ echo $(OX)\url$O >> $@ echo $(OX)\user$O >> $@ echo $(OX)\verify$O >> $@ echo $(OX)\vfile$O >> $@ echo $(OX)\wiki$O >> $@ echo $(OX)\wikiformat$O >> $@ echo $(OX)\winhttp$O >> $@ echo $(OX)\xfer$O >> $@ echo $(OX)\zip$O >> $@ echo $(LIBS) >> $@ $(OX): @-mkdir $@ |
| ︙ | ︙ | |||
171 172 173 174 175 176 177 | $(OX)\shell$O : $(SRCDIR)\shell.c $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $** | < < < < < < | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | $(OX)\shell$O : $(SRCDIR)\shell.c $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $** VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION $** > $@ $(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h cp $(SRCDIR)\cson_amalgamation.h $@ page_index.h: mkindex$E $(SRC) $** > $@ |
| ︙ | ︙ | |||
434 435 436 437 438 439 440 441 442 443 444 445 446 447 | $(OX)\info$O : info_.c info.h $(TCC) /Fo$@ -c info_.c info_.c : $(SRCDIR)\info.c translate$E $** > $@ $(OX)\json$O : json_.c json.h $(TCC) /Fo$@ -c json_.c json_.c : $(SRCDIR)\json.c translate$E $** > $@ $(OX)\json_artifact$O : json_artifact_.c json_artifact.h | > > > | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 | $(OX)\info$O : info_.c info.h $(TCC) /Fo$@ -c info_.c info_.c : $(SRCDIR)\info.c translate$E $** > $@ $(OX)\jimtcl$O : $(SRCDIR)\..\autosetup\jimsh0.c $(TCC) /Fo$@ /DJIM_BOOTSTRAP_LIB_ONLY -c $(SRCDIR)\..\autosetup\jimsh0.c $(OX)\json$O : json_.c json.h $(TCC) /Fo$@ -c json_.c json_.c : $(SRCDIR)\json.c translate$E $** > $@ $(OX)\json_artifact$O : json_artifact_.c json_artifact.h |
| ︙ | ︙ |