Fossil SCM

Also build zlib and OpenSSL using Windows XP compatibility, if applicable.

mistachkin 2014-10-09 19:09 UTC winXpVs201x
Commit c0beb5323cf973649cc6d9d0cac314369d6e91ef
Parent 67de4fc100d413a…
2 files changed +14 -3 +14 -3
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+14 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1203,10 +1203,11 @@
12031203
12041204
 !ifdef FOSSIL_ENABLE_SSL
12051205
 SSLDIR = $(B)\compat\openssl-1.0.1i
12061206
 SSLINCDIR = $(SSLDIR)\inc32
12071207
 SSLLIBDIR = $(SSLDIR)\out32
1208
+SSLLFLAGS = /nologo /opt:ref /debug
12081209
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
12091210
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
12101211
 !message Using 'x64' platform for OpenSSL...
12111212
 SSLCONFIG = VC-WIN64A no-asm
12121213
 SSLSETUP = ms\do_win64a.bat
@@ -1251,16 +1252,18 @@
12511252
12521253
 CFLAGS = /nologo
12531254
 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
12541255
12551256
 !ifdef FOSSIL_ENABLE_WINXP
1256
-CFLAGS = $(CFLAGS) /D_USING_V110_SDK71_=1
1257
+XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
1258
+CFLAGS = $(CFLAGS) $(XPCFLAGS)
12571259
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1258
-LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1260
+XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
12591261
 !else
1260
-LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1262
+XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
12611263
 !endif
1264
+LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
12621265
 !endif
12631266
12641267
 !ifdef DEBUG
12651268
 CFLAGS = $(CFLAGS) /Zi /MTd /Od
12661269
 LDFLAGS = $(LDFLAGS) /DEBUG
@@ -1364,21 +1367,29 @@
13641367
13651368
 all: $(OX) $(APPNAME)
13661369
13671370
 zlib:
13681371
 @echo Building zlib from "$(ZLIBDIR)"...
1372
+!ifdef FOSSIL_ENABLE_WINXP
1373
+ @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1374
+!else
13691375
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1376
+!endif
13701377
13711378
 !ifdef FOSSIL_ENABLE_SSL
13721379
 openssl:
13731380
 @echo Building OpenSSL from "$(SSLDIR)"...
13741381
 !if "$(PERLDIR)" != ""
13751382
 @set PATH=$(PERLDIR);$(PATH)
13761383
 !endif
13771384
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
13781385
 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1386
+!ifdef FOSSIL_ENABLE_WINXP
1387
+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1388
+!else
13791389
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1390
+!endif
13801391
 !endif
13811392
13821393
 !ifndef FOSSIL_ENABLE_MINIZ
13831394
 APPTARGETS = $(APPTARGETS) zlib
13841395
 !endif
13851396
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1203,10 +1203,11 @@
1203
1204 !ifdef FOSSIL_ENABLE_SSL
1205 SSLDIR = $(B)\compat\openssl-1.0.1i
1206 SSLINCDIR = $(SSLDIR)\inc32
1207 SSLLIBDIR = $(SSLDIR)\out32
 
1208 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1209 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1210 !message Using 'x64' platform for OpenSSL...
1211 SSLCONFIG = VC-WIN64A no-asm
1212 SSLSETUP = ms\do_win64a.bat
@@ -1251,16 +1252,18 @@
1251
1252 CFLAGS = /nologo
1253 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1254
1255 !ifdef FOSSIL_ENABLE_WINXP
1256 CFLAGS = $(CFLAGS) /D_USING_V110_SDK71_=1
 
1257 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1258 LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1259 !else
1260 LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1261 !endif
 
1262 !endif
1263
1264 !ifdef DEBUG
1265 CFLAGS = $(CFLAGS) /Zi /MTd /Od
1266 LDFLAGS = $(LDFLAGS) /DEBUG
@@ -1364,21 +1367,29 @@
1364
1365 all: $(OX) $(APPNAME)
1366
1367 zlib:
1368 @echo Building zlib from "$(ZLIBDIR)"...
 
 
 
1369 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
 
