Mercurial > mxe-octave

changeset 3098:4c72697bcbc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable jpeg compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 25 Jun 2013 21:20:43 -0400
parents ee6f302d0659
children 034f830a5823
files src/fltk.mk src/jpeg.mk
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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/' | \
--- 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