Add WUFFS_CONFIG__MODULE__BASE__ETC sub-modules

$ ls -l gen/lib/c/*/{lib*,*base*} | awk '{print $5 " " $9}'

Before:
167976 gen/lib/c/clang-5.0-dynamic/libwuffs.so
 40824 gen/lib/c/clang-5.0-dynamic/wuffs-base.lo
203306 gen/lib/c/clang-5.0-static/libwuffs.a
 41816 gen/lib/c/clang-5.0-static/wuffs-base.o
188080 gen/lib/c/gcc-dynamic/libwuffs.so
 53976 gen/lib/c/gcc-dynamic/wuffs-base.lo
230002 gen/lib/c/gcc-static/libwuffs.a
 53976 gen/lib/c/gcc-static/wuffs-base.o

After:
168024 gen/lib/c/clang-5.0-dynamic/libwuffs.so
 20664 gen/lib/c/clang-5.0-dynamic/wuffs-base-core.lo
 10784 gen/lib/c/clang-5.0-dynamic/wuffs-base-f64conv.lo
 11640 gen/lib/c/clang-5.0-dynamic/wuffs-base-pixconv.lo
205752 gen/lib/c/clang-5.0-static/libwuffs.a
 20960 gen/lib/c/clang-5.0-static/wuffs-base-core.o
 11024 gen/lib/c/clang-5.0-static/wuffs-base-f64conv.o
 12096 gen/lib/c/clang-5.0-static/wuffs-base-pixconv.o
188128 gen/lib/c/gcc-dynamic/libwuffs.so
 18936 gen/lib/c/gcc-dynamic/wuffs-base-core.lo
 10672 gen/lib/c/gcc-dynamic/wuffs-base-f64conv.lo
 27232 gen/lib/c/gcc-dynamic/wuffs-base-pixconv.lo
232984 gen/lib/c/gcc-static/libwuffs.a
 18920 gen/lib/c/gcc-static/wuffs-base-core.o
 10640 gen/lib/c/gcc-static/wuffs-base-f64conv.o
 27216 gen/lib/c/gcc-static/wuffs-base-pixconv.o
This commit is contained in:
Nigel Tao committed 2020-05-25 23:01:11 +10:00
1 parent 43db33a345
commit 092b03cd1e
6 files changed
+62 -20

No files matched your search

+25 -4
View File
@@ -22,6 +22,8 @@ import (
"path/filepath"
"strings"
"github.com/google/wuffs/internal/cgen"
cf "github.com/google/wuffs/cmd/commonflags"
)
@@ -35,9 +37,15 @@ func doGenlib(args []string) error {
}
args = flags.Args()
filenames := make([]string, len(args))
for i, arg := range args {
filenames[i] = "wuffs-" + strings.Replace(filepath.ToSlash(arg), "/", "-", -1)
filenames := []string(nil)
for _, arg := range args {
if arg != "base" {
filenames = append(filenames, "wuffs-"+strings.Replace(filepath.ToSlash(arg), "/", "-", -1))
} else {
for _, subModule := range cgen.BaseSubModules {
filenames = append(filenames, "wuffs-base-"+subModule)
}
}
}
if *dstdirFlag == "" {
@@ -83,11 +91,24 @@ var (
func genObj(outDir string, inDir string, cc string, dynamism string, filenames []string) error {
for _, filename := range filenames {
in := filepath.Join(inDir, filename+".c")
in := ""
out := genlibOutFilename(outDir, dynamism, filename)
args := []string(nil)
args = append(args, "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION")
const wuffsBasePrefix = "wuffs-base-"
if strings.HasPrefix(filename, wuffsBasePrefix) {
in = filepath.Join(inDir, "wuffs-base.c")
suffix := filename[len(wuffsBasePrefix):]
args = append(args,
"-DWUFFS_CONFIG__MODULES",
"-DWUFFS_CONFIG__MODULE__BASE__"+strings.ToUpper(suffix),
)
} else {
in = filepath.Join(inDir, filename+".c")
}
if dynamism == "dynamic" {
args = append(args, "-fPIC", "-DPIC")
}