Fossil SCM

Allow easier compilation with OpenSSL enabled using MSVC. Fix for [5b2300c692].

mistachkin 2013-04-01 20:54 trunk
Commit c46e5f933d96658263039633066bf7534a8ecbd7
Parent 5acc36b1252f4d8…
2 files changed +26 -12 +26 -12
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+26 -12
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -942,36 +942,50 @@
942942
 OBJDIR = .
943943
 OX = .
944944
 O = .obj
945945
 E = .exe
946946
947
-# Uncomment below for SSL support
948
-SSL =
949
-SSLLIB =
950
-# SSL = -DFOSSIL_ENABLE_SSL=1
951
-# SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
947
+# Uncomment to enable JSON API
948
+# FOSSIL_ENABLE_JSON = 1
949
+
950
+# Uncomment to enable SSL support
951
+# FOSSIL_ENABLE_SSL = 1
952
+
953
+!ifdef FOSSIL_ENABLE_SSL
954
+SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
955
+SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
956
+SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
957
+!endif
952958
953959
 # zlib options
954960
 ZINCDIR = $(B)\compat\zlib
955961
 ZLIBDIR = $(B)\compat\zlib
956962
 ZLIB = zlib.lib
957963
958
-# Uncomment to enable JSON API
959
-# FOSSIL_ENABLE_JSON = 1
960
-
961964
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
965
+
966
+!ifdef FOSSIL_ENABLE_SSL
967
+INCL = $(INCL) -I$(SSLINCDIR)
968
+!endif
962969
963970
 CFLAGS = -nologo -MT -O2
964971
 BCC = $(CC) $(CFLAGS)
965
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
972
+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
966973
 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
967
-LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
974
+LIBS = $(ZLIB) ws2_32.lib advapi32.lib
968975
 LIBDIR = -LIBPATH:$(ZLIBDIR)
969976
970977
 !ifdef FOSSIL_ENABLE_JSON
971
-TCC = $(TCC) -DFOSSIL_ENABLE_JSON
972
-RCC = $(RCC) -DFOSSIL_ENABLE_JSON
978
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
979
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
980
+!endif
981
+
982
+!ifdef FOSSIL_ENABLE_SSL
983
+TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
984
+RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
985
+LIBS = $(LIBS) $(SSLLIB)
986
+LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
973987
 !endif
974988
 }
975989
 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
976990
 set j " \\\n "
977991
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
978992
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -942,36 +942,50 @@
942 OBJDIR = .
943 OX = .
944 O = .obj
945 E = .exe
946
947 # Uncomment below for SSL support
948 SSL =
949 SSLLIB =
950 # SSL = -DFOSSIL_ENABLE_SSL=1
951 # SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
 
 
 
 
 
 
952
953 # zlib options
954 ZINCDIR = $(B)\compat\zlib
955 ZLIBDIR = $(B)\compat\zlib
956 ZLIB = zlib.lib
957
958 # Uncomment to enable JSON API
959 # FOSSIL_ENABLE_JSON = 1
960
961 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
 
 
 
 
962
963 CFLAGS = -nologo -MT -O2
964 BCC = $(CC) $(CFLAGS)
965 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
966 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
967 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
968 LIBDIR = -LIBPATH:$(ZLIBDIR)
969
970 !ifdef FOSSIL_ENABLE_JSON
971 TCC = $(TCC) -DFOSSIL_ENABLE_JSON
972 RCC = $(RCC) -DFOSSIL_ENABLE_JSON
 
 
 
 
 
 
 
973 !endif
974 }
975 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
976 set j " \\\n "
977 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
978
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -942,36 +942,50 @@
942 OBJDIR = .
943 OX = .
944 O = .obj
945 E = .exe
946
947 # Uncomment to enable JSON API
948 # FOSSIL_ENABLE_JSON = 1
949
950 # Uncomment to enable SSL support
951 # FOSSIL_ENABLE_SSL = 1
952
953 !ifdef FOSSIL_ENABLE_SSL
954 SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
955 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
956 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
957 !endif
958
959 # zlib options
960 ZINCDIR = $(B)\compat\zlib
961 ZLIBDIR = $(B)\compat\zlib
962 ZLIB = zlib.lib
963
 
 
 
964 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
965
966 !ifdef FOSSIL_ENABLE_SSL
967 INCL = $(INCL) -I$(SSLINCDIR)
968 !endif
969
970 CFLAGS = -nologo -MT -O2
971 BCC = $(CC) $(CFLAGS)
972 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
973 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
974 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
975 LIBDIR = -LIBPATH:$(ZLIBDIR)
976
977 !ifdef FOSSIL_ENABLE_JSON
978 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
979 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
980 !endif
981
982 !ifdef FOSSIL_ENABLE_SSL
983 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
984 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
985 LIBS = $(LIBS) $(SSLLIB)
986 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
987 !endif
988 }
989 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
990 set j " \\\n "
991 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
992
M win/Makefile.msc
+26 -12
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -12,36 +12,50 @@
1212
 OBJDIR = .
