Build fixes.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3987 ed5197a5-7fde-0310-b194-c3ffbd925b24

Makefile

@@ -43,13 +43,14 @@ APP_OBJS := $(call get_objs,APP_SOURCES)
 $(APP_OBJS): CFLAGS += \
 	-Ideps/base64c/include \
 	-Ideps/crypt_blowfish \
-	-Ideps/quickjs \
-	-Ideps/sqlite \
-	-Ideps/libuv/include \
-	-Ideps/xopt \
+	-Ideps/libbacktrace \
 	-Ideps/libsodium \
 	-Ideps/libsodium/src/libsodium/include \
+	-Ideps/libuv/include \
+	-Ideps/quickjs \
+	-Ideps/sqlite \
 	-Ideps/valgrind \
+	-Ideps/xopt \
 	-Werror
 
 BASE64C_SOURCES := deps/base64c/src/base64c.c
@@ -242,36 +243,21 @@ LIBBACKTRACE_SOURCES := \
 	deps/libbacktrace/atomic.c \
 	deps/libbacktrace/backtrace.c \
 	deps/libbacktrace/dwarf.c \
-	deps/libbacktrace/elf.c \
 	deps/libbacktrace/fileline.c \
-	deps/libbacktrace/mmap.c \
-	deps/libbacktrace/mmapio.c \
-	deps/libbacktrace/posix.c \
 	deps/libbacktrace/print.c \
 	deps/libbacktrace/simple.c \
 	deps/libbacktrace/sort.c \
 	deps/libbacktrace/state.c
-
-	#deps/libbacktrace/unknown.c
-	#deps/libbacktrace/read.c \
-	#deps/libbacktrace/nounwind.c \
-	#deps/libbacktrace/instrumented_alloc.c \
-	#deps/libbacktrace/pecoff.c \
-	#deps/libbacktrace/xcoff.c
-	#deps/libbacktrace/macho.c \
-	#deps/libbacktrace/alloc.c \
-	#deps/libbacktrace/allocfail.c
-	#deps/libbacktrace/btest.c
-	#deps/libbacktrace/edtest.c
-	#deps/libbacktrace/edtest2.c
-	#deps/libbacktrace/mtest.c
-	#deps/libbacktrace/stest.c
-	#deps/libbacktrace/test_format.c
-	#deps/libbacktrace/testlib.c
-	#deps/libbacktrace/ttest.c
-	#deps/libbacktrace/unittest.c
-	#deps/libbacktrace/xztest.c
-	#deps/libbacktrace/ztest.c
+LIBBACKTRACE_SOURCES_unix := \
+	deps/libbacktrace/elf.c \
+	deps/libbacktrace/mmap.c \
+	deps/libbacktrace/mmapio.c \
+	deps/libbacktrace/posix.c
+LIBBACKTRACE_SOURCES_win := \
+	deps/libbacktrace/alloc.c \
+	deps/libbacktrace/pecoff.c \
+	deps/libbacktrace/posix.c \
+	deps/libbacktrace/read.c
 LIBBACKTRACE_OBJS := $(call get_objs,LIBBACKTRACE_SOURCES)
 $(LIBBACKTRACE_OBJS): CFLAGS += \
 	-Ideps/libbacktrace_config \