Skip to content

Try fix CLang build on Windows #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
softworkz wants to merge 1 commit into from
Closed

Try fix CLang build on Windows #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ffbuild/common.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,41 +142,41 @@ endif
# 1) Preprocess CSS to a minified version
%.css.min: TAG = SED
%.css.min: %.css
$(M)sed 's!/\\*.*\\*/!!g' $< \
$(M)sed 's!/\\*.*\\*/!!g' $(subst \,/,$<) \
| tr '\n' ' ' \
| tr -s ' ' \
| sed 's/^ //; s/ $$//' \
> $@
> $(subst \,/,$@)

ifdef CONFIG_RESOURCE_COMPRESSION

# 2) Gzip the minified CSS
%.css.min.gz: TAG = GZIP
%.css.min.gz: %.css.min
$(M)gzip -nc9 $< > $@
$(M)gzip -nc9 $(subst \,/,$<) > $(subst \,/,$@)

# 3) Convert the gzipped CSS to a .c array
%.css.c: %.css.min.gz $(BIN2CEXE)
$(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@)))
$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%, $(subst \,/,$<)) $(subst \,/,$@) $(subst .,_,$(basename $(notdir $@)))

# 4) Gzip the HTML file (no minification needed)
%.html.gz: TAG = GZIP
%.html.gz: %.html
$(M)gzip -nc9 $< > $@
$(M)gzip -nc9 $(subst \,/,$<) > $(subst \,/,$@)

# 5) Convert the gzipped HTML to a .c array
%.html.c: %.html.gz $(BIN2CEXE)
$(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@)))
$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%, $(subst \,/,$<)) $(subst \,/,$@) $(subst .,_,$(basename $(notdir $@)))

else # NO COMPRESSION

# 2) Convert the minified CSS to a .c array
%.css.c: %.css.min $(BIN2CEXE)
$(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@)))
$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%, $(subst \,/,$<)) $(subst \,/,$@) $(subst .,_,$(basename $(notdir $@)))

# 3) Convert the plain HTML to a .c array
%.html.c: %.html $(BIN2CEXE)
$(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@)))
$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%, $(subst \,/,$<)) $(subst \,/,$@) $(subst .,_,$(basename $(notdir $@)))
endif

clean::
Expand Down
Loading