Fossil SCM
For MSVC, disable optimizations when compiling for debugging.
Commit
fb29094a8f9ea092aebd3e207ad3381e550f8098
Parent
9dc0877d91d1515…
2 files changed
+4
-2
+4
-2
+4
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1032,16 +1032,18 @@ | ||
| 1032 | 1032 | |
| 1033 | 1033 | !ifdef FOSSIL_ENABLE_SSL |
| 1034 | 1034 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1035 | 1035 | !endif |
| 1036 | 1036 | |
| 1037 | -CFLAGS = -nologo -MT -O2 | |
| 1037 | +CFLAGS = -nologo | |
| 1038 | 1038 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 1039 | 1039 | |
| 1040 | 1040 | !ifdef DEBUG |
| 1041 | -CFLAGS = $(CFLAGS) -Zi | |
| 1041 | +CFLAGS = $(CFLAGS) -Zi -MTd -Od | |
| 1042 | 1042 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1043 | +!else | |
| 1044 | +CFLAGS = $(CFLAGS) -MT -O2 | |
| 1043 | 1045 | !endif |
| 1044 | 1046 | |
| 1045 | 1047 | BCC = $(CC) $(CFLAGS) |
| 1046 | 1048 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1047 | 1049 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 1048 | 1050 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1032,16 +1032,18 @@ | |
| 1032 | |
| 1033 | !ifdef FOSSIL_ENABLE_SSL |
| 1034 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1035 | !endif |
| 1036 | |
| 1037 | CFLAGS = -nologo -MT -O2 |
| 1038 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 1039 | |
| 1040 | !ifdef DEBUG |
| 1041 | CFLAGS = $(CFLAGS) -Zi |
| 1042 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1043 | !endif |
| 1044 | |
| 1045 | BCC = $(CC) $(CFLAGS) |
| 1046 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1047 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 1048 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1032,16 +1032,18 @@ | |
| 1032 | |
| 1033 | !ifdef FOSSIL_ENABLE_SSL |
| 1034 | INCL = $(INCL) -I$(SSLINCDIR) |
| 1035 | !endif |
| 1036 | |
| 1037 | CFLAGS = -nologo |
| 1038 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 1039 | |
| 1040 | !ifdef DEBUG |
| 1041 | CFLAGS = $(CFLAGS) -Zi -MTd -Od |
| 1042 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1043 | !else |
| 1044 | CFLAGS = $(CFLAGS) -MT -O2 |
| 1045 | !endif |
| 1046 | |
| 1047 | BCC = $(CC) $(CFLAGS) |
| 1048 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1049 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 1050 |
+4
-2
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -39,16 +39,18 @@ | ||
| 39 | 39 | |
| 40 | 40 | !ifdef FOSSIL_ENABLE_SSL |
| 41 | 41 | INCL = $(INCL) -I$(SSLINCDIR) |
| 42 | 42 | !endif |
| 43 | 43 | |
| 44 | -CFLAGS = -nologo -MT -O2 | |
| 44 | +CFLAGS = -nologo | |
| 45 | 45 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 46 | 46 | |
| 47 | 47 | !ifdef DEBUG |
| 48 | -CFLAGS = $(CFLAGS) -Zi | |
| 48 | +CFLAGS = $(CFLAGS) -Zi -MTd -Od | |
| 49 | 49 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 50 | +!else | |
| 51 | +CFLAGS = $(CFLAGS) -MT -O2 | |
| 50 | 52 | !endif |
| 51 | 53 | |
| 52 | 54 | BCC = $(CC) $(CFLAGS) |
| 53 | 55 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 54 | 56 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 55 | 57 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -39,16 +39,18 @@ | |
| 39 | |
| 40 | !ifdef FOSSIL_ENABLE_SSL |
| 41 | INCL = $(INCL) -I$(SSLINCDIR) |
| 42 | !endif |
| 43 | |
| 44 | CFLAGS = -nologo -MT -O2 |
| 45 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 46 | |
| 47 | !ifdef DEBUG |
| 48 | CFLAGS = $(CFLAGS) -Zi |
| 49 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 50 | !endif |
| 51 | |
| 52 | BCC = $(CC) $(CFLAGS) |
| 53 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 54 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 55 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -39,16 +39,18 @@ | |
| 39 | |
| 40 | !ifdef FOSSIL_ENABLE_SSL |
| 41 | INCL = $(INCL) -I$(SSLINCDIR) |
| 42 | !endif |
| 43 | |
| 44 | CFLAGS = -nologo |
| 45 | LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO |
| 46 | |
| 47 | !ifdef DEBUG |
| 48 | CFLAGS = $(CFLAGS) -Zi -MTd -Od |
| 49 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 50 | !else |
| 51 | CFLAGS = $(CFLAGS) -MT -O2 |
| 52 | !endif |
| 53 | |
| 54 | BCC = $(CC) $(CFLAGS) |
| 55 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL) |
| 56 | RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL) |
| 57 |