Mercurial > mxe-octave
diff src/zlib.mk @ 3070:d89eccc2edd3
[MSVC] enable zlib compilation
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Fri, 21 Jun 2013 09:42:47 -0400 |
| parents | 5ef49fb3299d |
| children | 98e1ed7ae70b |
line wrap: on
line diff
--- a/src/zlib.mk Thu Jun 20 17:21:08 2013 -0400 +++ b/src/zlib.mk Fri Jun 21 09:42:47 2013 -0400 @@ -18,10 +18,14 @@ ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && CC='$(MXE_CC)' ./configure \ --prefix='$(HOST_PREFIX)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MAKE) -C '$(1)' -j '$(JOBS)' + + if [ "$(BUILD_STATIC)" = yes ]; then \ + $(MAKE) -C '$(1)' -j '$(JOBS)' install; \ + fi if [ "$(BUILD_SHARED)" = yes ]; then \ $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libz.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \