Skip to content

Commit 33729f8

Browse files
LethjaLethja
committed
Created 'PLATFORM' variable inside wmake files
1 parent 97344b5 commit 33729f8

File tree

5 files changed

+50
-40
lines changed

5 files changed

+50
-40
lines changed

‎wm_dos16.mak‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,22 @@ CC = *wcc
2828
CFLAGS = -q -bt=dos -ml -0 -d0 -osr -zc
2929
LFLAGS = SYS dos OPT st=8192
3030

31+
PLATFORM = 16
32+
3133
!ifdef __UNIX__
3234
BINDIR = dist/bin/
33-
OBJDIR = obj/16/
35+
OBJDIR = obj/$(PLATFORM)/
3436
SRCDIR = lua/
3537
!else
3638
BINDIR = dist\bin\ #
37-
OBJDIR = obj\16\ #
39+
OBJDIR = obj\$(PLATFORM)\ #
3840
SRCDIR = lua\ #
3941
!endif
4042

41-
$(BINDIR)lua16.exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
43+
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
4244
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
4345

44-
$(BINDIR)luac16.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
46+
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
4547
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
4648

4749
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
@@ -50,16 +52,16 @@ $(BINDIR)luac16.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
5052
clean: .SYMBOLIC
5153
!ifdef __UNIX__
5254
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
53-
@!if [ -e $(BINDIR)lua16.exe ]; then rm $(BINDIR)lua16.exe; fi
54-
@!if [ -e $(BINDIR)luac16.exe ]; then rm $(BINDIR)luac16.exe; 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
5557
!else
5658
!ifdef __NT__
5759
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
5860
!else
5961
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
6062
!endif
61-
@!if exist $(BINDIR)lua16.exe del $(BINDIR)lua16.exe
62-
@!if exist $(BINDIR)luac16.exe del $(BINDIR)luac16.exe
63+
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64+
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
6365
!endif
6466

6567
dist:

‎wm_dos4g.mak‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,22 @@ CC = *wcc386
2828
CFLAGS = -q -bt=dos4g -mf -3 -d0 -osr -zc
2929
LFLAGS = SYS dos4g OPT st=8192
3030

31+
PLATFORM = 4g
32+
3133
!ifdef __UNIX__
3234
BINDIR = dist/bin/
33-
OBJDIR = obj/4g/
35+
OBJDIR = obj/$(PLATFORM)/
3436
SRCDIR = lua/
3537
!else
3638
BINDIR = dist\bin\ #
37-
OBJDIR = obj\4g\ #
39+
OBJDIR = obj\$(PLATFORM)\ #
3840
SRCDIR = lua\ #
3941
!endif
4042

41-
$(BINDIR)lua4g.exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
43+
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
4244
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
4345

44-
$(BINDIR)luac4g.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
46+
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
4547
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
4648

4749
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
@@ -50,16 +52,16 @@ $(BINDIR)luac4g.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
5052
clean: .SYMBOLIC
5153
!ifdef __UNIX__
5254
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
53-
@!if [ -e $(BINDIR)lua4g.exe ]; then rm $(BINDIR)lua4g.exe; fi
54-
@!if [ -e $(BINDIR)luac4g.exe ]; then rm $(BINDIR)luac4g.exe; 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
5557
!else
5658
!ifdef __NT__
5759
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
5860
!else
5961
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
6062
!endif
61-
@!if exist $(BINDIR)lua4g.exe del $(BINDIR)lua4g.exe
62-
@!if exist $(BINDIR)luac4g.exe del $(BINDIR)luac4g.exe
63+
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64+
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
6365
!endif
6466

6567
dist:

‎wm_os216.mak‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,22 @@ CC = *wcc
2828
CFLAGS = -q -bt=os2 -bc -2 -ml -d0 -osr -zc
2929
LFLAGS = SYS os2 OPT st=8192
3030

31+
PLATFORM = 21
32+
3133
!ifdef __UNIX__
3234
BINDIR = dist/bin/
33-
OBJDIR = obj/21/
35+
OBJDIR = obj/$(PLATFORM)/
3436
SRCDIR = lua/
3537
!else
3638
BINDIR = dist\bin\ #
37-
OBJDIR = obj\21\ #
39+
OBJDIR = obj\$(PLATFORM)\ #
3840
SRCDIR = lua\ #
3941
!endif
4042

41-
$(BINDIR)lua21.exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
43+
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
4244
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
4345

44-
$(BINDIR)luac21.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
46+
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
4547
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
4648

