diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake index 886ed3c2..54b0ec4b 100644 --- a/cmake/libraries.cmake +++ b/cmake/libraries.cmake @@ -18,7 +18,6 @@ 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) diff --git a/cmake/versions.cmake b/cmake/versions.cmake index fede2ccf..0a8f0b2a 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -25,6 +25,7 @@ set(LIBEVENT_VERSION 2.1.12) 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(NUSPELL_VERSION 5.1.4) set(OGG_VERSION 1.3.5) set(OPENAL_VERSION 1.23.1) diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 293ad05d..4ca280c6 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -836,6 +836,67 @@ RUN if [ -f "/3rd_party/wxWidgets-${MY_WXWIDGETS_VERSION}.tar.bz2" ]; then \ && rm -r wxWidgets-${MY_WXWIDGETS_VERSION} \ ; fi +ARG CXXOPTS_VERSION +ENV MY_CXXOPTS_VERSION=${CXXOPTS_VERSION} +RUN if [ -f "/3rd_party/cxxopts-${MY_CXXOPTS_VERSION}.tar.gz" ]; then \ + tar xvzf /3rd_party/cxxopts-${MY_CXXOPTS_VERSION}.tar.gz \ + && cd cxxopts-${MY_CXXOPTS_VERSION} \ + && mkdir _build \ + && cd _build \ + && cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \ + -DCXXOPTS_BUILD_EXAMPLES=OFF \ + -DCXXOPTS_BUILD_TESTS=OFF \ + -DCXXOPTS_ENABLE_INSTALL=ON \ + -DCXXOPTS_ENABLE_WARNINGS=OFF \ + -DCXXOPTS_USE_UNICODE_HELP=ON \ + && make -j${MY_NUM_JOBS} \ + && make install \ + && cd ${MY_WORKDIR} \ + && rm -r cxxopts-${MY_CXXOPTS_VERSION} \ + ; fi + +ARG NANA_VERSION +ENV MY_NANA_VERSION=${NANA_VERSION} +RUN if [ -f "/3rd_party/nana-v${MY_NANA_VERSION}.tar.gz" ]; then \ + tar xvzf /3rd_party/nana-v${MY_NANA_VERSION}.tar.gz \ + && cd nana-${MY_NANA_VERSION} \ + && mkdir _build \ + && cd _build \ + && cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \ + -DNANA_CMAKE_ENABLE_AUDIO=OFF \ + -DNANA_CMAKE_ENABLE_JPEG=ON \ + -DNANA_CMAKE_ENABLE_PNG=ON \ + -DNANA_CMAKE_INSTALL=ON \ + && make -j${MY_NUM_JOBS} \ + && make install \ + && cd ${MY_WORKDIR} \ + && rm -r nana-${MY_NANA_VERSION} \ + ; fi + +ARG SDL_VERSION +ENV MY_SDL_VERSION=${SDL_VERSION} +RUN if [ -f "/3rd_party/sdl-${MY_SDL_VERSION}.tar.gz" ]; then \ + tar xvzf /3rd_party/sdl-${MY_SDL_VERSION}.tar.gz \ + && cd SDL-release-${MY_SDL_VERSION} \ + && ./configure \ + --host=${MY_MINGW_PREFIX} \ + --enable-shared=yes \ + --enable-static=yes \ + --prefix=${MY_MINGW_DIR} \ + && make -j${MY_NUM_JOBS} \ + && make install \ + && cd ${MY_WORKDIR} \ + && rm -r SDL-release-${MY_SDL_VERSION} \ + ; fi + RUN (mv ${MY_MINGW_DIR}/lib/*.dll ${MY_MINGW_DIR}/bin || echo "no dll's found") \ && chmod 0777 -R ${MY_MINGW_DIR} \ && rm -rf /3rd_party