cosmetics

Author: rbouqueau

Makefile

@@ -1,20 +1,25 @@
-include generic.mk
+BIN?=bin
 
 CXXFLAGS+=-std=c++14
 CXXFLAGS+=-Wall -Wextra -Werror
 
-CXXFLAGS+=-Isrc/utils -I$(BIN)
+# Reduce executable size
+CXXFLAGS+=-fvisibility=hidden -fvisibility-inlines-hidden
+CXXFLAGS+=-ffunction-sections -fdata-sections
+LDFLAGS+=-Wl,-gc-sections
 
 ifeq ($(DEBUG),1)
   CXXFLAGS+=-g3
   LDFLAGS+=-g
 else
-  CXXFLAGS+=-Os
+  CFLAGS+=-w -DNDEBUG
+  LDFLAGS+=-Xlinker -s
+  CXXFLAGS+=-O3
 endif
 
-# Reduce executable size
-CXXFLAGS+=-ffunction-sections -fdata-sections
-LDFLAGS+=-Wl,-gc-sections
+CXXFLAGS+=-Isrc/utils -I$(BIN)
+
+all: everything
 
 #------------------------------------------------------------------------------
 version:
@@ -39,24 +44,34 @@ SRCS_CW+=\
   src/utils/spec_utils.cpp\
 
 SRCS_CW+=src/specs/av1_hdr10plus/av1_hdr10plus.cpp
-SRCS_CW+=src/specs/avif/avif.cpp
-SRCS_CW+=src/specs/avif/profiles.cpp
-SRCS_CW+=src/specs/avif/utils.cpp
+SRCS_CW+=src/specs/avif/avif.cpp src/specs/avif/profiles.cpp src/specs/avif/utils.cpp
 SRCS_CW+=src/specs/isobmff/isobmff.cpp
 SRCS_CW+=src/specs/heif/heif.cpp
-SRCS_CW+=src/specs/miaf/miaf.cpp
-SRCS_CW+=src/specs/miaf/audio.cpp
-SRCS_CW+=src/specs/miaf/brands.cpp
-SRCS_CW+=src/specs/miaf/derivations.cpp
-SRCS_CW+=src/specs/miaf/colours.cpp
-SRCS_CW+=src/specs/miaf/num_pixels.cpp
-SRCS_CW+=src/specs/miaf/profiles.cpp
+SRCS_CW+=src/specs/miaf/miaf.cpp src/specs/miaf/audio.cpp src/specs/miaf/brands.cpp\
+  src/specs/miaf/derivations.cpp src/specs/miaf/colours.cpp src/specs/miaf/num_pixels.cpp\
+  src/specs/miaf/profiles.cpp
 
 SRCS_CW+=$(BIN)/cw_version.cpp
 
+#------------------------------------------------------------------------------
+
 TARGETS+=$(BIN)/cw.exe
-$(BIN)/cw.exe: $(SRCS_CW:%=$(BIN)/%.o)
 
-#------------------------------------------------------------------------------
 everything: version $(TARGETS)
 
+$(BIN)/cw.exe: $(SRCS_CW:%=$(BIN)/%.o)
+
+$(BIN)/%.exe:
+	@mkdir -p $(dir $@)
+	$(CXX) -o "$@" $^ $(LDFLAGS)
+
+$(BIN)/%.cpp.o: %.cpp
+	@mkdir -p $(dir $@)
+	$(CXX) $(CXXFLAGS) -c -o "$@" "$<"
+	@$(CXX) $(CXXFLAGS) -c -o "$@.deps" "$<" -MP -MM -MT "$@"
+	@$(CXX) $(CXXFLAGS) -c "$<" -E | wc -l > "$@.lines" # keep track of the code mass
+
+clean:
+	rm -rf $(BIN)
+
+-include $(shell test -d $(BIN) && find $(BIN) -name "*.deps")

README.md

@@ -110,7 +110,7 @@ $ make
 ### Emscripten (WASM)
 
 ```
-em++ -std=c++14 -DCW_WASM bin/cw_version.cpp `find src -name '*.cpp'` -Isrc/utils -o ComplianceWarden.js -O3 -s WASM=1 -s EXPORTED_FUNCTIONS="['_specFindC', '_specCheckC', '_specListRulesC', '_printVersion', '_free']" -s FORCE_FILESYSTEM=1 -s EXIT_RUNTIME=0 -s ALLOW_MEMORY_GROWTH=1 --pre-js wasm-fs-pre.js
+em++ -std=c++14 -DCW_WASM bin/cw_version.cpp `find src -name '*.cpp'` -Isrc/utils -o ComplianceWarden.js -O3 -s WASM=1 -s EXPORTED_FUNCTIONS="['_specFindC', '_specCheckC', '_specListRulesC', '_printVersion', '_free']" -s FORCE_FILESYSTEM=1 -s EXIT_RUNTIME=0 -s ALLOW_MEMORY_GROWTH=1 --pre-js scripts/wasm-fs-pre.js
 ```
 
 See https://gpac.github.io/ComplianceWarden-wasm/ for a demo.