Am Dienstag, 22. Januar 2013, 10:35:38 schrieb Stephan Beal: > On Mon, Jan 21, 2013 at 11:12 PM, Ruediger Haertel <r_haer...@gmx.de> wrote: > > I did that already and sent a patch to Richard that updated the > > makemake.tcl > > file. Until now it is not in repository. I am still waiting ... > > Hi Ruediger, > > can you please re-send the patch, and i'll get it integrated.
Hi Stephan, here you are. Thanks for your efforts.
--- src/makemake.tcl +++ src/makemake.tcl @@ -955,10 +955,19 @@ SSL = SSLLIB = # SSL = -DFOSSIL_ENABLE_SSL=1 # SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib +#### Enable JSON (http://www.json.org) support using "cson" +# +FOSSIL_ENABLE_JSON = 1 + +#### Enable markdown support +# +FOSSIL_ENABLE_MARKDOWN = 1 + + # zlib options ZINCDIR = $(B)\compat\zlib ZLIBDIR = $(B)\compat\zlib ZLIB = zlib.lib @@ -965,12 +974,26 @@ INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) CFLAGS = -nologo -MT -O2 BCC = $(CC) $(CFLAGS) TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) +RCC = rc -D_WIN32 -D_MSC_VER $(INCL) LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) LIBDIR = -LIBPATH:$(ZLIBDIR) + +# With JSON support +!ifdef FOSSIL_ENABLE_JSON +TCC = $(TCC) -DFOSSIL_ENABLE_JSON +RCC = $(RCC) -DFOSSIL_ENABLE_JSON +!endif + +# With markdown support +!ifdef FOSSIL_ENABLE_MARKDOWN +TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN +RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN +!endif + } regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS set j " \\\n " writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n" writeln -nonewline "SRC = " @@ -981,24 +1004,22 @@ writeln -nonewline " " } writeln -nonewline "${s}_.c"; incr i } writeln "\n" +set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation] writeln -nonewline "OBJ = " set i 0 -foreach s [lsort $src] { +foreach s [lsort [concat $src $AdditionalObj]] { if {$i > 0} { writeln " \\" writeln -nonewline " " } writeln -nonewline "\$(OX)\\$s\$O"; incr i } writeln " \\" -writeln " \$(OX)\\shell\$O \\" -writeln " \$(OX)\\sqlite3\$O \\" -writeln " \$(OX)\\th\$O \\" -writeln " \$(OX)\\th_lang\$O" +writeln -nonewline " \$(OX)\\fossil.res\n" writeln { APPNAME = $(OX)\fossil$(E) all: $(OX) $(APPNAME) @@ -1006,15 +1027,15 @@ @echo Building zlib from "$(ZLIBDIR)"... @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib cd $(OX) - link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts + link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts $(OX)\linkopts: $B\win\Makefile.msc} set redir {>} -foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] { +foreach s [lsort [concat $src $AdditionalObj]] { writeln "\techo \$(OX)\\$s.obj $redir \$@" set redir {>>} } writeln "\techo \$(LIBS) >> \$@\n\n" @@ -1047,12 +1068,13 @@ $(OX)\th_lang$O : $(SRCDIR)\th_lang.c $(TCC) /Fo$@ -c $** VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION $** > $@ -$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h - cp $(SRCDIR)\cson_amalgamation.h $@ + +$(OX)\cson_amalgamation$O: $(SRCDIR)/cson_amalgamation.c + $(TCC) -DCSON_FOSSIL_MODE /Fo$@ -c $** page_index.h: mkindex$E $(SRC) $** > $@ clean: @@ -1062,10 +1084,11 @@ -del *.h -del *.map -del *.manifest -del headers -del linkopts + -del *.res realclean: clean -del $(APPNAME) -del translate$E -del mkindex$E @@ -1092,10 +1115,14 @@ writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h" writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n" writeln "${s}_.c : \$(SRCDIR)\\$s.c" writeln "\ttranslate\$E \$** > \$@\n" } + + +writeln "fossil.res : ..\\win\\fossil.rc" +writeln "\t\$(RCC) -fo \$@ \$**" writeln "headers: makeheaders\$E page_index.h VERSION.h" writeln -nonewline "\tmakeheaders\$E " set i 0 foreach s [lsort $src] {
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
