# HG changeset patch # User Michael Goffioul # Date 1372209643 14400 # Node ID 4c72697bcbc48bf3573a3d0fd747098c5ef297eb # Parent ee6f302d0659e02f07482d9c8c12878ae9b9c0d0 [MSVC] enable jpeg compilation diff -r ee6f302d0659 -r 4c72697bcbc4 src/fltk.mk --- a/src/fltk.mk Tue Jun 25 20:51:02 2013 -0400 +++ b/src/fltk.mk Tue Jun 25 21:20:43 2013 -0400 @@ -10,8 +10,12 @@ ifeq ($(MXE_SYSTEM),mingw) $(PKG)_DEPS := zlib jpeg libpng pthreads uuid else +ifeq ($(MXE_SYSTEM),msvc) + $(PKG)_DEPS := zlib jpeg libpng freetype +else $(PKG)_DEPS := zlib jpeg libpng pthreads freetype endif +endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.fltk.org/' | \ diff -r ee6f302d0659 -r 4c72697bcbc4 src/jpeg.mk --- a/src/jpeg.mk Tue Jun 25 20:51:02 2013 -0400 +++ b/src/jpeg.mk Tue Jun 25 21:20:43 2013 -0400 @@ -20,6 +20,6 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --prefix='$(HOST_PREFIX)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) + $(ENABLE_SHARED_OR_STATIC) && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef