From e35f8b05639f963200f44df7154b4004be885abd Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 7 Oct 2010 18:54:18 +0000 Subject: [PATCH] - updated Linux scripts and installer files for 3.3.7 release --- mk/linux/Jamrules | 13 +++++++++---- mk/linux/makedata-diff.sh | 2 +- .../megaglest-installer/scripts/config.lua | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mk/linux/Jamrules b/mk/linux/Jamrules index d886e69e..baec1203 100644 --- a/mk/linux/Jamrules +++ b/mk/linux/Jamrules @@ -4,7 +4,12 @@ if ! $(top_builddir) } top_srcdir = $(TOP) ; -MGFLAGS = -fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse ; +MUDFLAP_FLAGS = -g -DGLIBCXX_FORCE_NEW ; +MUDFLAP_LIBS = ; +#MUDFLAP_FLAGS = -fmudflapth -include mf-runtime.h +#MUDFLAP_LIBS = -lmudflapth + +MGFLAGS = -fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse $(MUDFLAP_FLAGS) ; JAMCONFIG ?= $(top_builddir)/Jamconfig ; include $(JAMCONFIG) ; @@ -35,13 +40,13 @@ CPPFLAGS += $(MGFLAGS) ; COMPILER_CFLAGS += -Wall -W -Wno-unused -Wno-sign-compare $(MGFLAGS) ; COMPILER_CFLAGS_optimize += -O3 -DNDEBUG $(MGFLAGS) ; COMPILER_CXXFLAGS_optimize += -O3 -DNDEBUG $(MGFLAGS) ; -COMPILER_LIBS_optimize += ; +COMPILER_LIBS_optimize += $(MUDFLAP_LIBS) ; COMPILER_CFLAGS_debug += -DDEBUG -g3 ; COMPILER_CXXFLAGS_debug += -DDEBUG -g3 ; -COMPILER_LIBS_debug += -g3 ; +COMPILER_LIBS_debug += -g3 $(MUDFLAP_LIBS) ; COMPILER_CFLAGS_profile += -O3 -fno-inline -pg ; COMPILER_CXXFLAGS_profile += -O3 -fno-inline -g3 -pg ; -COMPILER_LIBS_profile += -pg ; +COMPILER_LIBS_profile += -pg $(MUDFLAP_LIBS) ; LINK = $(CXX) ; diff --git a/mk/linux/makedata-diff.sh b/mk/linux/makedata-diff.sh index 32b59e2e..dbd01e12 100755 --- a/mk/linux/makedata-diff.sh +++ b/mk/linux/makedata-diff.sh @@ -5,7 +5,7 @@ # Below is the old version to compare with. The new version is pulled from # configure.ac -OLD_VERSION=3.3.5 +OLD_VERSION=3.3.6 cd release diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua index 2dd9fbce..d639167b 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua @@ -1,5 +1,5 @@ local GAME_INSTALL_SIZE = 510000000; -local GAME_VERSION = "3.3.6"; +local GAME_VERSION = "3.3.7"; local _ = MojoSetup.translate