Fossil SCM

Ensure that SRCDIR_extsrc and SRCDIR_tools are defined in the Windows makefiles (they are not inherited from the main makefile).

stephan 2021-12-25 19:25 code-movement

Commit 5e203da667e656c8ecefbd9f9a08330d730fe013ec3c7f897e84d21172e937d5

Parent 6454f7bcd1cff6b…

5 files changed +17 -11 +7 -7 +3 -1 +3 -1 +3 -2

~ tools/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc

M tools/makemake.tcl

+17 -11

		--- tools/makemake.tcl
		+++ tools/makemake.tcl
		@@ -627,10 +627,12 @@
627	627	#### The toplevel directory of the source tree. Fossil can be built
628	628	# in a directory that is separate from the source tree. Just change
629	629	# the following to point from the build directory to the src/ folder.
630	630	#
631	631	SRCDIR = src
	632	+SRCDIR_extsrc = extsrc
	633	+SCRDIR_tools = tools
632	634
633	635	#### The directory into which object code files should be written.
634	636	#
635	637	OBJDIR = wbld
636	638
		@@ -1172,11 +1174,11 @@
1172	1174	# SQLite Encryption Extension.
1173	1175	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1174	1176	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1175	1177	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1176	1178	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1177		-SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
	1179	+SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1178	1180	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1179	1181	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1180	1182	# SQLITE3_SHELL_SRC.2 comes from the configure process
1181	1183	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1182	1184	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
		@@ -1365,18 +1367,20 @@
1365	1367	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1366	1368	# to regenerate this file.
1367	1369	#
1368	1370	B = ..
1369	1371	SRCDIR = $B\src
	1372	+SRCDIR_extsrc = $B\extsrc
	1373	+SRCDIR_tools = $B\tools
1370	1374	OBJDIR = .
1371	1375	O = .obj
1372	1376	E = .exe
1373	1377
1374	1378
1375	1379	# Maybe DMDIR, SSL or INCL needs adjustment
1376	1380	DMDIR = c:\DM
1377		-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
	1381	+INCL = -I. -I$(SRCDIR) -I$(SRCDIR_extsrc) -I$B\win\include -I$(DMDIR)\extra\include
1378	1382
1379	1383	#SSL = -DFOSSIL_ENABLE_SSL=1
1380	1384	SSL =
1381	1385
1382	1386	CFLAGS = -o
		@@ -1528,11 +1532,12 @@
1528	1532	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1529	1533	# to regenerate this file.
1530	1534	#
1531	1535	B = ..
1532	1536	SRCDIR = $(B)\src
1533		-SRCDIRX = $(B)\extsrc
	1537	+SRCDIR_extsrc = $(B)\extsrc
	1538	+SRCDIR_tools = $(B)\tools
1534	1539	T = .
1535	1540	OBJDIR = $(T)
1536	1541	OX = $(OBJDIR)
1537	1542	O = .obj
1538	1543	E = .exe
		@@ -1685,11 +1690,11 @@
1685	1690	ZLIB = zdll.lib
1686	1691	!else
1687	1692	ZLIB = zlib.lib
1688	1693	!endif
1689	1694
1690		-INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(B)\win\include"
	1695	+INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(SRCDIR_extsrc)" /I"$(B)\win\include"
1691	1696
1692	1697	!if $(FOSSIL_ENABLE_MINIZ)==0
1693	1698	INCL = $(INCL) /I"$(ZINCDIR)"
1694	1699	!endif
1695	1700
		@@ -2174,11 +2179,12 @@
2174	2179	endif
2175	2180
2176	2181	# define the project directories
2177	2182	B=..
2178	2183	SRCDIR=$(B)/src/
2179		-SRCDIRX=$(B)/extsrc/
	2184	+SRCDIR_extsrc=$(B)/extsrc/
	2185	+SRCDIR_tools=$(B)/tools/
2180	2186	WINDIR=$(B)/win/
2181	2187	ZLIBSRCDIR=../../zlib/
2182	2188
2183	2189	# define linker command and options
2184	2190	LINK=$(PellesCDir)/bin/polink.exe
		@@ -2188,11 +2194,11 @@