1313
 OX = .
1414
 O = .obj
1515
 E = .exe
1616
17
-# Uncomment below for SSL support
18
-SSL =
19
-SSLLIB =
20
-# SSL = -DFOSSIL_ENABLE_SSL=1
21
-# SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
17
+# Uncomment to enable JSON API
18
+FOSSIL_ENABLE_JSON = 1
19
+
20
+# Uncomment to enable SSL support
21
+FOSSIL_ENABLE_SSL = 1
22
+
23
+!ifdef FOSSIL_ENABLE_SSL
24
+SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
25
+SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
26
+SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
27
+!endif
2228
2329
 # zlib options
2430
 ZINCDIR = $(B)\compat\zlib
2531
 ZLIBDIR = $(B)\compat\zlib
2632
 ZLIB = zlib.lib
2733
28
-# Uncomment to enable JSON API
29
-# FOSSIL_ENABLE_JSON = 1
30
-
3134
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
35
+
36
+!ifdef FOSSIL_ENABLE_SSL
37
+INCL = $(INCL) -I$(SSLINCDIR)
38
+!endif
3239
3340
 CFLAGS = -nologo -MT -O2
3441
 BCC = $(CC) $(CFLAGS)
35
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
42
+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
3643
 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
37
-LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
44
+LIBS = $(ZLIB) ws2_32.lib advapi32.lib
3845
 LIBDIR = -LIBPATH:$(ZLIBDIR)
3946
4047
 !ifdef FOSSIL_ENABLE_JSON
41
-TCC = $(TCC) -DFOSSIL_ENABLE_JSON
42
-RCC = $(RCC) -DFOSSIL_ENABLE_JSON
48
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
49
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
50
+!endif
51
+
52
+!ifdef FOSSIL_ENABLE_SSL
53
+TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
54
+RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
55
+LIBS = $(LIBS) $(SSLLIB)
56
+LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
4357
 !endif
4458
4559
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
4660
 /DSQLITE_THREADSAFE=0 \
4761
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
4862
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -12,36 +12,50 @@
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16
17 # Uncomment below for SSL support
18 SSL =
19 SSLLIB =
20 # SSL = -DFOSSIL_ENABLE_SSL=1
21 # SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
 
 
 
 
 
 
22
23 # zlib options
24 ZINCDIR = $(B)\compat\zlib
25 ZLIBDIR = $(B)\compat\zlib
26 ZLIB = zlib.lib
27
28 # Uncomment to enable JSON API
29 # FOSSIL_ENABLE_JSON = 1
30
31 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
 
 
 
 
32
33 CFLAGS = -nologo -MT -O2
34 BCC = $(CC) $(CFLAGS)
35 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
36 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
37 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
38 LIBDIR = -LIBPATH:$(ZLIBDIR)
39
40 !ifdef FOSSIL_ENABLE_JSON
41 TCC = $(TCC) -DFOSSIL_ENABLE_JSON
42 RCC = $(RCC) -DFOSSIL_ENABLE_JSON
 
 
 
 
 
 
 
43 !endif
44
45 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
46 /DSQLITE_THREADSAFE=0 \
47 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
48
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -12,36 +12,50 @@
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16
17 # Uncomment to enable JSON API
18 FOSSIL_ENABLE_JSON = 1
19
20 # Uncomment to enable SSL support
21 FOSSIL_ENABLE_SSL = 1
22
23 !ifdef FOSSIL_ENABLE_SSL
24 SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
25 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
26 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
27 !endif
28
29 # zlib options
30 ZINCDIR = $(B)\compat\zlib
31 ZLIBDIR = $(B)\compat\zlib
32 ZLIB = zlib.lib
33
 
 
 
34 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
35
36 !ifdef FOSSIL_ENABLE_SSL
37 INCL = $(INCL) -I$(SSLINCDIR)
38 !endif
39
40 CFLAGS = -nologo -MT -O2
41 BCC = $(CC) $(CFLAGS)
42 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
43 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
44 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
45 LIBDIR = -LIBPATH:$(ZLIBDIR)
46
47 !ifdef FOSSIL_ENABLE_JSON
48 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
49 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
50 !endif
51
52 !ifdef FOSSIL_ENABLE_SSL
53 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
54 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
55 LIBS = $(LIBS) $(SSLLIB)
56 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
57 !endif
58
59 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
60 /DSQLITE_THREADSAFE=0 \
61 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
62

Keyboard Shortcuts

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