aboutsummaryrefslogtreecommitdiffstats
path: root/icemulti
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2016-02-14 13:47:27 +0100
committerClifford Wolf <clifford@clifford.at>2016-02-14 13:47:27 +0100
commita519d2ab828517fda323f6421fd98cf73603fc0e (patch)
tree920be8624bf8a5602c2491cff2e1a637bc40f3d8 /icemulti
parent04e61434577d2b167176832edd72121787f2a2db (diff)
downloadicestorm-a519d2ab828517fda323f6421fd98cf73603fc0e.tar.gz
icestorm-a519d2ab828517fda323f6421fd98cf73603fc0e.tar.bz2
icestorm-a519d2ab828517fda323f6421fd98cf73603fc0e.zip
Added/improved support for mxe-based win32 cross builds
Diffstat (limited to 'icemulti')
-rw-r--r--icemulti/.gitignore1
-rw-r--r--icemulti/Makefile6
-rw-r--r--icemulti/icemulti.cc1
3 files changed, 6 insertions, 2 deletions
diff --git a/icemulti/.gitignore b/icemulti/.gitignore
index 51ac8f9..9254c71 100644
--- a/icemulti/.gitignore
+++ b/icemulti/.gitignore
@@ -1,3 +1,4 @@
icemulti
+icemulti.exe
icemulti.o
icemulti.d
diff --git a/icemulti/Makefile b/icemulti/Makefile
index 387549d..c901413 100644
--- a/icemulti/Makefile
+++ b/icemulti/Makefile
@@ -2,9 +2,10 @@ include ../config.mk
LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
-all: icemulti
+all: icemulti$(EXE)
-icemulti: icemulti.o
+icemulti$(EXE): icemulti.o
+ $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS)
install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin
@@ -15,6 +16,7 @@ uninstall:
clean:
rm -f icemulti
+ rm -f icemulti.exe
rm -f *.o *.d
-include *.d
diff --git a/icemulti/icemulti.cc b/icemulti/icemulti.cc
index 9bf06df..7c20e0a 100644
--- a/icemulti/icemulti.cc
+++ b/icemulti/icemulti.cc
@@ -20,6 +20,7 @@
#include <memory>
#include <stdio.h>
+#include <stdlib.h>
#define log(...) fprintf(stderr, __VA_ARGS__);
#define info(...) do { if (log_level > 0) fprintf(stderr, __VA_ARGS__); } while (0)