2188	2194	# the fossil binary. Some special definitions follow for
2189	2195	# special files follow
2190	2196	CC=$(PellesCDir)\bin\pocc.exe
2191	2197	DEFINES=-D_pgmptr=g.argv[0]
2192	2198	CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
2193		-INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIRX)
	2199	+INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIR_extsrc)
2194	2200
2195	2201	# define commands for building the windows resource files
2196	2202	RESOURCE=fossil.res
2197	2203	RC=$(PellesCDir)\bin\porc.exe
2198	2204	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
		@@ -2199,21 +2205,21 @@
2199	2205
2200	2206	# define the special utilities files, needed to generate
2201	2207	# the automatically generated source files
2202	2208	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
2203	2209	UTILS_OBJ=$(UTILS:.exe=.obj)
2204		-UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIRX)$(uf:.exe=.c))
	2210	+UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_tools)$(uf:.exe=.c))
2205	2211
2206	2212	# define the SQLite files, which need special flags on compile
2207	2213	SQLITESRC=sqlite3.c
2208		-ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIRX)$(sf))
	2214	+ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf))
2209	2215	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
2210	2216	SQLITEDEFINES=<<<SQLITE_OPTIONS>>>
2211	2217
2212	2218	# define the SQLite shell files, which need special flags on compile
2213	2219	SQLITESHELLSRC=shell.c
2214		-ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIRX)$(sf))
	2220	+ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR_extsrc)$(sf))
2215	2221	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
2216	2222	SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>>
2217	2223
2218	2224	# define the th scripting files, which need special flags on compile
2219	2225	THSRC=th.c th_lang.c
		@@ -2279,14 +2285,14 @@
2279	2285	# compile C sources with relevant options
2280	2286
2281	2287	$(TRANSLATEDOBJ): %_.obj: %_.c %.h
2282	2288	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2283	2289
2284		-$(SQLITEOBJ): %.obj: $(SRCDIRX)%.c $(SRCDIRX)%.h
	2290	+$(SQLITEOBJ): %.obj: $(SRCDIR_extsrc)%.c $(SRCDIR_extsrc)%.h
2285	2291	$(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
2286	2292
2287		-$(SQLITESHELLOBJ): %.obj: $(SRCDIRX)%.c
	2293	+$(SQLITESHELLOBJ): %.obj: $(SRCDIR_extsrc)%.c
2288	2294	$(CC) $(CCFLAGS) $(SQLITESHELLDEFINES) $(INCLUDE) "$<" -Fo"$@"
2289	2295
2290	2296	$(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
2291	2297	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2292	2298
2293	2299

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -627,10 +627,12 @@
627	#### The toplevel directory of the source tree. Fossil can be built
628	# in a directory that is separate from the source tree. Just change
629	# the following to point from the build directory to the src/ folder.
630	#
631	SRCDIR = src


632
633	#### The directory into which object code files should be written.
634	#
635	OBJDIR = wbld
636
	@@ -1172,11 +1174,11 @@
1172	# SQLite Encryption Extension.
1173	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1174	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1175	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1176	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1177	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1178	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1179	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1180	# SQLITE3_SHELL_SRC.2 comes from the configure process
1181	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1182	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
	@@ -1365,18 +1367,20 @@
1365	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1366	# to regenerate this file.
1367	#
1368	B = ..
1369	SRCDIR = $B\src


1370	OBJDIR = .
1371	O = .obj
1372	E = .exe
1373
1374
1375	# Maybe DMDIR, SSL or INCL needs adjustment
1376	DMDIR = c:\DM
1377	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
1378
1379	#SSL = -DFOSSIL_ENABLE_SSL=1
1380	SSL =
1381
1382	CFLAGS = -o
	@@ -1528,11 +1532,12 @@
1528	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1529	# to regenerate this file.
1530	#
1531	B = ..
1532	SRCDIR = $(B)\src
1533	SRCDIRX = $(B)\extsrc

1534	T = .
1535	OBJDIR = $(T)
1536	OX = $(OBJDIR)
1537	O = .obj
1538	E = .exe
	@@ -1685,11 +1690,11 @@
1685	ZLIB = zdll.lib
1686	!else
1687	ZLIB = zlib.lib
1688	!endif
1689
1690	INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(B)\win\include"
1691
1692	!if $(FOSSIL_ENABLE_MINIZ)==0
1693	INCL = $(INCL) /I"$(ZINCDIR)"
1694	!endif
1695
	@@ -2174,11 +2179,12 @@
2174	endif
2175
2176	# define the project directories
2177	B=..
2178	SRCDIR=$(B)/src/
2179	SRCDIRX=$(B)/extsrc/

2180	WINDIR=$(B)/win/
2181	ZLIBSRCDIR=../../zlib/
2182
2183	# define linker command and options
2184	LINK=$(PellesCDir)/bin/polink.exe
	@@ -2188,11 +2194,11 @@
2188	# the fossil binary. Some special definitions follow for
2189	# special files follow
2190	CC=$(PellesCDir)\bin\pocc.exe
2191	DEFINES=-D_pgmptr=g.argv[0]
2192	CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
2193	INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIRX)
2194
2195	# define commands for building the windows resource files
2196	RESOURCE=fossil.res
2197	RC=$(PellesCDir)\bin\porc.exe
2198	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
	@@ -2199,21 +2205,21 @@
2199
2200	# define the special utilities files, needed to generate
2201	# the automatically generated source files
2202	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
2203	UTILS_OBJ=$(UTILS:.exe=.obj)
2204	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIRX)$(uf:.exe=.c))
2205
2206	# define the SQLite files, which need special flags on compile
2207	SQLITESRC=sqlite3.c
2208	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIRX)$(sf))
2209	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
2210	SQLITEDEFINES=<<<SQLITE_OPTIONS>>>
2211
2212	# define the SQLite shell files, which need special flags on compile
2213	SQLITESHELLSRC=shell.c
2214	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIRX)$(sf))
2215	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
2216	SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>>
2217
2218	# define the th scripting files, which need special flags on compile
2219	THSRC=th.c th_lang.c
	@@ -2279,14 +2285,14 @@
