From 19342a9b22209d023d5973f1184cf95ca0d9bea5 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.me.uk>
Date: Tue, 21 Aug 2012 20:01:40 +0100
Subject: Make mingw cross-compiling from debian work

---
 Makefile  |  7 ++++---
 config.mk | 11 ++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f6507b5..96a87d4 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,7 @@ $(BIN): util.a
 
 util.a: $(LIB)
 	@echo AR $@
-	@$(AR) -r -c $@ $(LIB)
-	@ranlib $@
+	@$(AR) -r -s -c $@ $(LIB)
 
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
@@ -86,7 +85,9 @@ getxbookgui.exe: getxbookgui.tcl
 # needs to be run from a mingw setup
 dist-win: $(BIN) $(GUI:.tcl=.exe)
 	mkdir -p $(NAME)-win
-	cp $(OBJ:.o=.exe) $(GUI:.tcl=.exe) $(NAME)-win
+	cp $(GUI:.tcl=.exe) $(NAME)-win
+	for f in $(OBJ) ; do \
+	cp $$f $(NAME)-win/$$f.exe
 	mkdir -p $(NAME)-win/icons
 	cp icons/* $(NAME)-win/icons/
 	for f in LEGAL README COPYING; do \
diff --git a/config.mk b/config.mk
index d214513..1e22f67 100644
--- a/config.mk
+++ b/config.mk
@@ -11,16 +11,17 @@ CFLAGS = -std=c99 -pedantic -Wall -Wextra -Werror -g -D_POSIX_C_SOURCE=200112L \
 
 W32TCLKIT = tclkit-8.5.9-win32.upx.exe
 
-# musl static
-#CC = musl-gcc
-#LDFLAGS = -static #-s
-
 # glibc dynamic
 CC = cc
 LDFLAGS = 
 
+# musl static
+#CC = musl-gcc
+#LDFLAGS = -static #-s
+
 # mingw
-#CC = gcc
+#CC = i586-mingw32msvc-gcc
+#AR = i586-mingw32msvc-ar
 #CFLAGS = -ansi -Wall -DVERSION=\"$(VERSION)\" -DWINVER=0x0501
 #LDFLAGS = -lws2_32
 
-- 
cgit v1.2.3