diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-04-20 21:35:18 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-04-20 21:35:18 (GMT) |
| commit | 8278d00b086bc440e9058f775b6ee69b22daf84e (patch) | |
| tree | da0d1b0915e1c357b8151558fcb425dfa1956f7b | |
| parent | 2b397e0bedf4b68d7d1861a866276c7b10e5a689 (diff) | |
| parent | c2687e985d8aa7c40f50fc735409d9f812fe636d (diff) | |
| download | mxe-8278d00b086bc440e9058f775b6ee69b22daf84e.zip mxe-8278d00b086bc440e9058f775b6ee69b22daf84e.tar.gz mxe-8278d00b086bc440e9058f775b6ee69b22daf84e.tar.bz2 | |
Merge pull request #1312 from m-ou-se/assimpfix
Use correct cmake variable for static assimp library.
| -rw-r--r-- | src/assimp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/assimp.mk b/src/assimp.mk index be5a8bb..ba7ae5e 100644 --- a/src/assimp.mk +++ b/src/assimp.mk @@ -25,7 +25,7 @@ define $(PKG)_BUILD -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \ -DASSIMP_BUILD_SAMPLES=OFF \ -DASSIMP_BUILD_TESTS=OFF \ - -DASSIMP_BUILD_STATIC_LIB=$(if $(BUILD_STATIC),ON,OFF) + -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1 '$(TARGET)-gcc' \ |