2279	# compile C sources with relevant options
2280
2281	$(TRANSLATEDOBJ): %_.obj: %_.c %.h
2282	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2283
2284	$(SQLITEOBJ): %.obj: $(SRCDIRX)%.c $(SRCDIRX)%.h
2285	$(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
2286
2287	$(SQLITESHELLOBJ): %.obj: $(SRCDIRX)%.c
2288	$(CC) $(CCFLAGS) $(SQLITESHELLDEFINES) $(INCLUDE) "$<" -Fo"$@"
2289
2290	$(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
2291	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2292
2293

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -627,10 +627,12 @@
627	#### The toplevel directory of the source tree. Fossil can be built
628	# in a directory that is separate from the source tree. Just change
629	# the following to point from the build directory to the src/ folder.
630	#
631	SRCDIR = src
632	SRCDIR_extsrc = extsrc
633	SCRDIR_tools = tools
634
635	#### The directory into which object code files should be written.
636	#
637	OBJDIR = wbld
638
	@@ -1172,11 +1174,11 @@
1174	# SQLite Encryption Extension.
1175	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1176	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1177	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1178	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1179	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1180	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1181	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1182	# SQLITE3_SHELL_SRC.2 comes from the configure process
1183	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1184	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
	@@ -1365,18 +1367,20 @@
1367	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1368	# to regenerate this file.
1369	#
1370	B = ..
1371	SRCDIR = $B\src
1372	SRCDIR_extsrc = $B\extsrc
1373	SRCDIR_tools = $B\tools
1374	OBJDIR = .
1375	O = .obj
1376	E = .exe
1377
1378
1379	# Maybe DMDIR, SSL or INCL needs adjustment
1380	DMDIR = c:\DM
1381	INCL = -I. -I$(SRCDIR) -I$(SRCDIR_extsrc) -I$B\win\include -I$(DMDIR)\extra\include
1382
1383	#SSL = -DFOSSIL_ENABLE_SSL=1
1384	SSL =
1385
1386	CFLAGS = -o
	@@ -1528,11 +1532,12 @@
1532	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1533	# to regenerate this file.
1534	#
1535	B = ..
1536	SRCDIR = $(B)\src
1537	SRCDIR_extsrc = $(B)\extsrc
1538	SRCDIR_tools = $(B)\tools
1539	T = .
1540	OBJDIR = $(T)
1541	OX = $(OBJDIR)
1542	O = .obj
1543	E = .exe
	@@ -1685,11 +1690,11 @@
1690	ZLIB = zdll.lib
1691	!else
1692	ZLIB = zlib.lib
1693	!endif
1694
1695	INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(SRCDIR_extsrc)" /I"$(B)\win\include"
1696
1697	!if $(FOSSIL_ENABLE_MINIZ)==0
1698	INCL = $(INCL) /I"$(ZINCDIR)"
1699	!endif
1700
	@@ -2174,11 +2179,12 @@
2179	endif
2180
2181	# define the project directories
2182	B=..
2183	SRCDIR=$(B)/src/
2184	SRCDIR_extsrc=$(B)/extsrc/
2185	SRCDIR_tools=$(B)/tools/
2186	WINDIR=$(B)/win/
2187	ZLIBSRCDIR=../../zlib/
2188
2189	# define linker command and options
2190	LINK=$(PellesCDir)/bin/polink.exe
	@@ -2188,11 +2194,11 @@
2194	# the fossil binary. Some special definitions follow for
2195	# special files follow
2196	CC=$(PellesCDir)\bin\pocc.exe
2197	DEFINES=-D_pgmptr=g.argv[0]
2198	CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
2199	INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIR_extsrc)
2200
2201	# define commands for building the windows resource files
2202	RESOURCE=fossil.res
2203	RC=$(PellesCDir)\bin\porc.exe
2204	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
	@@ -2199,21 +2205,21 @@
2205
2206	# define the special utilities files, needed to generate
2207	# the automatically generated source files
2208	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
2209	UTILS_OBJ=$(UTILS:.exe=.obj)
2210	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_tools)$(uf:.exe=.c))
2211
2212	# define the SQLite files, which need special flags on compile
2213	SQLITESRC=sqlite3.c
2214	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf))
2215	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
2216	SQLITEDEFINES=<<<SQLITE_OPTIONS>>>
2217
2218	# define the SQLite shell files, which need special flags on compile
2219	SQLITESHELLSRC=shell.c
2220	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR_extsrc)$(sf))
2221	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
2222	SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>>
2223
2224	# define the th scripting files, which need special flags on compile
2225	THSRC=th.c th_lang.c
	@@ -2279,14 +2285,14 @@
2285	# compile C sources with relevant options
2286
2287	$(TRANSLATEDOBJ): %_.obj: %_.c %.h
2288	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2289
2290	$(SQLITEOBJ): %.obj: $(SRCDIR_extsrc)%.c $(SRCDIR_extsrc)%.h
2291	$(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
2292
2293	$(SQLITESHELLOBJ): %.obj: $(SRCDIR_extsrc)%.c
2294	$(CC) $(CCFLAGS) $(SQLITESHELLDEFINES) $(INCLUDE) "$<" -Fo"$@"
2295
2296	$(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
2297	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2298
2299

M win/Makefile.PellesCGMake

+7 -7

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -53,11 +53,11 @@
53	53	endif
54	54
55	55	# define the project directories
56	56	B=..
57	57	SRCDIR=$(B)/src/
58		-SRCDIRX=$(B)/extsrc/
	58	+SRCDIR_extsrc=$(B)/extsrc/
59	59	WINDIR=$(B)/win/
60	60	ZLIBSRCDIR=../../zlib/
61	61
62	62	# define linker command and options
63	63	LINK=$(PellesCDir)/bin/polink.exe
		@@ -67,11 +67,11 @@
67	67	# the fossil binary. Some special definitions follow for
68	68	# special files follow
69	69	CC=$(PellesCDir)\bin\pocc.exe
70	70	DEFINES=-D_pgmptr=g.argv[0]
71	71	CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
72		-INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIRX)
	72	+INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIR_extsrc)
73	73
74	74	# define commands for building the windows resource files
75	75	RESOURCE=fossil.res
76	76	RC=$(PellesCDir)\bin\porc.exe
77	77	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
		@@ -78,21 +78,21 @@
78	78
79	79	# define the special utilities files, needed to generate
80	80	# the automatically generated source files
81	81	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
82	82	UTILS_OBJ=$(UTILS:.exe=.obj)
83		-UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIRX)$(uf:.exe=.c))
	83	+UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_extsrc)$(uf:.exe=.c))
