Skip to content

Commit 67421c7

Browse files
authored
Update assimp.sh
1 parent cf40d7a commit 67421c7

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

apothecary/formulas/assimp.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ function build() {
152152
if [ $MULTITHREADED_TYPE == "MD" ]; then
153153
sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' ../CMakeLists.txt
154154
fi
155-
156-
DEFINES="${DEFINES} \
157-
-DBUILD_WITH_STATIC_CRT=ON \
158-
-DUSE_STATIC_CRT=ON \
159-
-DBUILD_SHARED_LIBS=OFF"
160155

161156
cmake .. ${DEFINES} \
162157
-A "${PLATFORM}" \
@@ -165,6 +160,8 @@ function build() {
165160
-DCMAKE_BUILD_TYPE=Debug \
166161
-DCMAKE_INSTALL_PREFIX=Debug \
167162
-DCMAKE_INSTALL_LIBDIR="lib" \
163+
-DBUILD_SHARED_LIBS=OFF \
164+
-DUSE_STATIC_CRT=ON \
168165
-DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
169166
-DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
170167
-DCMAKE_CXX_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
@@ -187,6 +184,8 @@ function build() {
187184
-DCMAKE_BUILD_TYPE=Release \
188185
-DCMAKE_INSTALL_PREFIX=Release \
189186
-DCMAKE_INSTALL_LIBDIR="lib" \
187+
-DBUILD_SHARED_LIBS=OFF \
188+
-DUSE_STATIC_CRT=ON \
190189
-DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE}" \
191190
-DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE} " \
192191
-DCMAKE_CXX_FLAGS_RELEASE="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE} ${EXCEPTION_FLAGS}" \

0 commit comments

Comments
 (0)