dev

2026-05-06 22:14:22 +03:00
parent f62def2aef
commit a80128f433
1 changed files with 12 additions and 12 deletions
@@ -46,18 +46,6 @@ RUN unzip -o /soft/MySQL_C_x${WIN_BITS}.zip -d ${SYSROOT}/ \
 RUN unzip -o /soft/postgresql_x${WIN_BITS}.zip -d ${SYSROOT}/ \
 && cp ${SYSROOT}/lib/*.dll ${INSTALL_DIR}/bin/

-
-# assimp
-WORKDIR /soft
-RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
- && tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
- && rm -f v${CUR_ASSIMP_VERSION}.tar.gz \
- && mkdir -p ${INSTALL_DIR}/build/assimp && cd ${INSTALL_DIR}/build/assimp \
- && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
- -DASSIMP_BUILD_ASSIMP_TOOLS=0 -DASSIMP_BUILD_TESTS=0 -DASSIMP_WARNINGS_AS_ERRORS=0 \
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/assimp-${CUR_ASSIMP_VERSION} \
- && make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/assimp-${CUR_ASSIMP_VERSION}
-
 # microhttpd
 RUN mkdir -p /soft/tmp && cd /soft/tmp \
 && wget https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip \
@@ -82,6 +70,18 @@ RUN unzip -o /soft/curl-8.11.0_2-win${WIN_BITS}-mingw.zip -d /soft/tmp \
 # compile and install
 #

+# assimp
+WORKDIR /soft
+RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
+ && tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
+ && rm -f v${CUR_ASSIMP_VERSION}.tar.gz \
+ && mkdir -p ${INSTALL_DIR}/build/assimp && cd ${INSTALL_DIR}/build/assimp \
+ && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
+ -DASSIMP_BUILD_ASSIMP_TOOLS=0 -DASSIMP_BUILD_TESTS=0 -DASSIMP_WARNINGS_AS_ERRORS=0 \
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/assimp-${CUR_ASSIMP_VERSION} \
+ && make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/assimp-${CUR_ASSIMP_VERSION}
+
+
 # GTest
 WORKDIR /soft
 RUN git clone -b v1.17.x https://github.com/google/googletest.git \