gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update version to 0.6.0

This commit is contained in:
Eduardo Bart 2013-01-23 17:07:22 -02:00
parent 311bc220a8
commit d5d5e507af
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1,13 +1,12 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(otclient) project(otclient)
set(VERSION "0.5.6") set(VERSION "0.6.0")
set(FRAMEWORK_SOUND ON) set(FRAMEWORK_SOUND ON)
set(FRAMEWORK_GRAPHICS ON) set(FRAMEWORK_GRAPHICS ON)
set(FRAMEWORK_XML ON) set(FRAMEWORK_XML ON)
set(FRAMEWORK_NET ON) set(FRAMEWORK_NET ON)
#set(FRAMEWORK_GIT ON)
include(src/framework/CMakeLists.txt) include(src/framework/CMakeLists.txt)
include(src/client/CMakeLists.txt) include(src/client/CMakeLists.txt)

23
tools/make_snapshot.sh
View File

@ -23,18 +23,16 @@ else
git clone $gitroot otclient || exit git clone $gitroot otclient || exit
fi fi
# get spr and dat
cd $workdir
if [ ! -d Tibia ]; then
wget http://tibiaclient.com/files/tibia860.tar
tar xf tibia860.tar
fi
cd $workdir/otclient cd $workdir/otclient
revision=`git rev-list --all | wc -l` revision=`git rev-list --all | wc -l`
commit=`git describe --dirty --always` commit=`git describe --dirty --always`
version=`cat CMakeLists.txt | grep "set(VERSION" | sed 's/.*"\([^"]*\)".*/\1/'` version=`cat CMakeLists.txt | grep "set(VERSION" | sed 's/.*"\([^"]*\)".*/\1/'`
# set flags
export CFLAGS="-march=i686 -m32"
export CXXFLAGS="-march=i686 -m32"
export LDFLAGS="-march=i686 -m32"
# compile for win32 # compile for win32
rm -rf build.win32 rm -rf build.win32
mkdir build.win32 mkdir build.win32
@ -63,9 +61,9 @@ make -j$makejobs || exit
cd .. cd ..
# compile for linux 64 # compile for linux 64
rm -rf build.linux64 rm -rf build.linux32
mkdir build.linux64 mkdir build.linux32
cd build.linux64 cd build.linux32
export CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" export CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
cmake -DCMAKE_BUILD_TYPE=Release \ cmake -DCMAKE_BUILD_TYPE=Release \
@ -120,10 +118,6 @@ tar czf $pkgzip $pkgname
echo "Package generated to $pkgzip" echo "Package generated to $pkgzip"
mkdir $pkgname/modules/game_tibiafiles/860/
cp $workdir/Tibia/*.spr $pkgname/modules/game_tibiafiles/860/
cp $workdir/Tibia/*.dat $pkgname/modules/game_tibiafiles/860/
################################################## ##################################################
# create win32 package # create win32 package
pkg_suffix="-win32-$version" pkg_suffix="-win32-$version"
@ -137,6 +131,7 @@ cd $pkgname
# copy otclient files # copy otclient files
cp -R $workdir/otclient/mods . cp -R $workdir/otclient/mods .
cp -R $workdir/otclient/modules . cp -R $workdir/otclient/modules .
cp -R $workdir/otclient/data .
cp $mingwbin/libEGL.dll . cp $mingwbin/libEGL.dll .
cp $mingwbin/libGLESv2.dll . cp $mingwbin/libGLESv2.dll .
cp $mingwbin/d3dcompiler_43.dll . cp $mingwbin/d3dcompiler_43.dll .