From 67c48b257b11b21f0d3c6d803418ff28dfb960e6 Mon Sep 17 00:00:00 2001 From: Steffen Pohle Date: Tue, 19 Sep 2023 21:12:19 +0200 Subject: [PATCH] crosscompiling works again --- Changelog | 3 +++ Makefile | 2 +- copydlls.sh | 9 +++++++-- copyshare.sh | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index b1d89a7..39d443d 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +2023-09-18: +- first experimental release + 2023-08-27: - prepare basic codebase diff --git a/Makefile b/Makefile index 5b83757..34c371a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .SILENT: help -VERSION = 1.0.1 +VERSION = 0.1.0 -include Makefile.rules diff --git a/copydlls.sh b/copydlls.sh index 7b7cbb4..429ad4a 100755 --- a/copydlls.sh +++ b/copydlls.sh @@ -2,10 +2,16 @@ CROSS_DEST_DIR=/opt/W64-cross-compile/lib CROSS_COMPILER_DIR=/usr/x86_64-w64-mingw32/lib -CROSS_GCC_DIR=/usr/lib/gcc/x86_64-w64-mingw32/10-win32 + +# +# in case of issues, check the path +# ls -la /usr/lib/gcc/x86_64-w64-mingw32/ +# +CROSS_GCC_DIR=/usr/lib/gcc/x86_64-w64-mingw32/12-win32 cp -v $CROSS_COMPILER_DIR/zlib1.dll ./ + # copy dll dependencys copy_dependency() { local I @@ -34,6 +40,5 @@ copy_dependency() { done } -copy_dependency testmodbus-server.exe copy_dependency testmodbus-client.exe diff --git a/copyshare.sh b/copyshare.sh index 2eb2180..991ebc9 100755 --- a/copyshare.sh +++ b/copyshare.sh @@ -4,7 +4,7 @@ CROSS_PREFIX=/opt/W64-cross-compile mkdir share cp -rf $CROSS_PREFIX/share/glib-2.0 share/glib-2.0 -cp -rf $CROSS_PREFIX/share/gtk-2.0 share/gtk-4.0 +cp -rf $CROSS_PREFIX/share/gtk-2.0 share/gtk-2.0 cp -rf $CROSS_PREFIX/share/gtk-3.0 share/gtk-3.0 cp -rf $CROSS_PREFIX/share/icons share/icons