diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-09-06 14:15:38 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-09-06 14:15:38 (GMT) |
| commit | 1084cc53466e1b77c53e309b14fe613ed55cb510 (patch) | |
| tree | 542f88a98708b59b966fee10f8e8f0803960f5d7 /src/libjpeg-turbo.mk | |
| parent | 23afbc5956e33216c183f14d9a25fe39b1850c23 (diff) | |
| download | mxe-1084cc53466e1b77c53e309b14fe613ed55cb510.zip mxe-1084cc53466e1b77c53e309b14fe613ed55cb510.tar.gz mxe-1084cc53466e1b77c53e309b14fe613ed55cb510.tar.bz2 | |
libjpeg-turbo: fix install directories and build test program, disable shared
Diffstat (limited to 'src/libjpeg-turbo.mk')
| -rw-r--r-- | src/libjpeg-turbo.mk | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index 5eb2285..e47af58 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -17,8 +17,26 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's,yasm,$(TARGET)-yasm,g' '$(1)/configure' cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MXE_CONFIGURE_OPTS) \ + --libdir='$(PREFIX)/$(TARGET)/lib/$(PKG)' \ + --includedir='$(PREFIX)/$(TARGET)/include/$(PKG)' \ + NASM=$(TARGET)-yasm + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) + + # create pkg-config file + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + (echo 'Name: jpeg-turbo'; \ + echo 'Version: $($(PKG)_VERSION)'; \ + echo 'Description: jpeg-turbo'; \ + echo 'Cflags: -I$(PREFIX)/$(TARGET)/include/$(PKG)'; \ + echo 'Libs: -L$(PREFIX)/$(TARGET)/lib/$(PKG) -ljpeg';) \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/jpeg-turbo.pc' + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(TOP_DIR)/src/jpeg-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' jpeg-turbo --cflags --libs` endef + +$(PKG)_BUILD_SHARED = |