Fossil SCM

More MSVC makefile simplifications.

mistachkin 2020-06-09 17:51 trunk
Commit 1ebe5bbec0b62412e02522b905d2586f267f086012d427c6862975c7b8918faf
Parent 2a0c020313c29b7…
2 files changed +8 -8 +8 -8
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+8 -8
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1506,17 +1506,14 @@
15061506
 #
15071507
 !if !exist("$(B)\.fossil-settings")
15081508
 !error Please specify path to project base directory: B="path/to/fossil"
15091509
 !endif
15101510
1511
-# Perl is only necessary if OpenSSL support is enabled and it must
1512
-# be built from source code. The PERLDIR variable should point to
1513
-# the directory containing the main Perl binary (i.e. "perl.exe").
1514
-!ifndef PERLDIR
1515
-PERLDIR = C:\Perl\bin
1516
-!endif
1517
-
1511
+# Perl is only necessary if OpenSSL support is enabled and it is built from
1512
+# source code. The PERLDIR environment variable, if it exists, should point
1513
+# to the directory containing the main Perl executable specified here (i.e.
1514
+# "perl.exe").
15181515
 PERL = perl.exe
15191516
15201517
 # Enable debugging symbols?
15211518
 !ifndef DEBUG
15221519
 DEBUG = 0
@@ -1655,13 +1652,16 @@
16551652
16561653
 !if $(FOSSIL_ENABLE_TCL)!=0
16571654
 INCL = $(INCL) /I"$(TCLINCDIR)"
16581655
 !endif
16591656
1660
-CFLAGS = /nologo /wd4996
1657
+CFLAGS = /nologo
16611658
 LDFLAGS =
16621659
1660
+CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS
1661
+CFLAGS = $(CFLAGS) /D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS
1662
+
16631663
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
16641664
 LDFLAGS = $(LDFLAGS) /MANIFEST
16651665
 !else
16661666
 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
16671667
 !endif
16681668
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1506,17 +1506,14 @@
1506 #
1507 !if !exist("$(B)\.fossil-settings")
1508 !error Please specify path to project base directory: B="path/to/fossil"
1509 !endif
1510
1511 # Perl is only necessary if OpenSSL support is enabled and it must
1512 # be built from source code. The PERLDIR variable should point to
1513 # the directory containing the main Perl binary (i.e. "perl.exe").
1514 !ifndef PERLDIR
1515 PERLDIR = C:\Perl\bin
1516 !endif
1517
1518 PERL = perl.exe
1519
1520 # Enable debugging symbols?
1521 !ifndef DEBUG
1522 DEBUG = 0
@@ -1655,13 +1652,16 @@
1655
1656 !if $(FOSSIL_ENABLE_TCL)!=0
1657 INCL = $(INCL) /I"$(TCLINCDIR)"
1658 !endif
1659
1660 CFLAGS = /nologo /wd4996
1661 LDFLAGS =
1662
 
 
 
1663 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1664 LDFLAGS = $(LDFLAGS) /MANIFEST
1665 !else
1666 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
1667 !endif
1668
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1506,17 +1506,14 @@
1506 #
1507 !if !exist("$(B)\.fossil-settings")
1508 !error Please specify path to project base directory: B="path/to/fossil"
1509 !endif
1510
1511 # Perl is only necessary if OpenSSL support is enabled and it is built from
1512 # source code. The PERLDIR environment variable, if it exists, should point
1513 # to the directory containing the main Perl executable specified here (i.e.
1514 # "perl.exe").
 
 
 
1515 PERL = perl.exe
1516
1517 # Enable debugging symbols?
1518 !ifndef DEBUG
1519 DEBUG = 0
@@ -1655,13 +1652,16 @@
1652
1653 !if $(FOSSIL_ENABLE_TCL)!=0
1654 INCL = $(INCL) /I"$(TCLINCDIR)"
1655 !endif
1656
1657 CFLAGS = /nologo
1658 LDFLAGS =
1659
1660 CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS
1661 CFLAGS = $(CFLAGS) /D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS
1662
1663 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1664 LDFLAGS = $(LDFLAGS) /MANIFEST
1665 !else
1666 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
1667 !endif
1668
M win/Makefile.msc
+8 -8
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -31,17 +31,14 @@
3131
 #
