Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Thu, 20 Apr 2023 20:51:16 UTC Commit: e465a2b456e7c0aba6aefc1c4b406b8089386d1a https://github.com/geany/geany/commit/e465a2b456e7c0aba6aefc1c4b406b8089386d...
Log Message: ----------- Remove unnecessary compiler and linker flags for Mingw builds
Modified Paths: -------------- configure.ac scripts/ci_mingw64_geany.sh src/Makefile.am
Modified: configure.ac 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -119,7 +119,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$PACKAGE"], [Gettext package.]) AM_COND_IF([MINGW], [pkgdatadir='${prefix}/data'], [pkgdatadir='${datarootdir}/geany']) -AM_COND_IF([MINGW],[LIBS="$LIBS -liconv"]) AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))]) AC_SUBST([pkgdatadir])
Modified: scripts/ci_mingw64_geany.sh 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -70,17 +70,9 @@ CFLAGS="\ ARCH="x86_64" MINGW_ARCH="mingw64" HOST="x86_64-w64-mingw32" -export CC="/usr/bin/${HOST}-gcc" -export CPP="/usr/bin/${HOST}-cpp" -export CXX="/usr/bin/${HOST}-g++" -export AR="/usr/bin/${HOST}-ar" -export STRIP="/usr/bin/${HOST}-strip" -export WINDRES="/usr/bin/${HOST}-windres" -export CFLAGS="-I/windows/${MINGW_ARCH}/include/ ${CFLAGS}" export LDFLAGS="-static-libgcc ${LDFLAGS}" export PKG_CONFIG_SYSROOT_DIR="/windows" export PKG_CONFIG_PATH="/windows/${MINGW_ARCH}/lib/pkgconfig/" -export PKG_CONFIG="/usr/bin/pkg-config" export NOCONFIGURE=1 export JOBS=${JOBS:-1} export lt_cv_deplibs_check_method='pass_all'
Modified: src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -153,7 +153,7 @@ geany_private.res: $(top_srcdir)/geany_private.rc
libgeany_la_SOURCES += win32.c win32.h libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32 -libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined +libgeany_la_LDFLAGS += -mwindows -mms-bitfields -no-undefined geany_LDFLAGS += -mwindows -mms-bitfields
CLEANFILES += geany_private.res
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).