1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-04 23:17:41 +02:00

- linux version update

This commit is contained in:
Ivan Savenko 2012-10-01 07:05:12 +00:00
parent 77e4b72531
commit 42cbbc8682
14 changed files with 249 additions and 19 deletions

View File

@ -40,8 +40,8 @@ Trevor Standley aka tstandley, <>
Rickard Westerlund aka Onion Knight, <onionknigh@gmail.com> Rickard Westerlund aka Onion Knight, <onionknigh@gmail.com>
* battle functionality and general support * battle functionality and general support
Ivan, <> Ivan Savenko, <saven.ivan@gmail.com>
* Kingdom overwiew window, a few town structures, general support * GCC/Linux support, client development, general support
Benjamin Gentner aka beegee, <> Benjamin Gentner aka beegee, <>
* battle support, programming * battle support, programming

View File

@ -21,15 +21,14 @@ To compile, at least the following packages (and their development counterparts)
* boost c++ libraries v1.44+ (www.boost.org): * boost c++ libraries v1.44+ (www.boost.org):
- program-options - program-options
- filesystem - filesystem
- iostreams
- system - system
- thread - thread
On Debian-based systems (e.g. Ubuntu) run: On Debian-based systems (e.g. Ubuntu) run:
sudo apt-get install g++ libsdl1.2debian libsdl-image1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev zlib1g-dev libavformat-dev libswscale-dev libboost-dev libboost-filesystem-dev libboost-iostreams-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev sudo apt-get install g++ libsdl1.2debian libsdl-image1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev zlib1g-dev libavformat-dev libswscale-dev libboost-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev
On RPM-based distributions (e.g. Fedora) run: On RPM-based distributions (e.g. Fedora) run:
sudo yum install gcc-c++ SDL-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel boost boost-devel boost-filesystem boost-iostreams boost-system boost-thread boost-program-options zlib-devel ffmpeg-devel ffmpeg-libs sudo yum install gcc-c++ SDL-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel boost boost-devel boost-filesystem boost-system boost-thread boost-program-options zlib-devel ffmpeg-devel ffmpeg-libs
Optionaly, if you want to regenerate the build system, you will need the following tools: Optionaly, if you want to regenerate the build system, you will need the following tools:
* libtool * libtool
@ -100,6 +99,7 @@ Go to /LIB_PATH/vcmi, and type:
Go to /LIB_PATH/vcmi/AI, and type: Go to /LIB_PATH/vcmi/AI, and type:
ln -s /PATH_TO_SOURCE/AI/VCAI/.libs/VCAI.so ln -s /PATH_TO_SOURCE/AI/VCAI/.libs/VCAI.so
ln -s /PATH_TO_SOURCE/AI/StupidAI/.libs/StupidAI.so ln -s /PATH_TO_SOURCE/AI/StupidAI/.libs/StupidAI.so
ln -s /PATH_TO_SOURCE/AI/BattleAI/.libs/BattleAI.so
Go to /DATA_PATH/vcmi, and type: Go to /DATA_PATH/vcmi, and type:
ln -s /PATH_TO_SOURCE/config ln -s /PATH_TO_SOURCE/config

View File

@ -3,13 +3,15 @@ bin_PROGRAMS = vcmiclient
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_DATA = vcmiclient.desktop desktop_DATA = vcmiclient.desktop
icondir = $(datadir)/icons
dist_icon_DATA = vcmiclient.png
EXTRA_DIST = \ EXTRA_DIST = \
$(pixmaps_extra_DATA) \
${desktop_DATA} ${desktop_DATA}
dist-hook:
install -m 644 "$(srcdir)/icons/vcmiclient.xpm" "$(distdir)/pixmaps/vcmiclient.xpm"
install -m 644 "$(srcdir)/icons/vcmiclient.64x64.png" "$(distdir)/icons/hicolor/64x64/apps/vcmiclient.png"
install -m 644 "$(srcdir)/icons/vcmiclient.48x48.png" "$(distdir)/icons/hicolor/48x48/apps/vcmiclient.png"
install -m 644 "$(srcdir)/icons/vcmiclient.32x32.png" "$(distdir)/icons/hicolor/32x32/apps/vcmiclient.png"
BUILT_SOURCES = StdInc.h.gch BUILT_SOURCES = StdInc.h.gch
StdInc.h.gch: StdInc.h StdInc.h.gch: StdInc.h
$(CXXCOMPILE) -c $< $(CXXCOMPILE) -c $<

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

226
client/icons/vcmiclient.xpm Normal file
View File

@ -0,0 +1,226 @@
/* XPM */
static char *vcmiclient[] = {
/* columns rows colors chars-per-pixel */
"32 32 188 2 ",
" c #010101",
". c #090909",
"X c #140600",
"o c #180700",
"O c #140A06",
"+ c #1B0901",
"@ c #1E120C",
"# c #161414",
"$ c #1C1C1B",
"% c #220B01",
"& c #2B0E00",
"* c #2E1002",
"= c #2C140A",
"- c #331507",
"; c #341609",
": c #35180B",
"> c #221612",
", c #221915",
"< c #2C1C15",
"1 c #281F1A",
"2 c #351C10",
"3 c #391E11",
"4 c #3D2214",
"5 c #3C2519",
"6 c #252424",
"7 c #2D2D2C",
"8 c #3B2B24",
"9 c #3C302B",
"0 c #343333",
"q c #3F3036",
"w c #393837",
"e c #3D3C3B",
"r c #402215",
"t c #422618",
"y c #442B1E",
"u c #482D1F",
"i c #452D21",
"p c #4A2F21",
"a c #4D3325",
"s c #4E372C",
"d c #503729",
"f c #52392C",
"g c #423433",
"h c #483C35",
"j c #443438",
"k c #443B3E",
"l c #533E32",
"z c #41403F",
"x c #4B433E",
"c c #514037",
"v c #5D4236",
"b c #53433B",
"n c #5E4438",
"m c #634F3F",
"M c #695337",
"N c #67523F",
"B c #6A543D",
"V c #6C583B",
"C c #795F36",
"Z c #725A3E",
"A c #795F3E",
"S c #413741",
"D c #473C46",
"F c #444242",
"G c #4A4845",
"H c #4C4B4B",
"J c #5A4D46",
"K c #54524F",
"L c #5B504C",
"P c #555454",
"I c #5A5956",
"U c #5B5B5B",
"Y c #645143",
"T c #6B5544",
"R c #6F5A45",
"E c #65544C",
"W c #6D564B",
"Q c #6A594F",
"! c #735D46",
"~ c #6B5655",
"^ c #6D5A53",
"/ c #655D58",
"( c #6C595B",
") c #755E56",
"_ c #735F59",
"` c #796143",
"' c #75624E",
"] c #7B624C",
"[ c #67625D",
"{ c #7B6356",
"} c #71645E",
"| c #7B665A",
" . c #7E695E",
".. c #715E60",
"X. c #656362",
"o. c #6A6762",
"O. c #6D6A66",
"+. c #6A6168",
"@. c #6D6B6B",
"#. c #726C67",
"$. c #726E6A",
"%. c #76726F",
"&. c #79726D",
"*. c #716F70",
"=. c #747473",
"-. c #7B7671",
";. c #7D7976",
":. c #7E7D7B",
">. c #80673C",
",. c #8D713F",
"<. c #9F7E37",
"1. c #816843",
"2. c #886D41",
"3. c #927745",
"4. c #826B5E",
"5. c #836E62",
"6. c #877166",
"7. c #887266",
"8. c #8B756A",
"9. c #8F796E",
"0. c #907A6F",
"q. c #857A73",
"w. c #827E79",
"e. c #927D73",
"r. c #A38234",
"t. c #A58439",
"y. c #AF8B3E",
"u. c #B08E39",
"i. c #BD9738",
"p. c #E3B101",
"a. c #CAA021",
"s. c #CEA43F",
"d. c #E4B437",
"f. c #E4B53E",
"g. c #F4C23D",
"h. c #A28343",
"j. c #A88741",
"k. c #B39040",
"l. c #BF9940",
"z. c #86837E",
"x. c #948177",
"c. c #94867E",
"v. c #99847A",
"b. c #9D897E",
"n. c #BE9C6E",
"m. c #D3AB6D",
"M. c #E3B76C",
"N. c #F0C26B",
"B. c #F0C273",
"V. c #858482",
"C. c #888682",
"Z. c #8C8985",
"A. c #8E8D8D",
"S. c #928C86",
"D. c #918F8C",
"F. c #95918D",
"G. c #959492",
"H. c #9A9792",
"J. c #9B9995",
"K. c #9E9B99",
"L. c #A18D82",
"P. c #A39086",
"I. c #A6948A",
"U. c #A9968C",
"Y. c #AB988E",
"T. c #AF9C92",
"R. c #A19E9A",
"E. c #A4A29E",
"W. c #B4A298",
"Q. c #A5A4A1",
"!. c #A9A7A3",
"~. c #ACA9A6",
"^. c #ADACAB",
"/. c #B1AEAB",
"(. c #B2B0AD",
"). c #B5B4B2",
"_. c #BAB9B7",
"`. c #BDBCBB",
"'. c #C4C3C3",
"]. c #C8C8C8",
"[. c #D1D0CE",
"{. c #D4D3D3",
"}. c #DADADA",
"|. c #E8E7E6",
" X c #EBEBEA",
".X c gray96",
"XX c #FDFDFC",
"oX c None",
/* pixels */
"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX",
"oXoXoXoX0 I 0 oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXw H oXoXoXoX",
"oXoXoXoX'.'.'.`.Q.D.:.+.P F F 6 6 w e H I @.:.Z.K.E.R.H.$.oXoXoX",
"oXoXoXoX).).`.`.`._.)./.(.(.(.(.(./.~.!.E.R.H.G.D.Z.S.C.o.oXoXoX",
"oXoXoXoXV.A.G.*.Z.K.^.).).^.~.Q.Q.E.K.K.J.F.C.-.$.$.S.S.K oXoXoX",
"oXoXoXoXX.@.P & : f E } #.&.q.&.-.&.&.&.&.q.c.I.W.S.z.G.w oXoXoX",
"oXoXoXoXH X.H = & * r n { 5.7.8.0.x.v.b.L.P.I.Y.T.q.G.H.$ oXoXoX",
"oXoXoXoX7 X.H = * & & : a W 5.6.7.9.x.x.x.L.L.I.U.q.R.F.oXoXoXoX",
"oXoXoXoXoXX.F , * & & & * 3 l { 5.6.8.0.x.x.b.L.P.-.Q.;.oXoXoXoX",
"oXoXoXoXoXI e 1 & & & & & & ; p T | .5.8.0.0.x.x.V.Q.U oXoXoXoX",
"oXoXoXoX F 0 # o & % o o o o & 3 8 g h ^ 5.J b x C.G.$ oXoXoXoX",
"oXoXoXB.4.7 6 B.{ % X N.g.g.] o % { g.B.g Q 4.g.B.U U B.4.oXoXoX",
"oXoXoXf.>.. $ d.` + M.y.A C f.) % A p.d.> 9 1.p.f.e e f.1.oXoXoX",
"oXoXoX| s._ m.h.k @ s.Z + o ) g + Z a.<.m._ s.t.s.7 6 s.] oXoXoX",
"oXoXoX i.V i.' k > l.B = % o o % B l.B i.M l.R l.6 . i.! oXoXoX",
"oXoXoXoX_ u.3.+.C.1 k.B @ O n.^ % N y.g ,.u.Q N y.$ k.! oXoXoX",
"oXoXoXoX j.Y '.}.F ^ j.j.t.2.j % Y j.o m j.X J j.. j.W oXoXoX",
"oXoXoXoXoX..S Q..XK.< ( Y Y k 5 2 j ~ o q ~ O S ( oX..D oXoXoX",
"oXoXoXoXoXoXoXK |.{.b i i y y i y 5 : * & & , 7 6 oXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoX_.[.&.a d a a a p p y 4 - - F e $ oXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoX@.(.H.c f d d a a p p u t L G.*.oXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXE.E./ f f d d a a a a c ].}.*.oXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXo.G.C.b f f f s d a s R.XX XoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXZ.Z.#.c f f f d f $.{. X=.oXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXe z.w.O.c l f l [ E.).K.oXoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXoXP -.&.&.o.o.;.G.J.D.oXoXoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXoXoXK $.$.%.-.z.z.w.$ oXoXoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXoXoXoX7 I o.O.$.G oXoXoXoXoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX# oXoXoXoXoXoXoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX",
"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX"
};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT(vcmi, 0.89) # Follow VCMI_VERSION in GameConstants.h AC_INIT(vcmi, 0.90) # Follow VCMI_VERSION in GameConstants.h
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_MACRO_DIR([aclocal/m4]) AC_CONFIG_MACRO_DIR([aclocal/m4])

