diff --git a/cmd/wuffs-c/genlib.go b/cmd/wuffs-c/genlib.go index d62e15e5..c9889c8f 100644 --- a/cmd/wuffs-c/genlib.go +++ b/cmd/wuffs-c/genlib.go @@ -78,11 +78,11 @@ 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 := filepath.Join(inDir, filename+".h") out := genlibOutFilename(outDir, dynamism, filename) args := []string(nil) - args = append(args, "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION") + args = append(args, "-x", "c", "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION") if dynamism == "dynamic" { args = append(args, "-fPIC", "-DPIC") } diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 4bd8f94b..9f608f0c 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -805,7 +805,7 @@ func (g *gen) writeUse(b *buffer, n *a.Use) error { } } - useeFilename := filepath.Join(g.wuffsRoot, "gen", "c", filepath.FromSlash(useDirname)+".c") + useeFilename := filepath.Join(g.wuffsRoot, "gen", "c", filepath.FromSlash(useDirname)+".h") usee, err := ioutil.ReadFile(useeFilename) if err != nil { return err diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index d14e1194..89024689 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -178,7 +178,7 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error { suffix := lang if suffix == "c" { - // TODO: suffix = "h" + suffix = "h" } if err := h.genFile(dirname, lang, suffix, out); err != nil { diff --git a/cmd/wuffs/release.go b/cmd/wuffs/release.go index fc8e91be..d3230d0d 100644 --- a/cmd/wuffs/release.go +++ b/cmd/wuffs/release.go @@ -57,7 +57,12 @@ func doGenrelease(wuffsRoot string, args []string) error { revision := findRevision(wuffsRoot) for _, lang := range langs { - filename, contents, err := doGenrelease1(wuffsRoot, revision, v, lang) + suffix := lang + if suffix == "c" { + suffix = "h" + } + + filename, contents, err := doGenrelease1(wuffsRoot, revision, v, lang, suffix) if err != nil { return err } @@ -68,8 +73,8 @@ func doGenrelease(wuffsRoot string, args []string) error { return nil } -func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string) (filename string, contents []byte, err error) { - qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+lang) +func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) { + qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+suffix) if err != nil { return "", nil, err }