diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-06 22:37:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-06 22:40:47 +0300 |
| commit | 55b8fdf0ed09cfba852ae4f9b41c669b28b3f7e9 (patch) | |
| tree | 6a52524edb31d8095fc67dcb634b656736d055b4 | |
| parent | 7fb3f7d5a2b77ceeec2769ea30049cd49f79e8e4 (diff) | |
| download | manaplus-55b8fdf0ed09cfba852ae4f9b41c669b28b3f7e9.tar.gz manaplus-55b8fdf0ed09cfba852ae4f9b41c669b28b3f7e9.tar.bz2 manaplus-55b8fdf0ed09cfba852ae4f9b41c669b28b3f7e9.tar.xz manaplus-55b8fdf0ed09cfba852ae4f9b41c669b28b3f7e9.zip | |
Improve header and footer in help window.
Add download page into help.
| -rwxr-xr-x | build/bmake | 3 | ||||
| -rw-r--r-- | data/help/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | data/help/Makefile.am | 1 | ||||
| -rw-r--r-- | data/help/download.txt | 10 | ||||
| -rw-r--r-- | data/help/footer.txt | 2 | ||||
| -rw-r--r-- | data/help/header.txt | 8 | ||||
| -rw-r--r-- | data/help/index.txt | 1 |
7 files changed, 19 insertions, 9 deletions
diff --git a/build/bmake b/build/bmake index 7e5076655..e095494c9 100755 --- a/build/bmake +++ b/build/bmake @@ -45,7 +45,8 @@ autoreconf -i --with-internalguichan=yes \ --enable-tcmalloc=no \ --enable-googleprofiler=no \ ---enable-eathena=yes +--enable-eathena=yes \ +--with-sdl2 cd po make -j5 update-gmo 2>../build/make1.log diff --git a/data/help/CMakeLists.txt b/data/help/CMakeLists.txt index 80b992b6f..ab2efbe7f 100644 --- a/data/help/CMakeLists.txt +++ b/data/help/CMakeLists.txt @@ -1,7 +1,8 @@ SET(FILES about.txt - commands.txt chatcommands.txt + commands.txt + download.txt footer.txt header.txt index.txt diff --git a/data/help/Makefile.am b/data/help/Makefile.am index 23204b210..a30d1836e 100644 --- a/data/help/Makefile.am +++ b/data/help/Makefile.am @@ -6,6 +6,7 @@ help_DATA = \ about.txt \ chatcommands.txt \ commands.txt \ + download.txt \ footer.txt \ header.txt \ index.txt \ diff --git a/data/help/download.txt b/data/help/download.txt new file mode 100644 index 000000000..c0bcf9585 --- /dev/null +++ b/data/help/download.txt @@ -0,0 +1,10 @@ + <- @@index|<<Back to Index>>@@ + + +##3 === <<DOWNLOADS>> === + + ##2Android: @@http://download.evolonline.org/manaplus/download/manaplus.apk|apk@@, @@http://www.amazon.com/gp/product/B00FINPCWA|Amazon@@, @@https://play.google.com/store/apps/details?id=org.evolonline.beta.manaplus|Google Play@@ + ##2MacOSX: @@http://download.evolonline.org/manaplus/macosx/manaplus-lion-1.3.9.15.dmg|Lion@@, @@http://download.evolonline.org/manaplus/macosx/manaplus-snowleopard.dmg|Snow leopard@@ + ##2Windows: @@http://download.evolonline.org/manaplus/download/manaplus-win32.exe|<<Download>>@@, @@http://manaplus.org/windowsinstaller|<<Instructions>>@@ + ##2Sources: @@http://download.evolonline.org/manaplus/download/manaplus.tar.xz|<<Download>>@@ + ##2Other linux: @@http://download.evolonline.org/manaplus/download/manaplus-linux.tar.bz2|<<Download>>@@ diff --git a/data/help/footer.txt b/data/help/footer.txt index 8b1378917..be8738115 100644 --- a/data/help/footer.txt +++ b/data/help/footer.txt @@ -1 +1,3 @@ +##2 <<Website: @@http://manaplus.org/|http://manaplus.org/@@>> + diff --git a/data/help/header.txt b/data/help/header.txt index 46eaa73dc..2657b9e4e 100644 --- a/data/help/header.txt +++ b/data/help/header.txt @@ -1,9 +1,3 @@ -##1 M A N A P L U S -##1 ================================ - - <<##2Version:##6%VER%>> - -##2 <<Website: @@http://manaplus.org/|http://manaplus.org/@@>> - + <<##2ManaPlus version: ##6%VER%>> diff --git a/data/help/index.txt b/data/help/index.txt index 710c56163..b920ed68f 100644 --- a/data/help/index.txt +++ b/data/help/index.txt @@ -1,6 +1,7 @@ ##3 === <<INDEX>> === ##1-> @@about|<<About>>@@ + -> @@download|<<Download>>@@ -> @@team|<<Manaplus Developers>>@@ -> @@commands|<<Commands>>@@ |