84	84
85	85	# define the SQLite files, which need special flags on compile
86	86	SQLITESRC=sqlite3.c
87		-ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIRX)$(sf))
	87	+ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf))
88	88	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
89	89	SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DSQLITE_WIN32_NO_ANSI
90	90
91	91	# define the SQLite shell files, which need special flags on compile
92	92	SQLITESHELLSRC=shell.c
93		-ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIRX)$(sf))
	93	+ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR_extsrc)$(sf))
94	94	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
95	95	SQLITESHELLDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
96	96
97	97	# define the th scripting files, which need special flags on compile
98	98	THSRC=th.c th_lang.c
		@@ -158,14 +158,14 @@
158	158	# compile C sources with relevant options
159	159
160	160	$(TRANSLATEDOBJ): %_.obj: %_.c %.h
161	161	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
162	162
163		-$(SQLITEOBJ): %.obj: $(SRCDIRX)%.c $(SRCDIRX)%.h
	163	+$(SQLITEOBJ): %.obj: $(SRCDIR_extsrc)%.c $(SRCDIR_extsrc)%.h
164	164	$(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
165	165
166		-$(SQLITESHELLOBJ): %.obj: $(SRCDIRX)%.c
	166	+$(SQLITESHELLOBJ): %.obj: $(SRCDIR_extsrc)%.c
167	167	$(CC) $(CCFLAGS) $(SQLITESHELLDEFINES) $(INCLUDE) "$<" -Fo"$@"
168	168
169	169	$(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
170	170	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
171	171
172	172

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -53,11 +53,11 @@
53	endif
54
55	# define the project directories
56	B=..
57	SRCDIR=$(B)/src/
58	SRCDIRX=$(B)/extsrc/
59	WINDIR=$(B)/win/
60	ZLIBSRCDIR=../../zlib/
61
62	# define linker command and options
63	LINK=$(PellesCDir)/bin/polink.exe
	@@ -67,11 +67,11 @@
67	# the fossil binary. Some special definitions follow for
68	# special files follow
69	CC=$(PellesCDir)\bin\pocc.exe
70	DEFINES=-D_pgmptr=g.argv[0]
71	CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
72	INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIRX)
73
74	# define commands for building the windows resource files
75	RESOURCE=fossil.res
76	RC=$(PellesCDir)\bin\porc.exe
77	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
	@@ -78,21 +78,21 @@
78
79	# define the special utilities files, needed to generate
80	# the automatically generated source files
81	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
82	UTILS_OBJ=$(UTILS:.exe=.obj)
83	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIRX)$(uf:.exe=.c))
84
85	# define the SQLite files, which need special flags on compile
86	SQLITESRC=sqlite3.c
87	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIRX)$(sf))
88	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
89	SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DSQLITE_WIN32_NO_ANSI
90
91	# define the SQLite shell files, which need special flags on compile
92	SQLITESHELLSRC=shell.c
93	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIRX)$(sf))
94	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
95	SQLITESHELLDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
96
97	# define the th scripting files, which need special flags on compile
98	THSRC=th.c th_lang.c
	@@ -158,14 +158,14 @@
