Module: check_mk Branch: master Commit: 34f6bbe138682e8c03d7a24d9b49454510142b12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34f6bbe138682e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 22 09:46:38 2015 +0200 Trying to fix building agent on Ubuntu 15.04 --- agents/windows/Makefile | 6 ++++-- agents/windows/msibuild/Makefile | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 5a496b6..51419f8 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -25,11 +25,11 @@ SHELL = /bin/bash VERSION = 1.2.7i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ -WINDRES = i586-mingw32msvc-windres +WINDRES = i686-w64-mingw32-windres COPTIONS = -s -O2 -Wall -Werror -static -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' ifeq ($(shell uname),Linux) - CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ + CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i686-w64-mingw32-g++ CXX_64 = x86_64-w64-mingw32-g++ WINDRES_64 = x86_64-w64-mingw32-windres else @@ -135,3 +135,5 @@ clean: mrproper: clean rm -f *.exe +setup: + sudo apt-get install nsis lcab binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 4ecc076..022c2aa 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -34,6 +34,7 @@ clean: rm -rf $(MSITOOLS) rm -f check_mk_agent.msi rm -rf work sources + rm .gsf-save-* msibuild: tar -Jxf $(MSITOOLS_FILE)