Browse Source

Update version to 0.6.0

Eduardo Bart 8 years ago
parent
commit
d5d5e507af
2 changed files with 10 additions and 16 deletions
  1. 1
    2
      CMakeLists.txt
  2. 9
    14
      tools/make_snapshot.sh

+ 1
- 2
CMakeLists.txt View File

@@ -1,13 +1,12 @@
1 1
 cmake_minimum_required(VERSION 2.6)
2 2
 project(otclient)
3 3
 
4
-set(VERSION "0.5.6")
4
+set(VERSION "0.6.0")
5 5
 
6 6
 set(FRAMEWORK_SOUND ON)
7 7
 set(FRAMEWORK_GRAPHICS ON)
8 8
 set(FRAMEWORK_XML ON)
9 9
 set(FRAMEWORK_NET ON)
10
-#set(FRAMEWORK_GIT ON)
11 10
 include(src/framework/CMakeLists.txt)
12 11
 include(src/client/CMakeLists.txt)
13 12
 

+ 9
- 14
tools/make_snapshot.sh View File

@@ -23,18 +23,16 @@ else
23 23
     git clone $gitroot otclient || exit
24 24
 fi
25 25
 
26
-# get spr and dat
27
-cd $workdir
28
-if [ ! -d Tibia ]; then
29
-    wget http://tibiaclient.com/files/tibia860.tar
30
-    tar xf tibia860.tar
31
-fi
32
-
33 26
 cd $workdir/otclient
34 27
 revision=`git rev-list --all | wc -l`
35 28
 commit=`git describe --dirty --always`
36 29
 version=`cat CMakeLists.txt | grep "set(VERSION" | sed 's/.*"\([^"]*\)".*/\1/'`
37 30
 
31
+# set flags
32
+export CFLAGS="-march=i686 -m32"
33
+export CXXFLAGS="-march=i686 -m32"
34
+export LDFLAGS="-march=i686 -m32"
35
+
38 36
 # compile for win32
39 37
 rm -rf build.win32
40 38
 mkdir build.win32
@@ -63,9 +61,9 @@ make -j$makejobs || exit
63 61
 cd ..
64 62
 
65 63
 # compile for linux 64
66
-rm -rf build.linux64
67
-mkdir build.linux64
68
-cd build.linux64
64
+rm -rf build.linux32
65
+mkdir build.linux32
66
+cd build.linux32
69 67
 export CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
70 68
 export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
71 69
 cmake -DCMAKE_BUILD_TYPE=Release \
@@ -120,10 +118,6 @@ tar czf $pkgzip $pkgname
120 118
 
121 119
 echo "Package generated to $pkgzip"
122 120
 
123
-mkdir $pkgname/modules/game_tibiafiles/860/
124
-cp $workdir/Tibia/*.spr $pkgname/modules/game_tibiafiles/860/
125
-cp $workdir/Tibia/*.dat $pkgname/modules/game_tibiafiles/860/
126
-
127 121
 ##################################################
128 122
 # create win32 package
129 123
 pkg_suffix="-win32-$version"
@@ -137,6 +131,7 @@ cd $pkgname
137 131
 # copy otclient files
138 132
 cp -R $workdir/otclient/mods .
139 133
 cp -R $workdir/otclient/modules .
134
+cp -R $workdir/otclient/data .
140 135
 cp $mingwbin/libEGL.dll .
141 136
 cp $mingwbin/libGLESv2.dll .
142 137
 cp $mingwbin/d3dcompiler_43.dll .

Loading…
Cancel
Save