diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
| commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
| tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /build | |
| parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
| parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
| download | manaplus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz manaplus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 manaplus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz manaplus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip | |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'build')
| -rwxr-xr-x | build/packevol | 14 | ||||
| -rwxr-xr-x | build/packwin | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/build/packevol b/build/packevol new file mode 100755 index 000000000..9059fdf58 --- /dev/null +++ b/build/packevol @@ -0,0 +1,14 @@ +#!/bin/bash + +cd .. + +dir=`pwd` + +cd packaging/windows +./make-translations.sh +makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ + -DPRODUCT_VERSION="1.2.2.5" \ + -DEXESUFFIX=/src \ + -DUPX=true \ + evol.nsi + diff --git a/build/packwin b/build/packwin index d855cf534..296039482 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.2.1.22" \ + -DPRODUCT_VERSION="1.2.2.5" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi |