Makefile cleanup, respects LDFLAGS, other changes - 423319 - thanks hasufell.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 445 insertions, 5 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index e798ec8c9ab3..7ca289bdc0a3 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.63 2012/06/24 13:11:45 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.64 2012/06/24 14:57:01 rich0 Exp $
+
+*eternal-lands-1.9.3-r2 (24 Jun 2012)
+
+  24 Jun 2012; Richard Freeman <rich0@gentoo.org>
+  +eternal-lands-1.9.3-r2.ebuild, +files/eternal-lands-1.9.3-build.patch:
+  Makefile cleanup, respects LDFLAGS, other changes - 423319 - thanks hasufell.
 
   24 Jun 2012; Richard Freeman <rich0@gentoo.org>
   eternal-lands-1.9.3-r1.ebuild:
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 471405d6acd3..803d5b98504e 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -4,19 +4,21 @@ Hash: SHA256
 AUX eternal-lands-1.9.0-glext.patch 302 RMD160 81702799ee5b06ed43e6a858c48fd36ab8450a8f SHA1 4281701bf4b1c87ca54f0f0476e524335c461b9b SHA256 696da44a3c5064881f738cc08af05a9e0aa9ae80c342b1d04170459f3834f016
 AUX eternal-lands-1.9.1-libpng.patch 604 RMD160 65e1c768de9f4633726c2bdce7dba5de7c2d29cb SHA1 3040914f67e91b9f85afdf382f19b039e1163c07 SHA256 a60bd9a16aa965e451a747bd43a5650af9d62b53a2e6fae93a6b3d94b2357e60
 AUX eternal-lands-1.9.2-glext.patch 296 RMD160 dfa430c6f9c474d413e2d2f4ab31876204c0d47b SHA1 c7ec3a0cab68b4b424a8a6e4bcae6cb72237591d SHA256 fa66cc5793df66c804c02395587b1866b9ce843a2eea2a6161003ff9dad37bbc
+AUX eternal-lands-1.9.3-build.patch 16222 RMD160 b19585e67af7af4c53654559ada4259317ca4c86 SHA1 18321b852929980898b670c5bf817e899e6c9ca6 SHA256 cc4dea9ea06fb62cd662cf07cd478f6e3d0f5afa2c7730c63943909cf2676ef8
 DIST elc_1.9.2-20110618.tar.bz2 2164208 RMD160 2dfda23784b607515b5bc7f34c5568b43a12e3c6 SHA1 9efc02ed3e957c204b6c0cbde4a6ea2578f8d75c SHA256 0226c95dc9e0a93713d2d8efcba7f75fbb97efe9b2b4f3b527e2851db69a0fad
 DIST elc_1.9.3-20120213.tar.bz2 2401172 RMD160 c3088a744e1a3950086742206151ba07c720fdb9 SHA1 1ccdcc52c3036f489b142260ddbe08f7a548e559 SHA256 b5ca11a2fc8db72003c6719ed031f9a7536865647a0278fa45ad8426ce88599e
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
 EBUILD eternal-lands-1.9.2-r1.ebuild 4178 RMD160 3eb4421d112c613b9e2ba9d28a528294142f7774 SHA1 1202be6237babb04d16cdb758eab5c2e7173b0cc SHA256 8a4f33082bcb523a5a90dc5ef450b9520d864c495550ed7152ad8b27ed60d3fb
 EBUILD eternal-lands-1.9.2.ebuild 4072 RMD160 01c9e3a645d3c0ab195370fd3739d24b7a84033a SHA1 168d3192cef862bc6663748a51319a2d670b4224 SHA256 3d61f6f8051121cbd648bcec2e2dce8a87992117346d5ff66e6e1e59bd3db045
 EBUILD eternal-lands-1.9.3-r1.ebuild 4304 RMD160 8fff139f3364cc34de1d501389d3649eb9b09d84 SHA1 bd87016aa48043e1d17b464d5a82e4086f4ba77d SHA256 aabb2af1045328eccfa1db644f997882b008b1df20743401701af71eb4030f41
+EBUILD eternal-lands-1.9.3-r2.ebuild 2838 RMD160 efc5cf218dd12dc7c0467c1ec80b51a135b0c9be SHA1 56777f05e40749fc7157836d35c5be57badfb333 SHA256 03f53a2a27235abf5412a5907f5a12e1de89f23956d5896754e36e04408683d7
 EBUILD eternal-lands-1.9.3.ebuild 4155 RMD160 51b6098ecf6dcddddd16ba16babd3292ef95b3d8 SHA1 4eed729c7144f66a3cc797fba1b4650c3e2ccb7d SHA256 2ca5492f0c691e6a8352867f0b6a0c2f110d424ba17947238ff657cd0d2ef9d8