1370
1371 !ifdef FOSSIL_ENABLE_SSL
1372 openssl:
1373 @echo Building OpenSSL from "$(SSLDIR)"...
1374 !if "$(PERLDIR)" != ""
1375 @set PATH=$(PERLDIR);$(PATH)
1376 !endif
1377 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1378 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
 
 
 
1379 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
 
1380 !endif
1381
1382 !ifndef FOSSIL_ENABLE_MINIZ
1383 APPTARGETS = $(APPTARGETS) zlib
1384 !endif
1385
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1203,10 +1203,11 @@
1203
1204 !ifdef FOSSIL_ENABLE_SSL
1205 SSLDIR = $(B)\compat\openssl-1.0.1i
1206 SSLINCDIR = $(SSLDIR)\inc32
1207 SSLLIBDIR = $(SSLDIR)\out32
1208 SSLLFLAGS = /nologo /opt:ref /debug
1209 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1210 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1211 !message Using 'x64' platform for OpenSSL...
1212 SSLCONFIG = VC-WIN64A no-asm
1213 SSLSETUP = ms\do_win64a.bat
@@ -1251,16 +1252,18 @@
1252
1253 CFLAGS = /nologo
1254 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1255
1256 !ifdef FOSSIL_ENABLE_WINXP
1257 XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
1258 CFLAGS = $(CFLAGS) $(XPCFLAGS)
1259 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1260 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1261 !else
1262 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1263 !endif
1264 LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1265 !endif
1266
1267 !ifdef DEBUG
1268 CFLAGS = $(CFLAGS) /Zi /MTd /Od
1269 LDFLAGS = $(LDFLAGS) /DEBUG
@@ -1364,21 +1367,29 @@
1367
1368 all: $(OX) $(APPNAME)
1369
1370 zlib:
1371 @echo Building zlib from "$(ZLIBDIR)"...
1372 !ifdef FOSSIL_ENABLE_WINXP
1373 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1374 !else
1375 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1376 !endif
1377
1378 !ifdef FOSSIL_ENABLE_SSL
1379 openssl:
1380 @echo Building OpenSSL from "$(SSLDIR)"...
1381 !if "$(PERLDIR)" != ""
1382 @set PATH=$(PERLDIR);$(PATH)
1383 !endif
1384 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1385 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1386 !ifdef FOSSIL_ENABLE_WINXP
1387 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1388 !else
1389 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1390 !endif
1391 !endif
1392
1393 !ifndef FOSSIL_ENABLE_MINIZ
1394 APPTARGETS = $(APPTARGETS) zlib
1395 !endif
1396
M win/Makefile.msc
+14 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -58,10 +58,11 @@
5858
5959
 !ifdef FOSSIL_ENABLE_SSL
6060
 SSLDIR = $(B)\compat\openssl-1.0.1i
6161
 SSLINCDIR = $(SSLDIR)\inc32
6262
 SSLLIBDIR = $(SSLDIR)\out32
63
+SSLLFLAGS = /nologo /opt:ref /debug
6364
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
6465
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
6566
 !message Using 'x64' platform for OpenSSL...
6667
 SSLCONFIG = VC-WIN64A no-asm
6768
 SSLSETUP = ms\do_win64a.bat
@@ -106,16 +107,18 @@
106107
107108
 CFLAGS = /nologo
108109
 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
109110
110111
 !ifdef FOSSIL_ENABLE_WINXP
111
-CFLAGS = $(CFLAGS) /D_USING_V110_SDK71_=1
112
+XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
113
+CFLAGS = $(CFLAGS) $(XPCFLAGS)
112114
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
-LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.02
115
+XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
114116
 !else
115
-LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.01
117
+XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
116118
 !endif
119
+LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
117120
 !endif
118121
119122
 !ifdef DEBUG
120123
 CFLAGS = $(CFLAGS) /Zi /MTd /Od
121124
 LDFLAGS = $(LDFLAGS) /DEBUG
@@ -435,21 +438,29 @@
435438
436439
 all: $(OX) $(APPNAME)
437440
438441
 zlib:
439442
 @echo Building zlib from "$(ZLIBDIR)"...
443
+!ifdef FOSSIL_ENABLE_WINXP
444
+ @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
445
+!else
440446
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
447
+!endif
441448
442449
 !ifdef FOSSIL_ENABLE_SSL
