diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-01-20 05:36:31 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-01-20 05:36:31 (GMT) |
| commit | 8760249ba7afa89966edad2716cba4340b9e6e14 (patch) | |
| tree | baef691756285f7e03f63dad2b016289db53af7c /src/devil.mk | |
| parent | d68db8e06d1ed658c18ea9ccbda715fd0d38bc49 (diff) | |
| download | mxe-8760249ba7afa89966edad2716cba4340b9e6e14.zip mxe-8760249ba7afa89966edad2716cba4340b9e6e14.tar.gz mxe-8760249ba7afa89966edad2716cba4340b9e6e14.tar.bz2 | |
devil: enable shared and x86_64 builds
see also:
* #295
* https://github.com/DentonW/DevIL/issues/29
closes #1188
Diffstat (limited to 'src/devil.mk')
| -rw-r--r-- | src/devil.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/devil.mk b/src/devil.mk index 8360846..645f618 100644 --- a/src/devil.mk +++ b/src/devil.mk @@ -18,12 +18,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h' + # autotools files in tarball are ancient (2009) so regenerate + $(if $(BUILD_STATIC), \ + $(SED) -i 's/__declspec(dllimport)//' '$(1)/include/IL/il.h', \ + cd '$(1)' && $(LIBTOOLIZE) && autoreconf -fi) cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --enable-ILU \ --enable-ILUT \ --disable-allegro \ @@ -40,7 +40,3 @@ define $(PKG)_BUILD --without-examples $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= INFO_DEPS= endef - -$(PKG)_BUILD_x86_64-w64-mingw32 = - -$(PKG)_BUILD_SHARED = |