BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

updated build system
Some checks are pending
BlockStorage/repertory/pipeline/head Build queued...
Details

Browse Source
This commit is contained in:
Scott E. Graves
2024-08-25 19:22:42 -05:00
parent 1e31bbaf60
commit ebfa54a78f
4 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docker/x86_64/mingw64
View File

@ -1009,6 +1009,7 @@ RUN if [ -f "/3rd_party/nana-v${MY_NANA_VERSION}.tar.gz" ]; then \
cd /3rd_party && sha256sum -c ./nana-v${MY_NANA_VERSION}.tar.gz.sha256 && cd - \ cd /3rd_party && sha256sum -c ./nana-v${MY_NANA_VERSION}.tar.gz.sha256 && cd - \
&& tar xvzf /3rd_party/nana-v${MY_NANA_VERSION}.tar.gz \ && tar xvzf /3rd_party/nana-v${MY_NANA_VERSION}.tar.gz \
&& cd nana-${MY_NANA_VERSION} \ && cd nana-${MY_NANA_VERSION} \
&& /3rd_party/nana_patch.sh /3rd_party . \
&& mkdir _build \ && mkdir _build \
&& cd _build \ && cd _build \
&& cmake .. \ && cmake .. \

19
support/3rd_party/nana_dragdrop_cpp.patch vendored Normal file
View File

@ -0,0 +1,19 @@
*** source/gui/dragdrop.cpp 2020-05-16 17:08:50.000000000 -0500
--- source/gui/dragdrop.cpp.new 2024-08-25 19:15:58.989072229 -0500
***************
*** 25,31 ****
# include <windows.h>
# include <oleidl.h>
# include <comdef.h>
! # include <Shlobj.h>
#elif defined(NANA_X11)
# include "../detail/posix/xdnd_protocol.hpp"
# include <nana/gui/detail/native_window_interface.hpp>
--- 25,31 ----
# include <windows.h>
# include <oleidl.h>
# include <comdef.h>
! # include <shlobj.h>
#elif defined(NANA_X11)
# include "../detail/posix/xdnd_protocol.hpp"
# include <nana/gui/detail/native_window_interface.hpp>

23
support/3rd_party/nana_filebox_cpp.patch vendored Normal file
View File

@ -0,0 +1,23 @@
*** source/gui/filebox.cpp 2020-05-16 17:08:50.000000000 -0500
--- source/gui/filebox.cpp.new 2024-08-25 19:15:31.242397483 -0500
***************
*** 20,28 ****
# include <windows.h>
# include "../detail/mswin/platform_spec.hpp"
# ifndef NANA_MINGW //<Shobjidl.h> isn't supported well on MinGW
! # include <Shobjidl.h>
# else
! # include <Shlobj.h>
# endif
#elif defined(NANA_POSIX)
# include <nana/gui/widgets/label.hpp>
--- 20,28 ----
# include <windows.h>
# include "../detail/mswin/platform_spec.hpp"
# ifndef NANA_MINGW //<Shobjidl.h> isn't supported well on MinGW
! # include <shobjidl.h>
# else
! # include <shlobj.h>
# endif
#elif defined(NANA_POSIX)
# include <nana/gui/widgets/label.hpp>

6
support/3rd_party/nana_patch.sh vendored Executable file
View File

@ -0,0 +1,6 @@
#!/bin/bash
pushd "$2"
patch -Np0 <"$1/nana_dragdrop_cpp.patch" || exit $?
patch -Np0 <"$1/nana_filebox_cpp.patch" || exit $?
popd