443450
 openssl:
444451
 @echo Building OpenSSL from "$(SSLDIR)"...
445452
 !if "$(PERLDIR)" != ""
446453
 @set PATH=$(PERLDIR);$(PATH)
447454
 !endif
448455
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
449456
 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
457
+!ifdef FOSSIL_ENABLE_WINXP
458
+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
459
+!else
450460
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
461
+!endif
451462
 !endif
452463
453464
 !ifndef FOSSIL_ENABLE_MINIZ
454465
 APPTARGETS = $(APPTARGETS) zlib
455466
 !endif
456467
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -58,10 +58,11 @@
58
59 !ifdef FOSSIL_ENABLE_SSL
60 SSLDIR = $(B)\compat\openssl-1.0.1i
61 SSLINCDIR = $(SSLDIR)\inc32
62 SSLLIBDIR = $(SSLDIR)\out32
 
63 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
64 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
65 !message Using 'x64' platform for OpenSSL...
66 SSLCONFIG = VC-WIN64A no-asm
67 SSLSETUP = ms\do_win64a.bat
@@ -106,16 +107,18 @@
106
107 CFLAGS = /nologo
108 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
109
110 !ifdef FOSSIL_ENABLE_WINXP
111 CFLAGS = $(CFLAGS) /D_USING_V110_SDK71_=1
 
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.02
114 !else
115 LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE,5.01
116 !endif
 
117 !endif
118
119 !ifdef DEBUG
120 CFLAGS = $(CFLAGS) /Zi /MTd /Od
121 LDFLAGS = $(LDFLAGS) /DEBUG
@@ -435,21 +438,29 @@
435
436 all: $(OX) $(APPNAME)
437
438 zlib:
439 @echo Building zlib from "$(ZLIBDIR)"...
 
 
 
440 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
 
441
442 !ifdef FOSSIL_ENABLE_SSL
443 openssl:
444 @echo Building OpenSSL from "$(SSLDIR)"...
445 !if "$(PERLDIR)" != ""
446 @set PATH=$(PERLDIR);$(PATH)
447 !endif
448 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
449 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
 
 
 
450 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
 
451 !endif
452
453 !ifndef FOSSIL_ENABLE_MINIZ
454 APPTARGETS = $(APPTARGETS) zlib
455 !endif
456
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -58,10 +58,11 @@
58
59 !ifdef FOSSIL_ENABLE_SSL
60 SSLDIR = $(B)\compat\openssl-1.0.1i
61 SSLINCDIR = $(SSLDIR)\inc32
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66 !message Using 'x64' platform for OpenSSL...
67 SSLCONFIG = VC-WIN64A no-asm
68 SSLSETUP = ms\do_win64a.bat
@@ -106,16 +107,18 @@
107
108 CFLAGS = /nologo
109 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
110
111 !ifdef FOSSIL_ENABLE_WINXP
112 XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
113 CFLAGS = $(CFLAGS) $(XPCFLAGS)
114 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
115 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
116 !else
117 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
118 !endif
119 LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
120 !endif
121
122 !ifdef DEBUG
123 CFLAGS = $(CFLAGS) /Zi /MTd /Od
124 LDFLAGS = $(LDFLAGS) /DEBUG
@@ -435,21 +438,29 @@
438
439 all: $(OX) $(APPNAME)
440
441 zlib:
442 @echo Building zlib from "$(ZLIBDIR)"...
443 !ifdef FOSSIL_ENABLE_WINXP
444 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
445 !else
446 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
447 !endif
448
449 !ifdef FOSSIL_ENABLE_SSL
450 openssl:
451 @echo Building OpenSSL from "$(SSLDIR)"...
452 !if "$(PERLDIR)" != ""
453 @set PATH=$(PERLDIR);$(PATH)
454 !endif
455 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
456 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
457 !ifdef FOSSIL_ENABLE_WINXP
458 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
459 !else
460 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
461 !endif
462 !endif
463
464 !ifndef FOSSIL_ENABLE_MINIZ
465 APPTARGETS = $(APPTARGETS) zlib
466 !endif
467

Keyboard Shortcuts

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