Fossil SCM
Adjust the include path for OpenSSL when building (only?) with MSVC.
Commit
f4ab459430b2f82406d7551f9a4e1bb8c20d88b1
Parent
201e87a2511d74c…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1183,11 +1183,11 @@ | ||
| 1183 | 1183 | # Uncomment to enable Tcl support |
| 1184 | 1184 | # FOSSIL_ENABLE_TCL = 1 |
| 1185 | 1185 | |
| 1186 | 1186 | !ifdef FOSSIL_ENABLE_SSL |
| 1187 | 1187 | SSLDIR = $(B)\compat\openssl-1.0.1i |
| 1188 | -SSLINCDIR = $(SSLDIR)\include | |
| 1188 | +SSLINCDIR = $(SSLDIR)\inc32 | |
| 1189 | 1189 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1190 | 1190 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1191 | 1191 | !endif |
| 1192 | 1192 | |
| 1193 | 1193 | !ifdef FOSSIL_ENABLE_TCL |
| 1194 | 1194 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1183,11 +1183,11 @@ | |
| 1183 | # Uncomment to enable Tcl support |
| 1184 | # FOSSIL_ENABLE_TCL = 1 |
| 1185 | |
| 1186 | !ifdef FOSSIL_ENABLE_SSL |
| 1187 | SSLDIR = $(B)\compat\openssl-1.0.1i |
| 1188 | SSLINCDIR = $(SSLDIR)\include |
| 1189 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1190 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1191 | !endif |
| 1192 | |
| 1193 | !ifdef FOSSIL_ENABLE_TCL |
| 1194 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1183,11 +1183,11 @@ | |
| 1183 | # Uncomment to enable Tcl support |
| 1184 | # FOSSIL_ENABLE_TCL = 1 |
| 1185 | |
| 1186 | !ifdef FOSSIL_ENABLE_SSL |
| 1187 | SSLDIR = $(B)\compat\openssl-1.0.1i |
| 1188 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1189 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1190 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1191 | !endif |
| 1192 | |
| 1193 | !ifdef FOSSIL_ENABLE_TCL |
| 1194 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -42,11 +42,11 @@ | ||
| 42 | 42 | # Uncomment to enable Tcl support |
| 43 | 43 | # FOSSIL_ENABLE_TCL = 1 |
| 44 | 44 | |
| 45 | 45 | !ifdef FOSSIL_ENABLE_SSL |
| 46 | 46 | SSLDIR = $(B)\compat\openssl-1.0.1i |
| 47 | -SSLINCDIR = $(SSLDIR)\include | |
| 47 | +SSLINCDIR = $(SSLDIR)\inc32 | |
| 48 | 48 | SSLLIBDIR = $(SSLDIR)\out32 |
| 49 | 49 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 50 | 50 | !endif |
| 51 | 51 | |
| 52 | 52 | !ifdef FOSSIL_ENABLE_TCL |
| 53 | 53 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -42,11 +42,11 @@ | |
| 42 | # Uncomment to enable Tcl support |
| 43 | # FOSSIL_ENABLE_TCL = 1 |
| 44 | |
| 45 | !ifdef FOSSIL_ENABLE_SSL |
| 46 | SSLDIR = $(B)\compat\openssl-1.0.1i |
| 47 | SSLINCDIR = $(SSLDIR)\include |
| 48 | SSLLIBDIR = $(SSLDIR)\out32 |
| 49 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 50 | !endif |
| 51 | |
| 52 | !ifdef FOSSIL_ENABLE_TCL |
| 53 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -42,11 +42,11 @@ | |
| 42 | # Uncomment to enable Tcl support |
| 43 | # FOSSIL_ENABLE_TCL = 1 |
| 44 | |
| 45 | !ifdef FOSSIL_ENABLE_SSL |
| 46 | SSLDIR = $(B)\compat\openssl-1.0.1i |
| 47 | SSLINCDIR = $(SSLDIR)\inc32 |
| 48 | SSLLIBDIR = $(SSLDIR)\out32 |
| 49 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 50 | !endif |
| 51 | |
| 52 | !ifdef FOSSIL_ENABLE_TCL |
| 53 |