diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-05-06 07:55:20 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-05-06 07:55:20 (GMT) |
| commit | ecc6e3fb44badee908985a8063d08fd0087bcb08 (patch) | |
| tree | 98a20d0774926cceca63ad5ed7e35892223597ae | |
| parent | f0d5c1b72f14fb73a3e51894f5a7ef117998d065 (diff) | |
| parent | 039d02de7b2f08a4a3a12b1252ea32c87ef695ec (diff) | |
| download | mxe-ecc6e3fb44badee908985a8063d08fd0087bcb08.zip mxe-ecc6e3fb44badee908985a8063d08fd0087bcb08.tar.gz mxe-ecc6e3fb44badee908985a8063d08fd0087bcb08.tar.bz2 | |
Merge pull request #1272 from garuma/master
mman-win32: re-enable static build after changes in ca5bba6
| -rw-r--r-- | src/mman-win32.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mman-win32.mk b/src/mman-win32.mk index 5312f6a..e3b537d 100644 --- a/src/mman-win32.mk +++ b/src/mman-win32.mk @@ -15,7 +15,8 @@ $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, witwall/mman-win32, master) | $(SED) define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(TARGET)-cmake' '$(1)'\ - -DBUILD_TESTS=OFF + -DBUILD_TESTS=OFF \ + $(if $(BUILD_STATIC),-DBUILD_SHARED_LIBS=OFF) $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install |