2
debian/compat vendored
View File

@ -1 +1 @@
7 8

8
debian/control vendored
View File

@ -1,15 +1,15 @@
Source: vcmi Source: vcmi
Section: games Section: games
Priority: extra Priority: optional
Maintainer: frank zago <frank@zago.net> Maintainer: frank zago <frank@zago.net>
Build-Depends: debhelper (>= 7), cdbs (>= 0.4.48), autotools-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev (>= 1.2.8), zlib1g-dev, libavformat-dev, libswscale-dev, libboost-dev (>=1.44), libboost-program-options-dev (>=1.44), libboost-filesystem-dev (>=1.44), libboost-iostreams-dev (>=1.44), libboost-system-dev (>=1.44), libboost-thread-dev (>=1.44) Build-Depends: debhelper (>= 8), cdbs (>= 0.4.48), autotools-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev (>= 1.2.8), zlib1g-dev, libavformat-dev, libswscale-dev, libboost-dev (>=1.44), libboost-program-options-dev (>=1.44), libboost-filesystem-dev (>=1.44), libboost-system-dev (>=1.44), libboost-thread-dev (>=1.44)
Standards-Version: 3.8.0 Standards-Version: 3.9.1
Homepage: http://vcmi.eu Homepage: http://vcmi.eu
Package: vcmi Package: vcmi
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A rewrite the Heroes of Might and Magic 3 engine Description: Rewrite of the Heroes of Might and Magic 3 engine
The purpose of VCMI project is to rewrite entire HOMM 3: WoG engine from The purpose of VCMI project is to rewrite entire HOMM 3: WoG engine from
scratch, giving it new and extended possibilities. It will help to support scratch, giving it new and extended possibilities. It will help to support
mods and new towns already made by fans but abandoned because of game code mods and new towns already made by fans but abandoned because of game code

5
debian/copyright vendored
View File

@ -18,11 +18,12 @@ Upstream Authors:
Frank Zago <frank@zago.net> Frank Zago <frank@zago.net>
Trevor Standley Trevor Standley
Rickard Westerlund <onionknigh@gmail.com> Rickard Westerlund <onionknigh@gmail.com>
Ivan Ivan Savenko <saven.ivan@gmail.com>
Benjamin Gentner
Copyright: Copyright:
Copyright (C) 2002-2010 Micha³ Urbañczyk, Mateusz B. Copyright (C) 2002-2012 Micha³ Urbañczyk, Mateusz B.
License: License:

2
debian/rules vendored
View File

@ -4,4 +4,4 @@ include /usr/share/cdbs/1/rules/debhelper.mk
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- --disable-debug dh_auto_configure -- --disable-debug --bindir=/usr/games

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (native)