3232
 !if !exist("$(B)\.fossil-settings")
3333
 !error Please specify path to project base directory: B="path/to/fossil"
3434
 !endif
3535
36
-# Perl is only necessary if OpenSSL support is enabled and it must
37
-# be built from source code. The PERLDIR variable should point to
38
-# the directory containing the main Perl binary (i.e. "perl.exe").
39
-!ifndef PERLDIR
40
-PERLDIR = C:\Perl\bin
41
-!endif
42
-
36
+# Perl is only necessary if OpenSSL support is enabled and it is built from
37
+# source code. The PERLDIR environment variable, if it exists, should point
38
+# to the directory containing the main Perl executable specified here (i.e.
39
+# "perl.exe").
4340
 PERL = perl.exe
4441
4542
 # Enable debugging symbols?
4643
 !ifndef DEBUG
4744
 DEBUG = 0
@@ -180,13 +177,16 @@
180177
181178
 !if $(FOSSIL_ENABLE_TCL)!=0
182179
 INCL = $(INCL) /I"$(TCLINCDIR)"
183180
 !endif
184181
185
-CFLAGS = /nologo /wd4996
182
+CFLAGS = /nologo
186183
 LDFLAGS =
187184
185
+CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS
186
+CFLAGS = $(CFLAGS) /D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS
187
+
188188
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
189189
 LDFLAGS = $(LDFLAGS) /MANIFEST
190190
 !else
191191
 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
192192
 !endif
193193
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -31,17 +31,14 @@
31 #
32 !if !exist("$(B)\.fossil-settings")
33 !error Please specify path to project base directory: B="path/to/fossil"
34 !endif
35
36 # Perl is only necessary if OpenSSL support is enabled and it must
37 # be built from source code. The PERLDIR variable should point to
38 # the directory containing the main Perl binary (i.e. "perl.exe").
39 !ifndef PERLDIR
40 PERLDIR = C:\Perl\bin
41 !endif
42
43 PERL = perl.exe
44
45 # Enable debugging symbols?
46 !ifndef DEBUG
47 DEBUG = 0
@@ -180,13 +177,16 @@
180
181 !if $(FOSSIL_ENABLE_TCL)!=0
182 INCL = $(INCL) /I"$(TCLINCDIR)"
183 !endif
184
185 CFLAGS = /nologo /wd4996
186 LDFLAGS =
187
 
 
 
188 !if $(FOSSIL_DYNAMIC_BUILD)!=0
189 LDFLAGS = $(LDFLAGS) /MANIFEST
190 !else
191 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
192 !endif
193
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -31,17 +31,14 @@
31 #
32 !if !exist("$(B)\.fossil-settings")
33 !error Please specify path to project base directory: B="path/to/fossil"
34 !endif
35
36 # Perl is only necessary if OpenSSL support is enabled and it is built from
37 # source code. The PERLDIR environment variable, if it exists, should point
38 # to the directory containing the main Perl executable specified here (i.e.
39 # "perl.exe").
 
 
 
40 PERL = perl.exe
41
42 # Enable debugging symbols?
43 !ifndef DEBUG
44 DEBUG = 0
@@ -180,13 +177,16 @@
177
178 !if $(FOSSIL_ENABLE_TCL)!=0
179 INCL = $(INCL) /I"$(TCLINCDIR)"
180 !endif
181
182 CFLAGS = /nologo
183 LDFLAGS =
184
185 CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS
186 CFLAGS = $(CFLAGS) /D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS
187
188 !if $(FOSSIL_DYNAMIC_BUILD)!=0
189 LDFLAGS = $(LDFLAGS) /MANIFEST
190 !else
191 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
192 !endif
193

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button