158	# compile C sources with relevant options
159
160	$(TRANSLATEDOBJ): %_.obj: %_.c %.h
161	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
162
163	$(SQLITEOBJ): %.obj: $(SRCDIRX)%.c $(SRCDIRX)%.h
164	$(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
165
166	$(SQLITESHELLOBJ): %.obj: $(SRCDIRX)%.c
167	$(CC) $(CCFLAGS) $(SQLITESHELLDEFINES) $(INCLUDE) "$<" -Fo"$@"
168
169	$(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
170	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
171
172

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -53,11 +53,11 @@
53	endif
54
55	# define the project directories
56	B=..
57	SRCDIR=$(B)/src/
58	SRCDIR_extsrc=$(B)/extsrc/
59	WINDIR=$(B)/win/
60	ZLIBSRCDIR=../../zlib/
61
62	# define linker command and options
63	LINK=$(PellesCDir)/bin/polink.exe
	@@ -67,11 +67,11 @@
67	# the fossil binary. Some special definitions follow for
68	# special files follow
69	CC=$(PellesCDir)\bin\pocc.exe
70	DEFINES=-D_pgmptr=g.argv[0]
71	CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
72	INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) /I $(SRCDIR_extsrc)
73
74	# define commands for building the windows resource files
75	RESOURCE=fossil.res
76	RC=$(PellesCDir)\bin\porc.exe
77	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
	@@ -78,21 +78,21 @@
78
79	# define the special utilities files, needed to generate
80	# the automatically generated source files
81	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
82	UTILS_OBJ=$(UTILS:.exe=.obj)
83	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_extsrc)$(uf:.exe=.c))
84
85	# define the SQLite files, which need special flags on compile
86	SQLITESRC=sqlite3.c
87	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf))
88	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
89	SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DSQLITE_WIN32_NO_ANSI
90
91	# define the SQLite shell files, which need special flags on compile
92	SQLITESHELLSRC=shell.c
93	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR_extsrc)$(sf))
94	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
95	SQLITESHELLDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
96
97	# define the th scripting files, which need special flags on compile
98	THSRC=th.c th_lang.c
	@@ -158,14 +158,14 @@
