diff options
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rwxr-xr-x | build_wxwidgets.sh | 2 | ||||
| -rw-r--r-- | src/trailer.h | 5 |
3 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,7 @@ #!/bin/bash +test -f ./Makefile && make distclean + libtoolize --force aclocal autoheader diff --git a/build_wxwidgets.sh b/build_wxwidgets.sh index 6622ecf..797a258 100755 --- a/build_wxwidgets.sh +++ b/build_wxwidgets.sh @@ -19,6 +19,8 @@ git checkout . cd .. mkdir -p "${WDIR}-${HOSTT:-host}" cd "${WDIR}-${HOSTT:-host}" + +# Verify: Do we need '-Wl,-gc-sections' since we are creating static lib archives? CXXFLAGS="-ffunction-sections -fdata-sections -Os -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-undef" ../${WDIR}/configure --without-expat --disable-compat28 --disable-compat30 \ --disable-richtooltip --disable-richmsgdlg --disable-richtext \ diff --git a/src/trailer.h b/src/trailer.h index 4d20022..03230d7 100644 --- a/src/trailer.h +++ b/src/trailer.h @@ -8,12 +8,15 @@ /* max length of version string, e.g. "0.33.1pre1" */ #define MAX_VERSION 16 +/* "Pack" our struct which is necessary for mingw cross compile. + * Windows uses a different byte alignment then Linux! + */ struct update_trailer { uint8_t version[MAX_VERSION]; uint32_t model_tag; uint32_t loopaes_length; /* keep the trailer version info last */ uint32_t trailer_version; -}; +} __attribute__((packed, gcc_struct)); #endif |