Fossil SCM
Omit CFLAGS when passing compiler options to the MSVC resource compiler.
Commit
f151da213548584f9981955a7a3aacf4c958103d
Parent
ed544f3d9c2c734…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -968,11 +968,11 @@ | ||
| 968 | 968 | !endif |
| 969 | 969 | |
| 970 | 970 | CFLAGS = -nologo -MT -O2 |
| 971 | 971 | BCC = $(CC) $(CFLAGS) |
| 972 | 972 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 973 | -RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) | |
| 973 | +RCC = rc $(MSCDEF) $(INCL) | |
| 974 | 974 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 975 | 975 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 976 | 976 | |
| 977 | 977 | !ifdef FOSSIL_ENABLE_JSON |
| 978 | 978 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 979 | 979 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -968,11 +968,11 @@ | |
| 968 | !endif |
| 969 | |
| 970 | CFLAGS = -nologo -MT -O2 |
| 971 | BCC = $(CC) $(CFLAGS) |
| 972 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 973 | RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) |
| 974 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 975 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 976 | |
| 977 | !ifdef FOSSIL_ENABLE_JSON |
| 978 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 979 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -968,11 +968,11 @@ | |
| 968 | !endif |
| 969 | |
| 970 | CFLAGS = -nologo -MT -O2 |
| 971 | BCC = $(CC) $(CFLAGS) |
| 972 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 973 | RCC = rc $(MSCDEF) $(INCL) |
| 974 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 975 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 976 | |
| 977 | !ifdef FOSSIL_ENABLE_JSON |
| 978 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 979 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -38,11 +38,11 @@ | ||
| 38 | 38 | !endif |
| 39 | 39 | |
| 40 | 40 | CFLAGS = -nologo -MT -O2 |
| 41 | 41 | BCC = $(CC) $(CFLAGS) |
| 42 | 42 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 43 | -RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) | |
| 43 | +RCC = rc $(MSCDEF) $(INCL) | |
| 44 | 44 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 45 | 45 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 46 | 46 | |
| 47 | 47 | !ifdef FOSSIL_ENABLE_JSON |
| 48 | 48 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 49 | 49 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -38,11 +38,11 @@ | |
| 38 | !endif |
| 39 | |
| 40 | CFLAGS = -nologo -MT -O2 |
| 41 | BCC = $(CC) $(CFLAGS) |
| 42 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 43 | RCC = rc $(CFLAGS) $(MSCDEF) $(INCL) |
| 44 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 45 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 46 | |
| 47 | !ifdef FOSSIL_ENABLE_JSON |
| 48 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 49 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -38,11 +38,11 @@ | |
| 38 | !endif |
| 39 | |
| 40 | CFLAGS = -nologo -MT -O2 |
| 41 | BCC = $(CC) $(CFLAGS) |
| 42 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 43 | RCC = rc $(MSCDEF) $(INCL) |
| 44 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib |
| 45 | LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 46 | |
| 47 | !ifdef FOSSIL_ENABLE_JSON |
| 48 | TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1 |
| 49 |