From a519d2ab828517fda323f6421fd98cf73603fc0e Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 14 Feb 2016 13:47:27 +0100
Subject: Added/improved support for mxe-based win32 cross builds

---
 iceprog/.gitignore |  1 +
 iceprog/Makefile   | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'iceprog')

diff --git a/iceprog/.gitignore b/iceprog/.gitignore
index 2d50774..6c84476 100644
--- a/iceprog/.gitignore
+++ b/iceprog/.gitignore
@@ -1,3 +1,4 @@
 iceprog
+iceprog.exe
 iceprog.o
 iceprog.d
diff --git a/iceprog/Makefile b/iceprog/Makefile
index 4ffb9a5..b9f00d9 100644
--- a/iceprog/Makefile
+++ b/iceprog/Makefile
@@ -1,14 +1,15 @@
 include ../config.mk
 LDLIBS = -L/usr/local/lib -lftdi -lm
 CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
-MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
 
-all: iceprog
+ifeq ($(MXE),1)
+LDLIBS += -lusb
+endif
 
-iceprog: iceprog.o
+all: iceprog$(EXE)
 
-iceprog.exe: iceprog.c
-	$(MXEGCC) -std=c99 -o iceprog.exe -Os iceprog.c -lftdi -lusb -lm
+iceprog$(EXE): iceprog.o
+	$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS)
 
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-- 
cgit v1.2.3