From c7b6239c4798478fda8459697d496ea1b33b5e3e Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 3 Sep 2016 22:21:24 +0200 Subject: [PATCH] Plats are going to be divided into pcc ones and em ones, so rename accordingly. --HG-- branch : default-branch --- build.lua | 4 ++-- examples/build.lua | 2 +- lang/basic/lib/build.lua | 2 +- lang/cem/libcc.ansi/build.lua | 2 +- lang/m2/libm2/build.lua | 2 +- lang/pc/libpc/build.lua | 2 +- mach/i386/libem/build.lua | 2 +- mach/i386/libend/build.lua | 2 +- mach/i80/libem/build.lua | 2 +- mach/i80/libend/build.lua | 2 +- mach/i86/libem/build.lua | 2 +- mach/i86/libend/build.lua | 2 +- mach/i86/libsys/build.lua | 2 +- mach/m68020/libem/build.lua | 2 +- mach/m68020/libend/build.lua | 2 +- mach/vc4/libem/build.lua | 2 +- mach/vc4/libend/build.lua | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.lua b/build.lua index 82d8e2cdd..b0edce05e 100644 --- a/build.lua +++ b/build.lua @@ -4,7 +4,7 @@ vars.cflags = { vars.ackcflags = { "-O6" } -vars.plats = { +vars.emplats = { "cpm", "linux386", "linux68k", @@ -13,7 +13,7 @@ vars.plats = { } local plat_packages = {} -for _, p in ipairs(vars.plats) do +for _, p in ipairs(vars.emplats) do plat_packages[#plat_packages+1] = "plat/"..p.."+pkg" end diff --git a/examples/build.lua b/examples/build.lua index 631752976..c28a30e88 100644 --- a/examples/build.lua +++ b/examples/build.lua @@ -20,7 +20,7 @@ for _, file in ipairs(sourcefiles) do local be = replace(b, "%.", "_") local _, _, e = b:find("%.(%w*)$") - for _, plat in ipairs(vars.plats) do + for _, plat in ipairs(vars.emplats) do if (e == "c") or not conly[plat] then local exe = ackprogram { name = be.."_"..plat, diff --git a/lang/basic/lib/build.lua b/lang/basic/lib/build.lua index 71710a542..753e74975 100644 --- a/lang/basic/lib/build.lua +++ b/lang/basic/lib/build.lua @@ -1,6 +1,6 @@ include("plat/build.lua") -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { diff --git a/lang/cem/libcc.ansi/build.lua b/lang/cem/libcc.ansi/build.lua index 3ca95b629..e2b13860a 100644 --- a/lang/cem/libcc.ansi/build.lua +++ b/lang/cem/libcc.ansi/build.lua @@ -27,7 +27,7 @@ normalrule { } } -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { diff --git a/lang/m2/libm2/build.lua b/lang/m2/libm2/build.lua index d0861b966..53f27ccf7 100644 --- a/lang/m2/libm2/build.lua +++ b/lang/m2/libm2/build.lua @@ -16,7 +16,7 @@ installable { map = installmap } -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { diff --git a/lang/pc/libpc/build.lua b/lang/pc/libpc/build.lua index 61c4f7a3e..d7c117ad4 100644 --- a/lang/pc/libpc/build.lua +++ b/lang/pc/libpc/build.lua @@ -1,6 +1,6 @@ include("plat/build.lua") -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { diff --git a/mach/i386/libem/build.lua b/mach/i386/libem/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/i386/libem/build.lua +++ b/mach/i386/libem/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/i386/libend/build.lua b/mach/i386/libend/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/i386/libend/build.lua +++ b/mach/i386/libend/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/i80/libem/build.lua b/mach/i80/libem/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/i80/libem/build.lua +++ b/mach/i80/libem/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/i80/libend/build.lua b/mach/i80/libend/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/i80/libend/build.lua +++ b/mach/i80/libend/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/i86/libem/build.lua b/mach/i86/libem/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/i86/libem/build.lua +++ b/mach/i86/libem/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/i86/libend/build.lua b/mach/i86/libend/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/i86/libend/build.lua +++ b/mach/i86/libend/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/i86/libsys/build.lua b/mach/i86/libsys/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/i86/libsys/build.lua +++ b/mach/i86/libsys/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/m68020/libem/build.lua b/mach/m68020/libem/build.lua index d17adcd92..86212fc86 100644 --- a/mach/m68020/libem/build.lua +++ b/mach/m68020/libem/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { diff --git a/mach/m68020/libend/build.lua b/mach/m68020/libend/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/m68020/libend/build.lua +++ b/mach/m68020/libend/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/vc4/libem/build.lua b/mach/vc4/libem/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/vc4/libem/build.lua +++ b/mach/vc4/libem/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, diff --git a/mach/vc4/libend/build.lua b/mach/vc4/libend/build.lua index ca5a13c65..12562db8f 100644 --- a/mach/vc4/libend/build.lua +++ b/mach/vc4/libend/build.lua @@ -1,4 +1,4 @@ -for _, plat in ipairs(vars.plats) do +for _, plat in ipairs(vars.emplats) do acklibrary { name = "lib_"..plat, srcs = { "./*.s" }, -- 2.34.1