Skip to content

Commit 630eff1

Browse files
LethjaLethja
authored
common.inc (#5)
* Added common.inc where all the similar files go. This file additionally fixes up the build system for DOS building machines and emulators * Added and updated all makefiles to use common.inc
1 parent c4de883 commit 630eff1

File tree

6 files changed

+70
-325
lines changed

6 files changed

+70
-325
lines changed

‎common.inc‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# This file is part of wmake but should not be run directly.
2+
# It depends on other makefiles to setup variables for the target first
3+
# and stores only common tasks amongst all platform build processes.
4+
5+
objs = $(OBJDIR)$(SEP)lapi.obj $(OBJDIR)$(SEP)lctype.obj &
6+
$(OBJDIR)$(SEP)lfunc.obj $(OBJDIR)$(SEP)lmathlib.obj &
7+
$(OBJDIR)$(SEP)loslib.obj $(OBJDIR)$(SEP)ltable.obj &
8+
$(OBJDIR)$(SEP)lundump.obj $(OBJDIR)$(SEP)lauxlib.obj &
9+
$(OBJDIR)$(SEP)ldblib.obj $(OBJDIR)$(SEP)lgc.obj &
10+
$(OBJDIR)$(SEP)lmem.obj $(OBJDIR)$(SEP)lparser.obj &
11+
$(OBJDIR)$(SEP)ltablib.obj $(OBJDIR)$(SEP)lutf8lib.obj &
12+
$(OBJDIR)$(SEP)lbaselib.obj $(OBJDIR)$(SEP)ldebug.obj &
13+
$(OBJDIR)$(SEP)linit.obj $(OBJDIR)$(SEP)loadlib.obj &
14+
$(OBJDIR)$(SEP)lstate.obj $(OBJDIR)$(SEP)ltm.obj &
15+
$(OBJDIR)$(SEP)lvm.obj $(OBJDIR)$(SEP)lcode.obj &
16+
$(OBJDIR)$(SEP)ldo.obj $(OBJDIR)$(SEP)liolib.obj &
17+
$(OBJDIR)$(SEP)lobject.obj $(OBJDIR)$(SEP)lstring.obj &
18+
$(OBJDIR)$(SEP)lzio.obj $(OBJDIR)$(SEP)lcorolib.obj &
19+
$(OBJDIR)$(SEP)ldump.obj $(OBJDIR)$(SEP)llex.obj &
20+
$(OBJDIR)$(SEP)lopcodes.obj $(OBJDIR)$(SEP)lstrlib.obj
21+
22+
lua_obj = $(OBJDIR)$(SEP)lua.obj
23+
luac_obj = $(OBJDIR)$(SEP)luac.obj
24+
25+
!ifdef __UNIX__
26+
SEP = /
27+
!else
28+
SEP = \
29+
!endif
30+
31+
BINDIR = dist$(SEP)bin
32+
OBJDIR = obj$(SEP)$(PLATFORM)
33+
SRCDIR = lua
34+
35+
$(BINDIR)$(SEP)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
36+
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
37+
38+
$(BINDIR)$(SEP)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
39+
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
40+
41+
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
42+
$(CC) $(CFLAGS) -fo=$@ $<
43+
44+
clean: .SYMBOLIC
45+
!ifdef __UNIX__
46+
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
47+
@!if [ -e $(BINDIR)lua$(PLATFORM).exe ]; then rm $(BINDIR)lua$(PLATFORM).exe; fi
48+
@!if [ -e $(BINDIR)luac$(PLATFORM).exe ]; then rm $(BINDIR)luac$(PLATFORM).exe; fi
49+
!else # Assuming DOS 5.0 +
50+
@!if exist $(BINDIR)$(SEP)lua$(PLATFORM).exe del $(BINDIR)$(SEP)lua$(PLATFORM).exe
51+
@!if exist $(BINDIR)$(SEP)luac$(PLATFORM).exe del $(BINDIR)$(SEP)luac$(PLATFORM).exe
52+
@!if exist $(OBJDIR)$(SEP)*.* echo Run `DEL $(OBJDIR)$(SEP)*.* && RD $(OBJDIR)` to clean compiler objects
53+
!endif
54+
55+
dist:
56+
mkdir dist
57+
58+
obj:
59+
mkdir obj
60+
61+
$(BINDIR): dist
62+
mkdir $(BINDIR)
63+
64+
$(OBJDIR): obj
65+
mkdir $(OBJDIR)

‎wm_dos16.mak‎

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,11 @@
33
# There are no configurable parts to this file
44
# Run with `wmake -f mw_dos16.mak`
55

6-
objs = $(OBJDIR)lapi.obj $(OBJDIR)lctype.obj &
7-
$(OBJDIR)lfunc.obj $(OBJDIR)lmathlib.obj &
8-
$(OBJDIR)loslib.obj $(OBJDIR)ltable.obj &
9-
$(OBJDIR)lundump.obj $(OBJDIR)lauxlib.obj &
10-
$(OBJDIR)ldblib.obj $(OBJDIR)lgc.obj &
11-
$(OBJDIR)lmem.obj $(OBJDIR)lparser.obj &
12-
$(OBJDIR)ltablib.obj $(OBJDIR)lutf8lib.obj &
13-
$(OBJDIR)lbaselib.obj $(OBJDIR)ldebug.obj &
14-
$(OBJDIR)linit.obj $(OBJDIR)loadlib.obj &
15-
$(OBJDIR)lstate.obj $(OBJDIR)ltm.obj &
16-
$(OBJDIR)lvm.obj $(OBJDIR)lcode.obj &
17-
$(OBJDIR)ldo.obj $(OBJDIR)liolib.obj &
18-
$(OBJDIR)lobject.obj $(OBJDIR)lstring.obj &
19-
$(OBJDIR)lzio.obj $(OBJDIR)lcorolib.obj &
20-
$(OBJDIR)ldump.obj $(OBJDIR)llex.obj &
21-
$(OBJDIR)lopcodes.obj $(OBJDIR)lstrlib.obj
22-
23-
lua_obj = $(OBJDIR)lua.obj
24-
luac_obj = $(OBJDIR)luac.obj
25-
266
CC = *wcc
277

288
CFLAGS = -q -bt=dos -ml -0 -d0 -osr -zc
299
LFLAGS = SYS dos OPT st=8192
3010

3111
PLATFORM = 16
3212

33-
!ifdef __UNIX__
34-
BINDIR = dist/bin/
35-
OBJDIR = obj/$(PLATFORM)/
36-
SRCDIR = lua/
37-
!else
38-
BINDIR = dist\bin\ #
39-
OBJDIR = obj\$(PLATFORM)\ #
40-
SRCDIR = lua\ #
41-
!endif
42-
43-
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
44-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
45-
46-
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
47-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
48-
49-
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
50-
$(CC) $(CFLAGS) -fo=$@ $<
51-
52-
clean: .SYMBOLIC
53-
!ifdef __UNIX__
54-
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
55-
@!if [ -e $(BINDIR)lua$(PLATFORM).exe ]; then rm $(BINDIR)lua$(PLATFORM).exe; fi
56-
@!if [ -e $(BINDIR)luac$(PLATFORM).exe ]; then rm $(BINDIR)luac$(PLATFORM).exe; fi
57-
!else
58-
!ifdef __NT__
59-
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
60-
!else
61-
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
62-
!endif
63-
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64-
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
65-
!endif
66-
67-
dist:
68-
mkdir dist
69-
70-
obj:
71-
mkdir obj
72-
73-
$(BINDIR): dist
74-
mkdir $(BINDIR)
75-
76-
$(OBJDIR): obj
77-
mkdir $(OBJDIR)
13+
!include common.inc

‎wm_dos4g.mak‎

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,11 @@
33
# There are no configurable parts to this file
44
# Run with `wmake -f wm_dos4g.mak`
55

6-
objs = $(OBJDIR)lapi.obj $(OBJDIR)lctype.obj &
7-
$(OBJDIR)lfunc.obj $(OBJDIR)lmathlib.obj &
8-
$(OBJDIR)loslib.obj $(OBJDIR)ltable.obj &
9-
$(OBJDIR)lundump.obj $(OBJDIR)lauxlib.obj &
10-
$(OBJDIR)ldblib.obj $(OBJDIR)lgc.obj &
11-
$(OBJDIR)lmem.obj $(OBJDIR)lparser.obj &
12-
$(OBJDIR)ltablib.obj $(OBJDIR)lutf8lib.obj &
13-
$(OBJDIR)lbaselib.obj $(OBJDIR)ldebug.obj &
14-
$(OBJDIR)linit.obj $(OBJDIR)loadlib.obj &
15-
$(OBJDIR)lstate.obj $(OBJDIR)ltm.obj &
16-
$(OBJDIR)lvm.obj $(OBJDIR)lcode.obj &
17-
$(OBJDIR)ldo.obj $(OBJDIR)liolib.obj &
18-
$(OBJDIR)lobject.obj $(OBJDIR)lstring.obj &
19-
$(OBJDIR)lzio.obj $(OBJDIR)lcorolib.obj &
20-
$(OBJDIR)ldump.obj $(OBJDIR)llex.obj &
21-
$(OBJDIR)lopcodes.obj $(OBJDIR)lstrlib.obj
22-
23-
lua_obj = $(OBJDIR)lua.obj
24-
luac_obj = $(OBJDIR)luac.obj
25-
266
CC = *wcc386
277

288
CFLAGS = -q -bt=dos4g -mf -3 -d0 -osr -zc
299
LFLAGS = SYS dos4g OPT st=8192
3010

3111
PLATFORM = 4g
3212

33-
!ifdef __UNIX__
34-
BINDIR = dist/bin/
35-
OBJDIR = obj/$(PLATFORM)/
36-
SRCDIR = lua/
37-
!else
38-
BINDIR = dist\bin\ #
39-
OBJDIR = obj\$(PLATFORM)\ #
40-
SRCDIR = lua\ #
41-
!endif
42-
43-
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
44-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
45-
46-
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
47-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
48-
49-
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
50-
$(CC) $(CFLAGS) -fo=$@ $<
51-
52-
clean: .SYMBOLIC
53-
!ifdef __UNIX__
54-
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
55-
@!if [ -e $(BINDIR)lua$(PLATFORM).exe ]; then rm $(BINDIR)lua$(PLATFORM).exe; fi
56-
@!if [ -e $(BINDIR)luac$(PLATFORM).exe ]; then rm $(BINDIR)luac$(PLATFORM).exe; fi
57-
!else
58-
!ifdef __NT__
59-
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
60-
!else
61-
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
62-
!endif
63-
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64-
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
65-
!endif
66-
67-
dist:
68-
mkdir dist
69-
70-
obj:
71-
mkdir obj
72-
73-
$(BINDIR): dist
74-
mkdir $(BINDIR)
75-
76-
$(OBJDIR): obj
77-
mkdir $(OBJDIR)
13+
!include common.inc

‎wm_os216.mak‎

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,11 @@
33
# There are no configurable parts to this file
44
# Run with `wmake -f wm_os216.mak`
55

6-
objs = $(OBJDIR)lapi.obj $(OBJDIR)lctype.obj &
7-
$(OBJDIR)lfunc.obj $(OBJDIR)lmathlib.obj &
8-
$(OBJDIR)loslib.obj $(OBJDIR)ltable.obj &
9-
$(OBJDIR)lundump.obj $(OBJDIR)lauxlib.obj &
10-
$(OBJDIR)ldblib.obj $(OBJDIR)lgc.obj &
11-
$(OBJDIR)lmem.obj $(OBJDIR)lparser.obj &
12-
$(OBJDIR)ltablib.obj $(OBJDIR)lutf8lib.obj &
13-
$(OBJDIR)lbaselib.obj $(OBJDIR)ldebug.obj &
14-
$(OBJDIR)linit.obj $(OBJDIR)loadlib.obj &
15-
$(OBJDIR)lstate.obj $(OBJDIR)ltm.obj &
16-
$(OBJDIR)lvm.obj $(OBJDIR)lcode.obj &
17-
$(OBJDIR)ldo.obj $(OBJDIR)liolib.obj &
18-
$(OBJDIR)lobject.obj $(OBJDIR)lstring.obj &
19-
$(OBJDIR)lzio.obj $(OBJDIR)lcorolib.obj &
20-
$(OBJDIR)ldump.obj $(OBJDIR)llex.obj &
21-
$(OBJDIR)lopcodes.obj $(OBJDIR)lstrlib.obj
22-
23-
lua_obj = $(OBJDIR)lua.obj
24-
luac_obj = $(OBJDIR)luac.obj
25-
266
CC = *wcc
277

288
CFLAGS = -q -bt=os2 -bc -2 -ml -d0 -osr -zc
299
LFLAGS = SYS os2 OPT st=8192
3010

3111
PLATFORM = 21
3212

33-
!ifdef __UNIX__
34-
BINDIR = dist/bin/
35-
OBJDIR = obj/$(PLATFORM)/
36-
SRCDIR = lua/
37-
!else
38-
BINDIR = dist\bin\ #
39-
OBJDIR = obj\$(PLATFORM)\ #
40-
SRCDIR = lua\ #
41-
!endif
42-
43-
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
44-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
45-
46-
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
47-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
48-
49-
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
50-
$(CC) $(CFLAGS) -fo=$@ $<
51-
52-
clean: .SYMBOLIC
53-
!ifdef __UNIX__
54-
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
55-
@!if [ -e $(BINDIR)lua$(PLATFORM).exe ]; then rm $(BINDIR)lua$(PLATFORM).exe; fi
56-
@!if [ -e $(BINDIR)luac$(PLATFORM).exe ]; then rm $(BINDIR)luac$(PLATFORM).exe; fi
57-
!else
58-
!ifdef __NT__
59-
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
60-
!else
61-
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
62-
!endif
63-
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64-
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
65-
!endif
66-
67-
dist:
68-
mkdir dist
69-
70-
obj:
71-
mkdir obj
72-
73-
$(BINDIR): dist
74-
mkdir $(BINDIR)
75-
76-
$(OBJDIR): obj
77-
mkdir $(OBJDIR)
13+
!include common.inc

‎wm_os232.mak‎

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,11 @@
33
# There are no configurable parts to this file
44
# Run with `wmake -f wm_os232.mak`
55

6-
objs = $(OBJDIR)lapi.obj $(OBJDIR)lctype.obj &
7-
$(OBJDIR)lfunc.obj $(OBJDIR)lmathlib.obj &
8-
$(OBJDIR)loslib.obj $(OBJDIR)ltable.obj &
9-
$(OBJDIR)lundump.obj $(OBJDIR)lauxlib.obj &
10-
$(OBJDIR)ldblib.obj $(OBJDIR)lgc.obj &
11-
$(OBJDIR)lmem.obj $(OBJDIR)lparser.obj &
12-
$(OBJDIR)ltablib.obj $(OBJDIR)lutf8lib.obj &
13-
$(OBJDIR)lbaselib.obj $(OBJDIR)ldebug.obj &
14-
$(OBJDIR)linit.obj $(OBJDIR)loadlib.obj &
15-
$(OBJDIR)lstate.obj $(OBJDIR)ltm.obj &
16-
$(OBJDIR)lvm.obj $(OBJDIR)lcode.obj &
17-
$(OBJDIR)ldo.obj $(OBJDIR)liolib.obj &
18-
$(OBJDIR)lobject.obj $(OBJDIR)lstring.obj &
19-
$(OBJDIR)lzio.obj $(OBJDIR)lcorolib.obj &
20-
$(OBJDIR)ldump.obj $(OBJDIR)llex.obj &
21-
$(OBJDIR)lopcodes.obj $(OBJDIR)lstrlib.obj
22-
23-
lua_obj = $(OBJDIR)lua.obj
24-
luac_obj = $(OBJDIR)luac.obj
25-
266
CC = *wcc386
277

288
CFLAGS = -q -bt=os2 -bc -3 -d0 -osr -zc
299
LFLAGS = SYS os2v2 OPT st=8192
3010

3111
PLATFORM = 22
3212

33-
!ifdef __UNIX__
34-
BINDIR = dist/bin/
35-
OBJDIR = obj/$(PLATFORM)/
36-
SRCDIR = lua/
37-
!else
38-
BINDIR = dist\bin\ #
39-
OBJDIR = obj\$(PLATFORM)\ #
40-
SRCDIR = lua\ #
41-
!endif
42-
43-
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
44-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
45-
46-
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
47-
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
48-
49-
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
50-
$(CC) $(CFLAGS) -fo=$@ $<
51-
52-
clean: .SYMBOLIC
53-
!ifdef __UNIX__
54-
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
55-
@!if [ -e $(BINDIR)lua$(PLATFORM).exe ]; then rm $(BINDIR)lua$(PLATFORM).exe; fi
56-
@!if [ -e $(BINDIR)luac$(PLATFORM).exe ]; then rm $(BINDIR)luac$(PLATFORM).exe; fi
57-
!else
58-
!ifdef __NT__
59-
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
60-
!else
61-
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
62-
!endif
63-
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64-
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
65-
!endif
66-
67-
dist:
68-
mkdir dist
69-
70-
obj:
71-
mkdir obj
72-
73-
$(BINDIR): dist
74-
mkdir $(BINDIR)
75-
76-
$(OBJDIR): obj
77-
mkdir $(OBJDIR)
13+
!include common.inc

0 commit comments

Comments
 (0)