diff --git a/Makefile.am b/Makefile.am index d31e1703..7e61783c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ yatc_SOURCES = $(MAYBE_OPENGL) debugprint.cpp enginesdl.cpp gm_mainmenu.cpp \ net/connection.cpp net/networkmessage.cpp net/protocolgame80.cpp \ net/protocolgame81.cpp net/protocolgame811.cpp net/protocolgame82.cpp \ net/protocolgame821.cpp net/protocolgame822.cpp \ - net/protocolgame83.cpp net/protocolgame831.cpp protocol84.cpp \ + net/protocolgame83.cpp net/protocolgame831.cpp net/protocolgame84.cpp \ net/rsa.cpp net/encryption.cpp net/protocolgame.cpp net/protocollogin.cpp \ \ ui/optionsui.cpp ui/tutorialhints.cpp ui/uicontainer.cpp \ @@ -36,7 +36,7 @@ yatc_SOURCES = $(MAYBE_OPENGL) debugprint.cpp enginesdl.cpp gm_mainmenu.cpp \ gamecontent/inventory.cpp gamecontent/item.cpp gamecontent/map.cpp EXTRA_DIST = debugprint.h enginesdl.h gm_mainmenu.h objects.h spritegl.h \ - engine.h gamemode.h optionsui.h spritesdl.h \ + engine.h gamemode.h options.h spritesdl.h \ enginegl.h gm_debug.h notifications.h sprite.h util.h \ sprdata.h font.h confighandler.h gm_gameworld.h \ skin.h thingui.h itemui.h creatureui.h console.h effectui.h \ @@ -47,7 +47,7 @@ EXTRA_DIST = debugprint.h enginesdl.h gm_mainmenu.h objects.h spritegl.h \ net/connection.h net/networkmessage.h net/protocolgame80.h \ net/protocolgame81.h net/protocolgame811.h net/protocolgame82.h \ net/protocolgame821.h net/protocolgame822.h \ - net/protocolgame83.h net/protocolgame831.h protocolgame84.h \ + net/protocolgame83.h net/protocolgame831.h net/protocolgame84.h \ net/rsa.h net/encryption.h net/protocolgame.h net/protocollogin.h \ gamecontent/container.h gamecontent/creature.h gamecontent/globalvars.h \ gamecontent/inventory.h gamecontent/item.h gamecontent/map.h \ @@ -55,7 +55,7 @@ EXTRA_DIST = debugprint.h enginesdl.h gm_mainmenu.h objects.h spritegl.h \ \ defines.h gamecontent/enums.h fassert.h \ gamecontent/thing.h \ - ui/login.h ui/mainmenu.h ui/options.h ui/optionsgeneral.h \ + ui/login.h ui/mainmenu.h ui/optionsui.h ui/optionsgeneral.h \ ui/optionsgraphics.h ui/optionsconsole.h ui/optionsnetwork.h \ ui/charlist.h ui/tutorialhints.h ui/itemmove.h \ ui/uiinventory.h ui/skills.h ui/uicontainer.h ui/uishop.h \ @@ -67,7 +67,7 @@ EXTRA_DIST = debugprint.h enginesdl.h gm_mainmenu.h objects.h spritegl.h \ translations/yatc.pot translations/prepare.sh \ translations/merge.sh translations/build.sh \ translations/brazilian.po translations/croatian.po \ - translations/polish.po translation/spanish.po \ + translations/polish.po translations/spanish.po \ translations/swedish.po \ translations/README \ \ diff --git a/autorelease.sh b/autorelease.sh index 259d72c7..57f298e7 100755 --- a/autorelease.sh +++ b/autorelease.sh @@ -1,3 +1,14 @@ +mkdir GLICT +cd GLICT +svn co http://glict.svn.sf.net/svnroot/glict/trunk/glict/ . +./autogen.sh +./configure +make +cd .. +export CFLAGS="-I`pwd`/GLICT/ -L`pwd`/GLICT/GLICT/" +export CXXFLAGS="-I`pwd`/GLICT/ -L`pwd`/GLICT/GLICT/" +export LDFLAGS="-L`pwd`/GLICT/GLICT/" + cat - > autorelease.tmp << EOF n y @@ -9,7 +20,7 @@ y ./autorelease.patchchangelog.sh EOF -sed s/YATCVERS/0.2.1~nightly-`date +%Y%m%d`/g autorelease.tmp > autorelease.tmp.new +sed s/YATCVERS/0.2.4~nightly-`date +%Y%m%d`/g autorelease.tmp > autorelease.tmp.new mv autorelease.tmp.new autorelease.tmp cat - > autorelease.patchchangelog.sh << EOF diff --git a/net/Makefile b/net/Makefile index ceb35d2d..f6fdaf86 100644 --- a/net/Makefile +++ b/net/Makefile @@ -2,7 +2,8 @@ SRCS = *.cpp HEAD = *.h OBJS = connection.o networkmessage.o protocolgame81.o protocollogin.o \ encryption.o protocolgame80.o protocolgame.o rsa.o \ - protocolgame811.o protocolgame82.o protocolgame821.o + protocolgame811.o protocolgame82.o protocolgame821.o \ + protocolgame83.o protocolgame831.o protocolgame84.o all: __all.a