158	# compile C sources with relevant options
159
160	$(TRANSLATEDOBJ): %_.obj: %_.c %.h
161	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
162
163	$(SQLITEOBJ): %.obj: $(SRCDIR_extsrc)%.c $(SRCDIR_extsrc)%.h
164	$(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
165
166	$(SQLITESHELLOBJ): %.obj: $(SRCDIR_extsrc)%.c
167	$(CC) $(CCFLAGS) $(SQLITESHELLDEFINES) $(INCLUDE) "$<" -Fo"$@"
168
169	$(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
170	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
171
172

M win/Makefile.dmc

+3 -1

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -7,18 +7,20 @@
7	7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	8	# to regenerate this file.
9	9	#
10	10	B = ..
11	11	SRCDIR = $B\src
	12	+SRCDIR_extsrc = $B\extsrc
	13	+SRCDIR_tools = $B\tools
12	14	OBJDIR = .
13	15	O = .obj
14	16	E = .exe
15	17
16	18
17	19	# Maybe DMDIR, SSL or INCL needs adjustment
18	20	DMDIR = c:\DM
19		-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
	21	+INCL = -I. -I$(SRCDIR) -I$(SRCDIR_extsrc) -I$B\win\include -I$(DMDIR)\extra\include
20	22
21	23	#SSL = -DFOSSIL_ENABLE_SSL=1
22	24	SSL =
23	25
24	26	CFLAGS = -o
25	27

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -7,18 +7,20 @@
7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	# to regenerate this file.
9	#
10	B = ..
11	SRCDIR = $B\src


12	OBJDIR = .
13	O = .obj
14	E = .exe
15
16
17	# Maybe DMDIR, SSL or INCL needs adjustment
18	DMDIR = c:\DM
19	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
20
21	#SSL = -DFOSSIL_ENABLE_SSL=1
22	SSL =
23
24	CFLAGS = -o
25

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -7,18 +7,20 @@
7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	# to regenerate this file.
9	#
10	B = ..
11	SRCDIR = $B\src
12	SRCDIR_extsrc = $B\extsrc
13	SRCDIR_tools = $B\tools
14	OBJDIR = .
15	O = .obj
16	E = .exe
17
18
19	# Maybe DMDIR, SSL or INCL needs adjustment
20	DMDIR = c:\DM
21	INCL = -I. -I$(SRCDIR) -I$(SRCDIR_extsrc) -I$B\win\include -I$(DMDIR)\extra\include
22
23	#SSL = -DFOSSIL_ENABLE_SSL=1
24	SSL =
25
26	CFLAGS = -o
27

M win/Makefile.mingw

+3 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -28,10 +28,12 @@
28	28	#### The toplevel directory of the source tree. Fossil can be built
29	29	# in a directory that is separate from the source tree. Just change
30	30	# the following to point from the build directory to the src/ folder.
31	31	#
32	32	SRCDIR = src
	33	+SRCDIR_extsrc = extsrc
	34	+SCRDIR_tools = tools
33	35
34	36	#### The directory into which object code files should be written.
35	37	#
36	38	OBJDIR = wbld
37	39
		@@ -1108,11 +1110,11 @@
1108	1110	# SQLite Encryption Extension.
1109	1111	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1110	1112	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1111	1113	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1112	1114	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1113		-SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
	1115	+SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1114	1116	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1115	1117	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1116	1118	# SQLITE3_SHELL_SRC.2 comes from the configure process
1117	1119	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1118	1120	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1119	1121

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -28,10 +28,12 @@
28	#### The toplevel directory of the source tree. Fossil can be built
29	# in a directory that is separate from the source tree. Just change
30	# the following to point from the build directory to the src/ folder.
31	#
32	SRCDIR = src


33
34	#### The directory into which object code files should be written.
35	#
36	OBJDIR = wbld
37
	@@ -1108,11 +1110,11 @@
1108	# SQLite Encryption Extension.
1109	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1110	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1111	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1112	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1113	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1114	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1115	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1116	# SQLITE3_SHELL_SRC.2 comes from the configure process
1117	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1118	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1119

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -28,10 +28,12 @@
28	#### The toplevel directory of the source tree. Fossil can be built
29	# in a directory that is separate from the source tree. Just change
30	# the following to point from the build directory to the src/ folder.
31	#
32	SRCDIR = src
33	SRCDIR_extsrc = extsrc
34	SCRDIR_tools = tools
35
36	#### The directory into which object code files should be written.
37	#
38	OBJDIR = wbld
39
	@@ -1108,11 +1110,11 @@
1110	# SQLite Encryption Extension.
1111	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1112	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1113	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1114	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1115	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1116	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1117	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1118	# SQLITE3_SHELL_SRC.2 comes from the configure process
1119	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1120	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1121

M win/Makefile.msc

+3 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -8,11 +8,12 @@
8	8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	9	# to regenerate this file.
10	10	#
11	11	B = ..
12	12	SRCDIR = $(B)\src
13		-SRCDIRX = $(B)\extsrc
	13	+SRCDIR_extsrc = $(B)\extsrc
	14	+SRCDIR_tools = $(B)\tools
14	15	T = .
15	16	OBJDIR = $(T)
16	17	OX = $(OBJDIR)
17	18	O = .obj
18	19	E = .exe
		@@ -165,11 +166,11 @@
165	166	ZLIB = zdll.lib
166	167	!else
167	168	ZLIB = zlib.lib
168	169	!endif
169	170
170		-INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(B)\win\include"
	171	+INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(SRCDIR_extsrc)" /I"$(B)\win\include"
171	172
172	173	!if $(FOSSIL_ENABLE_MINIZ)==0
173	174	INCL = $(INCL) /I"$(ZINCDIR)"
174	175	!endif
175	176
176	177

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -8,11 +8,12 @@
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	B = ..
12	SRCDIR = $(B)\src
13	SRCDIRX = $(B)\extsrc

14	T = .
15	OBJDIR = $(T)
16	OX = $(OBJDIR)
17	O = .obj
18	E = .exe
	@@ -165,11 +166,11 @@
165	ZLIB = zdll.lib
166	!else
167	ZLIB = zlib.lib
168	!endif
169
170	INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(B)\win\include"
171
172	!if $(FOSSIL_ENABLE_MINIZ)==0
173	INCL = $(INCL) /I"$(ZINCDIR)"
174	!endif
175
176

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -8,11 +8,12 @@
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	B = ..
12	SRCDIR = $(B)\src
13	SRCDIR_extsrc = $(B)\extsrc
14	SRCDIR_tools = $(B)\tools
15	T = .
16	OBJDIR = $(T)
17	OX = $(OBJDIR)
18	O = .obj
19	E = .exe
	@@ -165,11 +166,11 @@
166	ZLIB = zdll.lib
167	!else
168	ZLIB = zlib.lib
169	!endif
170
171	INCL = /I. /I"$(OX)" /I"$(SRCDIR)" /I"$(SRCDIR_extsrc)" /I"$(B)\win\include"
172
173	!if $(FOSSIL_ENABLE_MINIZ)==0
174	INCL = $(INCL) /I"$(ZINCDIR)"
175	!endif
176
177

Fossil SCM

Keyboard Shortcuts