4749
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
@@ -50,16 +52,16 @@ $(BINDIR)luac21.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
5052
clean: .SYMBOLIC
5153
!ifdef __UNIX__
5254
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
53-
@!if [ -e $(BINDIR)luant.exe ]; then rm $(BINDIR)luant.exe; fi
54-
@!if [ -e $(BINDIR)luacnt.exe ]; then rm $(BINDIR)luacnt.exe; 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
5557
!else
5658
!ifdef __NT__
5759
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
5860
!else
5961
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
6062
!endif
61-
@!if exist $(BINDIR)luant.exe del $(BINDIR)luant.exe
62-
@!if exist $(BINDIR)luacnt.exe del $(BINDIR)luacnt.exe
63+
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64+
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
6365
!endif
6466

6567
dist:

‎wm_os232.mak‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,22 @@ CC = *wcc386
2828
CFLAGS = -q -bt=os2 -bc -3 -d0 -osr -zc
2929
LFLAGS = SYS os2v2 OPT st=8192
3030

31+
PLATFORM = 22
32+
3133
!ifdef __UNIX__
3234
BINDIR = dist/bin/
33-
OBJDIR = obj/22/
35+
OBJDIR = obj/$(PLATFORM)/
3436
SRCDIR = lua/
3537
!else
3638
BINDIR = dist\bin\ #
37-
OBJDIR = obj\22\ #
39+
OBJDIR = obj\$(PLATFORM)\ #
3840
SRCDIR = lua\ #
3941
!endif
4042

41-
$(BINDIR)lua22.exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
43+
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
4244
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
4345

44-
$(BINDIR)luac22.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
46+
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
4547
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
4648

4749
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
@@ -50,16 +52,16 @@ $(BINDIR)luac22.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
5052
clean: .SYMBOLIC
5153
!ifdef __UNIX__
5254
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
53-
@!if [ -e $(BINDIR)luant.exe ]; then rm $(BINDIR)luant.exe; fi
54-
@!if [ -e $(BINDIR)luacnt.exe ]; then rm $(BINDIR)luacnt.exe; 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
5557
!else
5658
!ifdef __NT__
5759
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
5860
!else
5961
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
6062
!endif
61-
@!if exist $(BINDIR)luant.exe del $(BINDIR)luant.exe
62-
@!if exist $(BINDIR)luacnt.exe del $(BINDIR)luacnt.exe
63+
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64+
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
6365
!endif
6466

6567
dist:

‎wm_winnt.mak‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,22 @@ CC = *wcc386
2828
CFLAGS = -q -bt=nt -bc -3 -d0 -osr -zc
2929
LFLAGS = SYS nt OPT st=8192
3030

31+
PLATFORM = nt
32+
3133
!ifdef __UNIX__
3234
BINDIR = dist/bin/
33-
OBJDIR = obj/winnt/
35+
OBJDIR = obj/$(PLATFORM)/
3436
SRCDIR = lua/
3537
!else
3638
BINDIR = dist\bin\ #
37-
OBJDIR = obj\winnt\ #
39+
OBJDIR = obj\$(PLATFORM)\ #
3840
SRCDIR = lua\ #
3941
!endif
4042

41-
$(BINDIR)luant.exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
43+
$(BINDIR)lua$(PLATFORM).exe: $(OBJDIR) $(BINDIR) $(objs) $(lua_obj)
4244
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(lua_obj)}
4345

44-
$(BINDIR)luacnt.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
46+
$(BINDIR)luac$(PLATFORM).exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
4547
*wlink NAME $@ $(LFLAGS) FILE {$(objs) $(luac_obj)}
4648

4749
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
@@ -50,16 +52,16 @@ $(BINDIR)luacnt.exe: $(BINDIR) $(OBJDIR) $(objs) $(luac_obj)
5052
clean: .SYMBOLIC
5153
!ifdef __UNIX__
5254
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
53-
@!if [ -e $(BINDIR)luant.exe ]; then rm $(BINDIR)luant.exe; fi
54-
@!if [ -e $(BINDIR)luacnt.exe ]; then rm $(BINDIR)luacnt.exe; 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
5557
!else
5658
!ifdef __NT__
5759
@!if exist $(OBJDIR) rd /S /Q $(OBJDIR)
5860
!else
5961
@!if exist $(OBJDIR) deltree /Y $(OBJDIR)
6062
!endif
61-
@!if exist $(BINDIR)luant.exe del $(BINDIR)luant.exe
62-
@!if exist $(BINDIR)luacnt.exe del $(BINDIR)luacnt.exe
63+
@!if exist $(BINDIR)lua$(PLATFORM).exe del $(BINDIR)lua$(PLATFORM).exe
64+
@!if exist $(BINDIR)luac$(PLATFORM).exe del $(BINDIR)luac$(PLATFORM).exe
6365
!endif
6466

6567
dist:

0 commit comments

Comments
 (0)