updated build system

cmake/libraries.cmake

@@ -18,6 +18,7 @@ include(cmake/libraries/sqlite.cmake)
 include(cmake/libraries/stduuid.cmake)
 include(cmake/libraries/testing.cmake)
 include(cmake/libraries/winfsp.cmake)
+
 if(PROJECT_BUILD)
   find_package(Threads REQUIRED)
   find_package(ZLIB REQUIRED)

cmake/versions.cmake

@@ -26,6 +26,7 @@ set(LIBSODIUM_VERSION 1.0.20)
 set(MESA_VERSION 23.3.3)
 set(MINGW_VERSION 11.0.1)
 set(NANA_VERSION 1.7.4)
+set(LIBJPEG_TURBO_VERSION 3.0.3)
 set(NUSPELL_VERSION 5.1.4)
 set(OGG_VERSION 1.3.5)
 set(OPENAL_VERSION 1.23.1)

docker/x86_64/mingw64

@@ -248,6 +248,25 @@ RUN tar xvzf /3rd_party/mingw64/zlib-${MY_ZLIB_VERSION}.tar.gz \
     && cd ${MY_WORKDIR} \
     && rm -r zlib-${MY_ZLIB_VERSION}
 
+ARG LIBJPEG_TURBO_VERSION
+ENV MY_LIBJPEG_TURBO_VERSION=${LIBJPEG_TURBO_VERSION}
+RUN if [ -f "/3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz" ]; then \
+      tar xvzf /3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz \
+      && cd libjpeg-turbo-${MY_LIBJPEG_TURBO_VERSION} \
+      && mkdir _build \
+      && cd _build \
+      && cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
+        -DBUILD_SHARED_LIBS=ON \
+        -DBUILD_STATIC_LIBS=ON \
+        -DENABLE_SHARED=ON \
+        -DENABLE_STATIC=ON \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \
+      && make -j${MY_NUM_JOBS} \
+      && make install \
+      && cd ${MY_WORKDIR} \
+      && rm -r libjpeg-turbo-${MY_LIBJPEG_TURBO_VERSION} \
+    ; fi
 ARG FREETYPE2_VERSION
 ENV MY_FREETYPE2_VERSION=${FREETYPE2_VERSION}
 RUN if [ -f "/3rd_party/freetype-${MY_FREETYPE2_VERSION}.tar.gz" ]; then \

scripts/env.sh

@@ -110,6 +110,10 @@ if [ "${PROJECT_ENABLE_BOOST}" == "ON" ]; then
   PROJECT_ENABLE_OPENSSL=ON
 fi
 
+if [ "${PROJECT_ENABLE_NANA}" == "ON" ]; then
+  PROJECT_ENABLE_LIBJPEG_TURBO=ON
+fi
+
 PROJECT_IS_ARM64=0
 if [ "${PROJECT_BUILD_ARCH}" == "" ]; then
   PROJECT_BUILD_ARCH=x86_64