# HG changeset patch # User John Tsiombikas # Date 1504148359 -10800 # Node ID aca7267dfee02de2c4e76ebc952ce5c973f6cb06 # Parent a6f127f3408dbbd0066d05f08b45edbfdd369b43 fixed cross-compilation with mingw-w64 diff -r a6f127f3408d -r aca7267dfee0 Makefile --- a/Makefile Wed Jul 27 05:05:45 2016 +0300 +++ b/Makefile Thu Aug 31 05:59:19 2017 +0300 @@ -11,12 +11,18 @@ alib = lib$(name).a +sodir = lib + CFLAGS = -pedantic -Wall -g -sys := $(shell uname -s) +sys := $(shell uname -s | sed 's/MINGW.*/mingw/') ifeq ($(sys), Darwin) solib = lib$(name).dylib shared = -dynamiclib +else ifeq ($(sys), mingw) + solib = lib$(name).dll + shared = -shared + sodir = bin else ldname = lib$(name).so soname = lib$(name).so.$(so_major) @@ -40,11 +46,11 @@ .PHONY: install install: - mkdir -p $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib + mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib cp src/optcfg.h $(DESTDIR)$(PREFIX)/include/optcfg.h cp $(alib) $(DESTDIR)$(PREFIX)/lib/$(alib) - cp $(solib) $(DESTDIR)$(PREFIX)/lib/$(solib) - [ -n "$(soname)" ] && cd $(DESTDIR)$(PREFIX)/lib && \ + cp $(solib) $(DESTDIR)$(PREFIX)/$(sodir)/$(solib) + [ -n "$(soname)" ] && cd $(DESTDIR)$(PREFIX)/$(sodir) && \ rm -f $(soname) $(ldname) && \ ln -s $(solib) $(soname) && \ ln -s $(soname) $(ldname) || true @@ -53,7 +59,7 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/include/optcfg.h rm -f $(DESTDIR)$(PREFIX)/lib/$(alib) - rm -f $(DESTDIR)$(PREFIX)/lib/$(solib) + rm -f $(DESTDIR)$(PREFIX)/$(sodir)/$(solib) [ -n "$(soname)" ] && \ - rm -f $(DESTDIR)$(PREFIX)/lib/$(soname) && \ - rm -f $(DESTDIR)$(PREFIX)/lib/$(ldname) || true + rm -f $(DESTDIR)$(PREFIX)/$(sodir)/$(soname) && \ + rm -f $(DESTDIR)$(PREFIX)/$(sodir)/$(ldname) || true diff -r a6f127f3408d -r aca7267dfee0 src/optcfg.c --- a/src/optcfg.c Wed Jul 27 05:05:45 2016 +0300 +++ b/src/optcfg.c Thu Aug 31 05:59:19 2017 +0300 @@ -2,7 +2,7 @@ #include #include #include -#ifdef _MSC_VER +#ifdef WIN32 #include #else #include