Fossil SCM
It appears that in [4f0413381d], Makefile.msc was edited without corresponding change in makemake.tcl. Correct that, so this change will not be accidently reverted again (as I did in the previous commit)
Commit
c6f255607bf96c6782927cabf59fdc9aa8021a61
Parent
d0814e59e2354c1…
3 files changed
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1035,11 +1035,11 @@ | ||
| 1035 | 1035 | !ifdef FOSSIL_ENABLE_SSL |
| 1036 | 1036 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1037 | 1037 | !endif |
| 1038 | 1038 | |
| 1039 | 1039 | CFLAGS = -nologo -MT -O2 |
| 1040 | -LDFLAGS = /NODEFAULTLIB:msvcrt | |
| 1040 | +LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO | |
| 1041 | 1041 | |
| 1042 | 1042 | !ifdef DEBUG |
| 1043 | 1043 | CFLAGS = $(CFLAGS) -Zi |
| 1044 | 1044 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1045 | 1045 | !endif |
| 1046 | 1046 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | !ifdef FOSSIL_ENABLE_SSL |
| 1036 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1037 | !endif |
| 1038 | |
| 1039 | CFLAGS = -nologo -MT -O2 |
| 1040 | LDFLAGS = /NODEFAULTLIB:msvcrt |
| 1041 | |
| 1042 | !ifdef DEBUG |
| 1043 | CFLAGS = $(CFLAGS) -Zi |
| 1044 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1045 | !endif |
| 1046 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | !ifdef FOSSIL_ENABLE_SSL |
| 1036 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1037 | !endif |
| 1038 | |
| 1039 | CFLAGS = -nologo -MT -O2 |
| 1040 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 1041 | |
| 1042 | !ifdef DEBUG |
| 1043 | CFLAGS = $(CFLAGS) -Zi |
| 1044 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1045 | !endif |
| 1046 |
No diff available
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -39,11 +39,11 @@ | ||
| 39 | 39 | !ifdef FOSSIL_ENABLE_SSL |
| 40 | 40 | INCL = $(INCL) -I$(SSLINCDIR) |
| 41 | 41 | !endif |
| 42 | 42 | |
| 43 | 43 | CFLAGS = -nologo -MT -O2 |
| 44 | -LDFLAGS = /NODEFAULTLIB:msvcrt | |
| 44 | +LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO | |
| 45 | 45 | |
| 46 | 46 | !ifdef DEBUG |
| 47 | 47 | CFLAGS = $(CFLAGS) -Zi |
| 48 | 48 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 49 | 49 | !endif |
| 50 | 50 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -39,11 +39,11 @@ | |
| 39 | !ifdef FOSSIL_ENABLE_SSL |
| 40 | INCL = $(INCL) -I$(SSLINCDIR) |
| 41 | !endif |
| 42 | |
| 43 | CFLAGS = -nologo -MT -O2 |
| 44 | LDFLAGS = /NODEFAULTLIB:msvcrt |
| 45 | |
| 46 | !ifdef DEBUG |
| 47 | CFLAGS = $(CFLAGS) -Zi |
| 48 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 49 | !endif |
| 50 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -39,11 +39,11 @@ | |
| 39 | !ifdef FOSSIL_ENABLE_SSL |
| 40 | INCL = $(INCL) -I$(SSLINCDIR) |
| 41 | !endif |
| 42 | |
| 43 | CFLAGS = -nologo -MT -O2 |
| 44 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 45 | |
| 46 | !ifdef DEBUG |
| 47 | CFLAGS = $(CFLAGS) -Zi |
| 48 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 49 | !endif |
| 50 |