-MISC ChangeLog 11425 RMD160 c60e06a72d8379e469ac79c5f456c1ad2dfc2a49 SHA1 0750bfc2ae03ed951fca786380c93a8b93f08d65 SHA256 85666fe138766a2c48485c56a382f56d227f9420a725c388206b2dcb4e0d7dc4
+MISC ChangeLog 11669 RMD160 d37b3295745edc5f4a784615921985e38cfa5b7b SHA1 634c4913642e9e6a5652304592fabb85f6f9b542 SHA256 77d781e047f3545b61af9186df4f05c34286bf6fbbc6ff1c7d7515aa8809f701
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk/nEhcACgkQCMFw3lXsEjqOFgD+I7iBL0m2/VR7sjvp9NsBBBNR
-4bAvunH+kJhmKSqkGhkA/2BkWSvpS9MkOwSR6zBO8Q0B5dNmsT/5UIsFGZqOODXi
-=GVgc
+iF4EAREIAAYFAk/nKscACgkQCMFw3lXsEjrIiwD/WT5rH3Wwd7CwBL6tiaQovKJ9
+667oSTqOnxALXzqrZIgA/3m7hdrOdvscUHDPlTjKxia8/VC2OqZdD7P9x/ORX+lB
+=mAi0
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
new file mode 100644
index 000000000000..684cd3ad9572
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild,v 1.1 2012/06/24 14:57:01 rich0 Exp $
+
+EAPI=4
+inherit eutils flag-o-matic gnome2-utils games
+
+DESCRIPTION="An online MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
+	http://dev.gentoo.org/~rich0/distfiles/${PN}.png"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug doc kernel_linux"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	virtual/opengl
+	virtual/glu
+	media-libs/libsdl[X]
+	media-libs/sdl-net
+	media-libs/sdl-image
+	media-libs/openal
+	media-libs/freealut
+	media-libs/libvorbis
+	dev-libs/libxml2
+	media-libs/cal3d[-16bit-indices]
+	media-libs/libpng
+	>=games-rpg/eternal-lands-data-1.9.3"
+
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-opengl-1.0.6-r1
+	app-arch/unzip
+	doc? ( app-doc/doxygen
+		media-gfx/graphviz )"
+
+S="${WORKDIR}/elc"
+
+src_prepare() {
+	local BROWSER="firefox"
+
+	sed -i \
+		-e 's/#browser/browser/g' \
+		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
+		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
+		el.ini || die "sed failed"
+
+	# Finally, update the server
+	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
+		el.ini || die "sed failed"
+
+	epatch "${FILESDIR}/${PN}-1.9.2-glext.patch"
+	epatch "${FILESDIR}/${PN}-1.9.3-build.patch"
+
+	cp Makefile.linux Makefile
+
+	# Fix for Gentoo zlib OF redefine
+	sed -i '1i#define OF(x) x' `find -name "*.c"` || die "sed failed"
+}
+
+src_compile() {
+	emake \
+		DEBUG="$(usex debug "yes" "no")" \
+		BSD_KERNEL="$(usex kernel_linux "no" "yes")" \
+		DATADIR="${GAMES_DATADIR}/${PN}/"
+
+	if use doc; then
+		emake docs
+		mv ./docs/html/ ../client || die "Failed to move documentation directory"
+	fi
+}
+
+src_install() {
+	dogamesbin el
+	make_desktop_entry el "Eternal Lands"
+
+	insopts -m 0660
+	insinto "${GAMES_DATADIR}/${PN}"
+
+	doins -r *.ini *.txt commands.lst
+
+	if use doc ; then
+		dohtml -r client/*
+	fi
+
+	doicon -s 64 "${DISTDIR}/${PN}.png"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+	elog "Auto Update is now enabled in Eternal Lands"
+	elog "If an update occurs then the client will suddenly exit"
+	elog "Updates only happen when the game first loads"
+	elog "Please don't report this behaviour as a bug"
+
+	# Ensure that the files are writable by the game group for auto
+	# updating.
+	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
+
+	# Make sure new files stay in games group
+	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
new file mode 100644
index 000000000000..989bf2700d88
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
@@ -0,0 +1,314 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Jun 24 13:32:38 UTC 2012
+Subject: build system
+
+respect all flags
+respect compiler
+add options for DATADIR, BSD_KERNEL and DEBUG
+use proper pkgconfig calls
+remove needless build types
+rename EXE to "el"
+
+--- elc/Makefile.linux
++++ elc/Makefile.linux
+@@ -3,16 +3,54 @@
+ -include make.conf
+ 
+ # basic compiling and linking - rarely changed
+-OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
+-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-
+-PNG_SCREENSHOT_LIBS = -lpng
+-LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
+-	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
+-_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
++CC ?= gcc
++CXX ?= g++
++
++# some options
++DATADIR ?= /usr/share/games/eternal-lands
++
++CPPFLAGS += -DDATA_DIR=\"$(DATADIR)\" \
++	    -DLINUX \
++	    -DELC \
++	    $(foreach FEATURE, $(EL_FEATURES), -D$(FEATURE)) \
++	    -D_7ZIP_ST
++
++ifeq ($(BSD_KERNEL),yes)
++CPPFLAGS += -DBSD
++endif
++
++ifeq ($(DEBUG),yes)
++CPPFLAGS += -DMEMORY_DEBUG
++endif
++
++CFLAGS += $(shell sdl-config --cflags) \
++	  $(shell xml2-config --cflags) \
++	  -fno-strict-aliasing \
++	  $(EXTRA_INCLUDES)
++
++CXXFLAGS += $(shell sdl-config --cflags) \
++	    $(shell xml2-config --cflags) \
++	    -fno-strict-aliasing \
++	    $(EXTRA_INCLUDES)
++
++LIBS += $(shell pkg-config --libs x11) \
++	$(shell sdl-config --libs) \
++	$(shell xml2-config --libs) \
++	$(shell pkg-config --libs SDL_net) \
++	$(shell pkg-config --libs SDL_image) \
++	$(shell pkg-config --libs openal) \
++	$(shell pkg-config --libs freealut) \
++	$(shell pkg-config --libs gl) \
++	$(shell pkg-config --libs glu) \
++	$(shell pkg-config --libs cal3d) \
++	$(shell pkg-config --libs libpng) \
++	$(shell pkg-config --libs vorbis) \
++	$(shell pkg-config --libs vorbisfile) \
++	$(shell pkg-config --libs zlib) \
++	-lm \
++	$(EXTRA_LIBS) \
++	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
++	-lstdc++
+ 
+ # This works on Ubuntu 8.04 (LTS) at least
+ # Install these packages in addition to those required for a standard build
+@@ -59,7 +97,7 @@
+ 	xz/CpuArch.o xz/Delta.o xz/LzFind.o xz/Lzma2Dec.o xz/Lzma2Enc.o	\
+ 	xz/LzmaDec.o xz/LzmaEnc.o xz/Sha256.o xz/Xz.o xz/XzCrc64.o xz/XzDec.o	\
+ 	xz/XzEnc.o	\
+-	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
++	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_COBJ))
+ 	
+ CXXOBJS=actor_init.o cal3d_wrapper.o context_menu.o optimizer.o sendvideoinfo.o	\
+ 	exceptions/extendedexception.o xml/xmlhelper.o quest_log.o	\
+@@ -80,7 +118,7 @@
+ 	eye_candy/effect_mines.o eye_candy/effect_missile.o \
+ 	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o	\
+ 	eye_candy/effect_staff.o \
+-	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
++	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_CXXOBJ))
+ 
+ OBJS=$(COBJS) $(CXXOBJS)
+ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
+@@ -89,24 +127,13 @@
+ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
+ #(shell echo $OBJ |sed s/\.o/\.P/))
+ 
+-EXE=el.x86.linux.bin
+-
+-ifndef CC
+-CC=gcc
+-endif
+-ifndef CXX
+-CXX=g++
+-endif
+-ifndef LINK
+-LINK=gcc
+-endif
++EXE=el
+ 
+ all: $(EXE)
+ 
+ # the compile targets
+ $(EXE): $(OBJS)
+-	@echo "  LINK $(EXE)"
+-	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS) $(LIBS)
+ 
+ #recompile on Makefile or conf change
+ #.depend $(OBJS): Makefile.linux make.conf
+@@ -114,25 +141,19 @@
+ DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
+ 
+ $(COBJS): %.o: %.c Makefile.linux make.conf
+-	@echo "  CC   $@"
+-	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
++	@echo "$(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
++	@if $(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+ 	fi
+ 
+ $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
+-	@echo "  CXX  $@"
+-	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
++	@echo "$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
++	@if $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+ 	fi
+ 
+-release:
+-	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)'
+-
+-static:
+-	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)' 'LDFLAGS=$(_LDFLAGS)' 'OBJS=$(OBJS) $(STATICLIBS)'
+-
+ clean:
+ 	rm -f $(OBJS) $(EXE) 
+ 
+@@ -140,8 +161,8 @@
+ 	cd docs && doxygen Doxyfile
+ 
+ .depend: $(foreach HEADER_DIR, $(HEADER_DIRS), $(wildcard $(HEADER_DIR)/*.h))
+-	$(CC) $(CFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
+-	$(CXX) $(CXXFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
++	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
+ 
+ make.conf: make.defaults
+ 	@if (test -f $@ -a '$(UPDATE_CONF)' != 'yes'); \
+@@ -161,7 +182,7 @@
+ 	echo "\t#endinput" >> $@; \
+ 	echo "#endif" >> $@; \
+ 	echo "#define _features_included" >> $@; \
+-	for feature in $(FEATURES); do \
++	for feature in $(EL_FEATURES); do \
+ 		echo "#define $$feature" >> $@; \
+ 	done
+ 
+--- elc/make.defaults
++++ elc/make.defaults
+@@ -1,71 +1,82 @@
+ # set this to "no" if you don't want this file to be overwritten
+ UPDATE_CONF=yes
+ 
++# set to 'yes' for BSD support
++BSD_KERNEL=no
++
++# set to 'yes' to enable debug support
++DEBUG=no
++
+ # tune these for your setup & compile options
+ # IMPORTANT: if you are using a linker that needs libraries in correct order, make sure you list EYE_CANDY before PNG_SCREENSHOT if you use both
+ 
+ ### Current release default options ###
+-FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
+-FEATURES += CUSTOM_LOOK			# allows you to customize your look.
+-FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
+-FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
+-FEATURES += NEW_SOUND			# Enables extended sound effects system
+-FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
+-FEATURES += TEXT_ALIASES		# Text aliases
+-FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
++EL_FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
++EL_FEATURES += CUSTOM_LOOK			# allows you to customize your look.
++EL_FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
++EL_FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
++EL_FEATURES += NEW_SOUND			# Enables extended sound effects system
++EL_FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
++EL_FEATURES += TEXT_ALIASES		# Text aliases
++EL_FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
+ # new for 1.9.0 release
+-FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
++EL_FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
+ # new for 1.9.2 release
+-FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
+-FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
+-FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
+-FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
+-FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
++EL_FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
++EL_FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
++EL_FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
++EL_FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
++EL_FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
+ # new for 1.9.3 release
+-FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
+-FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
+-FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
++EL_FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
++EL_FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
++EL_FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
+ 
+ ### Testing options (these options are possible for the next release and should be tested) ###
+-#FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
+-#FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
+-#FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
+-#FEATURES += NEW_ALPHA			# (undocumented)
+-#FEATURES += USE_SIMD			# Enables usage of simd instructions
++#EL_FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
++#EL_FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
++#EL_FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
++#EL_FEATURES += NEW_ALPHA			# (undocumented)
++#EL_FEATURES += USE_SIMD			# Enables usage of simd instructions
+ 
+ ### Machine specific options (fixes or performance enhancements) ###
+-#FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
+-#FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
+-#FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
++#EL_FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
++#EL_FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
++#EL_FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
+ 
+ 
+ ### Debug options ###
+-#FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
+-#FEATURES += DEBUG			# (undocumented)
+-#FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
+-#FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
+-#FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
+-#FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
+-#FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
+-#FEATURES += EXTRA_DEBUG		# (undocumented)
+-#FEATURES += MEMORY_DEBUG		# gather information about memory allocation and freeing
+-#FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
+-#FEATURES += MUTEX_DEBUG		# (undocumented)
+-#FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
+-#FEATURES += TIMER_CHECK		# (undocumented)
+-#FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
++#EL_FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
++#EL_FEATURES += DEBUG			# (undocumented)
++#EL_FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
++#EL_FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
++#EL_FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
++#EL_FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
++#EL_FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
++#EL_FEATURES += EXTRA_DEBUG		# (undocumented)
++
++# gather information about memory allocation and freeing
++ifeq ($(DEBUG),yes)
++EL_FEATURES += MEMORY_DEBUG
++endif
++
++#EL_FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
++#EL_FEATURES += MUTEX_DEBUG		# (undocumented)
++#EL_FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
++#EL_FEATURES += TIMER_CHECK		# (undocumented)
++#EL_FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
+ 
+ 
+ ### Other options (Experimental, unfinished, defunct or otherwise unknown) ###
+-#FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
+-#FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
+-#FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
+-#FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
+-#FEATURES += USE_BOOST
+-#FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
+-#FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
+-#FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
+-#FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
++#EL_FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
++#EL_FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
++#EL_FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
++#EL_FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
++#EL_FEATURES += USE_BOOST
++#EL_FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
++#EL_FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
++#EL_FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
++#EL_FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
+ 
+ 
+ 
+@@ -86,7 +97,3 @@
+ #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
+ #EXTRA_LIBS=-lz
+ #EXTRA_STATICLIBS=libs/zlib.a
+-
+-CC=gcc
+-CXX=g++
+-LINK=gcc