Makefile

@@ -1,19 +1,12 @@
-.POSIX:
 SHELL = /bin/sh
-CXXFLAGS = -g -std=c++14 -Wall -Wextra -pedantic
+CXXFLAGS = -g -std=c++14 -Wall -Wextra -pedantic -static-libstdc++
-CPPFLAGS = `sed -ne 's/^project (\([^ )]*\).*/-DPROJECT_NAME="\1"/p' \
-	-e 's/^set (version \([^ )]*\).*/-DPROJECT_VERSION="\1"/p' CMakeLists.txt`
 
-sdn: sdn.cpp CMakeLists.txt
+all: sdn
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $< -o sdn \
+%: %.cpp CMakeLists.txt
-	-lacl `pkg-config --libs --cflags ncursesw`
+	$(CXX) $(CXXFLAGS) $< -o $@ `pkg-config --libs --cflags ncursesw` -lacl \
-static: sdn.cpp CMakeLists.txt
+	`sed -ne 's/^project (\([^ )]*\).*/-DPROJECT_NAME="\1"/p' \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $< -o sdn \
+	-e 's/^set (version \([^ )]*\).*/-DPROJECT_VERSION="\1"/p' CMakeLists.txt`
-	-static-libstdc++ \
-	-Wl,--start-group,-Bstatic \
-	-lacl `pkg-config --static --libs --cflags ncursesw` \
-	-Wl,--end-group,-Bdynamic
 clean:
 	rm -f sdn
 
-.PHONY: static clean
+.PHONY: all clean

sdn.cpp

@@ -353,6 +353,13 @@ fun print (const ncstring &nc, int limit) -> int {
 	return total_width;
 }
 
+fun compute_width (const wstring &w) -> int {
+	int total = 0;
+	for (const auto &c : w)
+		total += wcwidth (c);
+	return total;
+}
+
 fun compute_width (const ncstring &nc) -> int {
 	int total = 0;
 	for (const auto &c : nc)