Fossil SCM
Add optimization level flag for MSVC builds, defaulting to /Os.
Commit
c72edfd865b5f82e27fa8c31cde7d62869e271b6156bb87d73532376b61cd50e
Parent
8b453eb20740e83…
2 files changed
+2
-1
+2
-1
+2
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1468,10 +1468,11 @@ | ||
| 1468 | 1468 | OBJDIR = $(T) |
| 1469 | 1469 | OX = $(OBJDIR) |
| 1470 | 1470 | O = .obj |
| 1471 | 1471 | E = .exe |
| 1472 | 1472 | P = .pdb |
| 1473 | +OPTLEVEL= /Os | |
| 1473 | 1474 | |
| 1474 | 1475 | INSTALLDIR = . |
| 1475 | 1476 | !ifdef DESTDIR |
| 1476 | 1477 | INSTALLDIR = $(DESTDIR)\$(INSTALLDIR) |
| 1477 | 1478 | !endif |
| @@ -1667,11 +1668,11 @@ | ||
| 1667 | 1668 | |
| 1668 | 1669 | !if $(DEBUG)!=0 |
| 1669 | 1670 | CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG |
| 1670 | 1671 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1671 | 1672 | !else |
| 1672 | -CFLAGS = $(CFLAGS) $(CRTFLAGS) /Os | |
| 1673 | +CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL) | |
| 1673 | 1674 | !endif |
| 1674 | 1675 | |
| 1675 | 1676 | BCC = $(CC) $(CFLAGS) |
| 1676 | 1677 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1677 | 1678 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 1678 | 1679 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1468,10 +1468,11 @@ | |
| 1468 | OBJDIR = $(T) |
| 1469 | OX = $(OBJDIR) |
| 1470 | O = .obj |
| 1471 | E = .exe |
| 1472 | P = .pdb |
| 1473 | |
| 1474 | INSTALLDIR = . |
| 1475 | !ifdef DESTDIR |
| 1476 | INSTALLDIR = $(DESTDIR)\$(INSTALLDIR) |
| 1477 | !endif |
| @@ -1667,11 +1668,11 @@ | |
| 1667 | |
| 1668 | !if $(DEBUG)!=0 |
| 1669 | CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG |
| 1670 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1671 | !else |
| 1672 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /Os |
| 1673 | !endif |
| 1674 | |
| 1675 | BCC = $(CC) $(CFLAGS) |
| 1676 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1677 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 1678 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1468,10 +1468,11 @@ | |
| 1468 | OBJDIR = $(T) |
| 1469 | OX = $(OBJDIR) |
| 1470 | O = .obj |
| 1471 | E = .exe |
| 1472 | P = .pdb |
| 1473 | OPTLEVEL= /Os |
| 1474 | |
| 1475 | INSTALLDIR = . |
| 1476 | !ifdef DESTDIR |
| 1477 | INSTALLDIR = $(DESTDIR)\$(INSTALLDIR) |
| 1478 | !endif |
| @@ -1667,11 +1668,11 @@ | |
| 1668 | |
| 1669 | !if $(DEBUG)!=0 |
| 1670 | CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG |
| 1671 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 1672 | !else |
| 1673 | CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL) |
| 1674 | !endif |
| 1675 | |
| 1676 | BCC = $(CC) $(CFLAGS) |
| 1677 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 1678 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 1679 |
+2
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -14,10 +14,11 @@ | ||
| 14 | 14 | OBJDIR = $(T) |
| 15 | 15 | OX = $(OBJDIR) |
| 16 | 16 | O = .obj |
| 17 | 17 | E = .exe |
| 18 | 18 | P = .pdb |
| 19 | +OPTLEVEL= /Os | |
| 19 | 20 | |
| 20 | 21 | INSTALLDIR = . |
| 21 | 22 | !ifdef DESTDIR |
| 22 | 23 | INSTALLDIR = $(DESTDIR)\$(INSTALLDIR) |
| 23 | 24 | !endif |
| @@ -213,11 +214,11 @@ | ||
| 213 | 214 | |
| 214 | 215 | !if $(DEBUG)!=0 |
| 215 | 216 | CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG |
| 216 | 217 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 217 | 218 | !else |
| 218 | -CFLAGS = $(CFLAGS) $(CRTFLAGS) /Os | |
| 219 | +CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL) | |
| 219 | 220 | !endif |
| 220 | 221 | |
| 221 | 222 | BCC = $(CC) $(CFLAGS) |
| 222 | 223 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 223 | 224 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 224 | 225 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -14,10 +14,11 @@ | |
| 14 | OBJDIR = $(T) |
| 15 | OX = $(OBJDIR) |
| 16 | O = .obj |
| 17 | E = .exe |
| 18 | P = .pdb |
| 19 | |
| 20 | INSTALLDIR = . |
| 21 | !ifdef DESTDIR |
| 22 | INSTALLDIR = $(DESTDIR)\$(INSTALLDIR) |
| 23 | !endif |
| @@ -213,11 +214,11 @@ | |
| 213 | |
| 214 | !if $(DEBUG)!=0 |
| 215 | CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG |
| 216 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 217 | !else |
| 218 | CFLAGS = $(CFLAGS) $(CRTFLAGS) /Os |
| 219 | !endif |
| 220 | |
| 221 | BCC = $(CC) $(CFLAGS) |
| 222 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 223 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 224 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -14,10 +14,11 @@ | |
| 14 | OBJDIR = $(T) |
| 15 | OX = $(OBJDIR) |
| 16 | O = .obj |
| 17 | E = .exe |
| 18 | P = .pdb |
| 19 | OPTLEVEL= /Os |
| 20 | |
| 21 | INSTALLDIR = . |
| 22 | !ifdef DESTDIR |
| 23 | INSTALLDIR = $(DESTDIR)\$(INSTALLDIR) |
| 24 | !endif |
| @@ -213,11 +214,11 @@ | |
| 214 | |
| 215 | !if $(DEBUG)!=0 |
| 216 | CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG |
| 217 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 218 | !else |
| 219 | CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL) |
| 220 | !endif |
| 221 | |
| 222 | BCC = $(CC) $(CFLAGS) |
| 223 | TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL) |
| 224 | RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL) |
| 225 |