Differences From Artifact [15716d3d94]:

• File src/makemake.tcl — part of check-in [ed544f3d9c] at 2013-04-29 23:44:07 on branch trunk — Fix x64 compilation on Windows using the MSVC toolset included with VS 2012. (user: mistachkin size: 38905)

To Artifact [a88a79aaab]:

• File src/makemake.tcl — part of check-in [f151da2135] at 2013-04-30 00:03:15 on branch trunk — Omit CFLAGS when passing compiler options to the MSVC resource compiler. (user: mistachkin size: 38895)

966
967
968
969
970
971
972
973

974
975
976
977
978
979
980

966
967
968
969
970
971
972

973
974
975
976
977
978
979
980

-
+

!ifdef FOSSIL_ENABLE_SSL
INCL   = $(INCL) -I$(SSLINCDIR)
!endif

CFLAGS = -nologo -MT -O2
BCC    = $(CC) $(CFLAGS)
TCC    = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
RCC    = rc $(CFLAGS) $(MSCDEF) $(INCL)
RCC    = rc $(MSCDEF) $(INCL)
LIBS   = $(ZLIB) ws2_32.lib advapi32.lib
LIBDIR = -LIBPATH:$(ZLIBDIR)

!ifdef FOSSIL_ENABLE_JSON
TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
!endif