diff options
author | wiz <wiz> | 2008-05-20 11:43:59 +0000 |
---|---|---|
committer | wiz <wiz> | 2008-05-20 11:43:59 +0000 |
commit | f3f0d3800a001c0b2ff8a6d18ff49a6b1f5a7117 (patch) | |
tree | 835ef003003eda532a232d37b9679f52a1598b7e /games | |
parent | 7148ac9d91afa67b78ed07fda3affe9fa613b49b (diff) | |
download | pkgsrc-f3f0d3800a001c0b2ff8a6d18ff49a6b1f5a7117.tar.gz |
Update to 1.4.2:
Version 1.4.2:
* language and i18n:
* updated translations: Chinese, Chinese (Traditional), Croatian, Czech,
Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Lithuanian,
Polish, Russian, Serbian, Slovak, Spanish, Turkish
* various minor bug fixes
Diffstat (limited to 'games')
-rw-r--r-- | games/wesnoth/Makefile | 13 | ||||
-rw-r--r-- | games/wesnoth/PLIST | 48 | ||||
-rw-r--r-- | games/wesnoth/distinfo | 17 | ||||
-rw-r--r-- | games/wesnoth/patches/patch-aa | 13 | ||||
-rw-r--r-- | games/wesnoth/patches/patch-ab | 33 | ||||
-rw-r--r-- | games/wesnoth/patches/patch-ac | 13 | ||||
-rw-r--r-- | games/wesnoth/patches/patch-ad | 13 | ||||
-rw-r--r-- | games/wesnoth/patches/patch-ae | 13 | ||||
-rw-r--r-- | games/wesnoth/patches/patch-af | 7 | ||||
-rw-r--r-- | games/wesnoth/patches/patch-ag | 31 |
10 files changed, 65 insertions, 136 deletions
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 771007167c5..da11c684893 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.44 2008/04/29 14:14:10 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2008/05/20 11:43:59 wiz Exp $ -DISTNAME= wesnoth-1.4.1 +DISTNAME= wesnoth-1.4.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wesnoth/} EXTRACT_SUFX= .tar.bz2 @@ -30,14 +30,15 @@ USE_TOOLS+= perl:run msgfmt REPLACE_PYTHON= data/ais/documentation.py SUBST_CLASSES+= python SUBST_STAGE.python= post-build -SUBST_FILES.python= data/ais/sample.py -SUBST_FILES.python+= data/ais/bruteforce.py +SUBST_FILES.python= data/ais/bruteforce.py +SUBST_FILES.python+= data/ais/documentation.py +SUBST_FILES.python+= data/ais/sample.py SUBST_FILES.python+= data/campaigns/Descent_Into_Darkness/ais/kamikaze.py SUBST_FILES.python+= data/tools/scoutDefault.py SUBST_MESSAGE.python= Fixing path to python. # Best we can do without pulling in a python dependency. -SUBST_SED.python+= -e 's,WPY,${PREFIX}/bin/python2.4,' -SUBST_SED.python+= -e 's,/bin/env.*python,${PREFIX}/bin/python2.4,' +SUBST_SED.python+= -e 's,WPY,${PREFIX}/bin/python2.5,' +SUBST_SED.python+= -e 's,/bin/env.*python,${PREFIX}/bin/python2.5,' REPLACE_RUBY= data/tools/terrain2wiki.rb .include "../../lang/ruby/replace.mk" diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST index 6112a4283d7..2fe2107bcb9 100644 --- a/games/wesnoth/PLIST +++ b/games/wesnoth/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2008/04/19 09:35:24 wiz Exp $ +@comment $NetBSD: PLIST,v 1.23 2008/05/20 11:43:59 wiz Exp $ bin/wesnoth man/ca_ES@valencia/man6/wesnoth.6 man/cs/man6/wesnoth.6 @@ -15,7 +15,10 @@ man/man6/wesnoth.6 man/nl/man6/wesnoth.6 man/pl/man6/wesnoth.6 man/sk/man6/wesnoth.6 +man/sr/man6/wesnoth.6 +man/sr@latin/man6/wesnoth.6 man/sv/man6/wesnoth.6 +man/tr/man6/wesnoth.6 man/zh_CN/man6/wesnoth.6 share/applications/wesnoth.desktop share/doc/wesnoth/manual/images/game-screen.jpg @@ -47,6 +50,7 @@ share/doc/wesnoth/manual/manual.it.html share/doc/wesnoth/manual/manual.pl.html share/doc/wesnoth/manual/manual.ru.html share/doc/wesnoth/manual/manual.sv.html +share/doc/wesnoth/manual/manual.tr.html share/doc/wesnoth/manual/manual.txt share/doc/wesnoth/manual/manual.zh_CN.html share/doc/wesnoth/manual/styles/manual.css @@ -1594,6 +1598,16 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-li share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich.png share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-attack.png share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-defend.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-1.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-2.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-3.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-4.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-5.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-1.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-2.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-3.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-4.png +share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-5.png share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat.png share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/skeletonrider-attack1.png share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/skeletonrider-attack2.png @@ -2070,6 +2084,7 @@ share/wesnoth/data/core/images/items/staff.png share/wesnoth/data/core/images/items/storm-trident.png share/wesnoth/data/core/images/items/straw-bale1.png share/wesnoth/data/core/images/items/straw-bale2.png +share/wesnoth/data/core/images/maps/mainmenu.jpg share/wesnoth/data/core/images/maps/mainmenu.png share/wesnoth/data/core/images/maps/wesnoth-httt.jpg share/wesnoth/data/core/images/maps/wesnoth.png @@ -4473,8 +4488,23 @@ share/wesnoth/data/core/images/units/elves-wood/shyde-healing7.png share/wesnoth/data/core/images/units/elves-wood/shyde-healing8.png share/wesnoth/data/core/images/units/elves-wood/shyde-healing9.png share/wesnoth/data/core/images/units/elves-wood/shyde.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-defend-1.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-defend-2.png share/wesnoth/data/core/images/units/elves-wood/sorceress-defend.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-magic-1.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-magic-2.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-magic-3.png share/wesnoth/data/core/images/units/elves-wood/sorceress-magic.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-1.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-10.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-2.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-3.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-4.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-5.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-6.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-7.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-8.png +share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-9.png share/wesnoth/data/core/images/units/elves-wood/sorceress-melee.png share/wesnoth/data/core/images/units/elves-wood/sorceress.png share/wesnoth/data/core/images/units/elves-wood/sylph-defend.png @@ -5143,6 +5173,7 @@ share/wesnoth/data/core/images/units/human-outlaws/ranger-bow.png share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack1.png share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack2.png share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack3.png +share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack4.png share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-defend-1.png share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-defend-2.png share/wesnoth/data/core/images/units/human-outlaws/ranger-sword.png @@ -5840,6 +5871,10 @@ share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-attack-3.png share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-attack-4.png share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-defend.png share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow.png +share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-1.png +share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-2.png +share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-3.png +share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-4.png share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack.png share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-defend-1.png share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-defend-2.png @@ -5850,6 +5885,10 @@ share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-attack-3.p share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-attack-4.png share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-defend.png share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow.png +share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-1.png +share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-2.png +share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-3.png +share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-4.png share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack.png share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-defend-1.png share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-defend-2.png @@ -7658,6 +7697,7 @@ share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-tsg.mo share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-tutorial.mo share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-units.mo share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-utbs.mo +share/wesnoth/translations/hr/LC_MESSAGES/wesnoth.mo share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-aoi.mo share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-did.mo share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-editor.mo @@ -8433,8 +8473,14 @@ share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth.mo @comment in xdg-dirs: @dirrm share/applications @unexec ${RMDIR} %D/man/zh_CN/man6 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/man/zh_CN 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/tr/man6 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/tr 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/man/sv/man6 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/man/sv 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/sr@latin/man6 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/sr@latin 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/sr/man6 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/sr 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/man/sk/man6 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/man/sk 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/man/nl/man6 2>/dev/null || ${TRUE} diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 1485062cf39..57fccf9ab1c 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,12 +1,7 @@ -$NetBSD: distinfo,v 1.28 2008/04/19 09:35:24 wiz Exp $ +$NetBSD: distinfo,v 1.29 2008/05/20 11:43:59 wiz Exp $ -SHA1 (wesnoth-1.4.1.tar.bz2) = 41999a9ff01bc307952b29620733ec943404cf14 -RMD160 (wesnoth-1.4.1.tar.bz2) = 1e645625c452554301f63300e83a697261289c67 -Size (wesnoth-1.4.1.tar.bz2) = 149037917 bytes -SHA1 (patch-aa) = 6454b9255057e186c672ba9eba42990ea092b153 -SHA1 (patch-ab) = 72b901783e89efa76e826c61f51cfbea15b32e78 -SHA1 (patch-ac) = 72768cd36df4a8f1f0329088f5d3768404993cb0 -SHA1 (patch-ad) = 8df84c7bba3ac47275e064df45d8d8010b656aa8 -SHA1 (patch-ae) = 656010075c7e1738962e046e1bd8fb1643112fc9 -SHA1 (patch-af) = d1a6095fffeb30bf09bb55f3c43373e33d41a883 -SHA1 (patch-ag) = 38651f6ad81cbb6c658d8da6eda7d99477525b96 +SHA1 (wesnoth-1.4.2.tar.bz2) = 8dca4b1cb06ccc87a2bfbe6deeb632e2bcfe5740 +RMD160 (wesnoth-1.4.2.tar.bz2) = 3769d0ebd6d4cabfbe5429515e12263a2100b6eb +Size (wesnoth-1.4.2.tar.bz2) = 150078162 bytes +SHA1 (patch-aa) = 8bc8f775a8f50204dcca4a6383a38230959fef45 +SHA1 (patch-ab) = 139c81a2bc02daba628650b26987c8abb7cc67a2 diff --git a/games/wesnoth/patches/patch-aa b/games/wesnoth/patches/patch-aa index b0b035ce188..5885fbf4086 100644 --- a/games/wesnoth/patches/patch-aa +++ b/games/wesnoth/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2008/04/19 09:35:24 wiz Exp $ +$NetBSD: patch-aa,v 1.9 2008/05/20 11:43:59 wiz Exp $ Don't insist on GNU gettext. ---- configure.orig 2008-04-05 20:51:52.000000000 +0000 +--- configure.orig 2008-05-04 19:38:30.000000000 +0200 +++ configure @@ -5363,8 +5363,8 @@ fi done @@ -29,12 +29,3 @@ Don't insist on GNU gettext. ; return 0; } -@@ -5744,7 +5743,7 @@ fi - # Make tests default in svn version - svn_in_version=`expr match "$1.4.1" '.*svn'` - test_build=yes --if test $svn_in_version == 0 -+if test $svn_in_version = 0 - then - #disabling building tests for release version - test_build=no diff --git a/games/wesnoth/patches/patch-ab b/games/wesnoth/patches/patch-ab index c76c0cc6ea3..0ac317fa996 100644 --- a/games/wesnoth/patches/patch-ab +++ b/games/wesnoth/patches/patch-ab @@ -1,35 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2008/04/19 09:35:24 wiz Exp $ +$NetBSD: patch-ab,v 1.7 2008/05/20 11:43:59 wiz Exp $ ---- src/Makefile.in.orig 2007-01-25 15:18:34.000000000 +0000 +--- src/Makefile.in.orig 2008-05-04 19:38:30.000000000 +0200 +++ src/Makefile.in -@@ -469,7 +469,7 @@ wesnoth_SOURCES = \ - game.cpp \ - $(wesnoth_source) - --wesnoth_LDADD = $(INTERNALLIBS) libwesnoth.a $(THELIBS) -+wesnoth_LDADD = $(INTERNALLIBS) -lwesnoth $(THELIBS) - wesnoth_DEPENDENCIES = libwesnoth-core.a libwesnoth.a - - ############################################################################# -@@ -489,7 +489,7 @@ wesnoth_editor_SOURCES = \ - generic_event.cpp \ - tooltips.cpp - --wesnoth_editor_LDADD = $(INTERNALLIBS) libwesnoth.a $(THELIBS) -+wesnoth_editor_LDADD = $(INTERNALLIBS) -lwesnoth $(THELIBS) - wesnoth_editor_DEPENDENCIES = libwesnoth-core.a libwesnoth.a - - ############################################################################# -@@ -557,7 +557,7 @@ test_SOURCES = \ - tests/test_network_worker.cpp \ - $(wesnoth_source) - --test_LDADD = $(INTERNALLIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) libwesnoth.a $(THELIBS) -+test_LDADD = $(INTERNALLIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) -lwesnoth $(THELIBS) - test_DEPENDENCIES = libwesnoth-core.a libwesnoth.a - - ############################################################################# -@@ -1231,6 +1231,14 @@ distclean-compile: +@@ -1266,6 +1266,14 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` diff --git a/games/wesnoth/patches/patch-ac b/games/wesnoth/patches/patch-ac deleted file mode 100644 index fbe4d2777dd..00000000000 --- a/games/wesnoth/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.9 2008/04/19 09:35:24 wiz Exp $ - ---- utils/mp-server/run_server.orig 2008-03-11 16:58:41.000000000 +0000 -+++ utils/mp-server/run_server -@@ -49,7 +49,7 @@ do - mv gmon.out gmon.$DATE.out > /dev/null 2>&1 - # wait a bit so the server is likely up and listening - sleep 1 -- if [ "$SERVER" == "1.2" ]; then -+ if [ "$SERVER" = "1.2" ]; then - cd $SOURCE/utils/ - ./mp-lobby-logger.pl -j -p $PORT -l $SERVERBASE/currentlobby.log >> $SERVERBASE/logs/lobby-chat.log 2>&1 & - fi diff --git a/games/wesnoth/patches/patch-ad b/games/wesnoth/patches/patch-ad deleted file mode 100644 index 6ce1c7aa9f0..00000000000 --- a/games/wesnoth/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2008/04/19 09:35:24 wiz Exp $ - ---- utils/mp-server/send_server_message.orig 2007-11-20 03:26:44.000000000 +0000 -+++ utils/mp-server/send_server_message -@@ -9,7 +9,7 @@ SERVERBASE=$HOME/servers/$SERVER - SOCKET=$SERVERBASE/build/var/run/socket - - shift --if [ "$*" == "" ]; then -+if [ "$*" = "" ]; then - message="The server will get restarted now. Please don't forget to save your game!" - echo "Sending standard message: $message" - else diff --git a/games/wesnoth/patches/patch-ae b/games/wesnoth/patches/patch-ae deleted file mode 100644 index 4240e457ad6..00000000000 --- a/games/wesnoth/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2008/04/19 09:35:24 wiz Exp $ - ---- utils/mp-server/update_server.orig 2007-12-17 05:26:05.000000000 +0000 -+++ utils/mp-server/update_server -@@ -35,7 +35,7 @@ if [ "$2" != "" ]; then - fi - echo 'svn update...' - rev=$(svn up $REVISION | tail -n 1 | sed -e 's/[^0-9]//g') --if [ "$rev" == "" ]; then -+if [ "$rev" = "" ]; then - echo "No revision information found." - exit 1 - fi diff --git a/games/wesnoth/patches/patch-af b/games/wesnoth/patches/patch-af deleted file mode 100644 index 738c0690482..00000000000 --- a/games/wesnoth/patches/patch-af +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: patch-af,v 1.1 2008/04/19 09:35:24 wiz Exp $ - ---- po/wesnoth/LINGUAS.orig 2008-03-12 22:25:49.000000000 +0000 -+++ po/wesnoth/LINGUAS -@@ -1 +1 @@ --af bg ca ca_ES@valencia cs da de el en_GB es eo et eu fi fr gl_ES he hr hu id it ja ko la lt nl nb_NO pl pt pt_BR ro ru sk sl sr sr@latin sv tl tr zh_CN zh_TW -+af bg ca ca_ES@valencia cs da de el en_GB es eo et eu fi fr gl_ES he hu id it ja ko la lt nl nb_NO pl pt pt_BR ro ru sk sl sr sr@latin sv tl tr zh_CN zh_TW diff --git a/games/wesnoth/patches/patch-ag b/games/wesnoth/patches/patch-ag deleted file mode 100644 index 5ad28d1e430..00000000000 --- a/games/wesnoth/patches/patch-ag +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2008/04/19 09:35:24 wiz Exp $ - ---- src/Makefile.am.orig 2008-04-05 20:49:26.000000000 +0000 -+++ src/Makefile.am -@@ -118,7 +118,7 @@ wesnoth_SOURCES = \ - game.cpp \ - $(wesnoth_source) - --wesnoth_LDADD = $(INTERNALLIBS) libwesnoth.a $(THELIBS) -+wesnoth_LDADD = $(INTERNALLIBS) -lwesnoth $(THELIBS) - wesnoth_DEPENDENCIES=libwesnoth-core.a libwesnoth.a - - ############################################################################# -@@ -139,7 +139,7 @@ wesnoth_editor_SOURCES = \ - generic_event.cpp \ - tooltips.cpp - --wesnoth_editor_LDADD = $(INTERNALLIBS) libwesnoth.a $(THELIBS) -+wesnoth_editor_LDADD = $(INTERNALLIBS) -lwesnoth $(THELIBS) - wesnoth_editor_DEPENDENCIES=libwesnoth-core.a libwesnoth.a - - ############################################################################# -@@ -211,7 +211,7 @@ test_SOURCES = \ - tests/test_network_worker.cpp \ - $(wesnoth_source) - --test_LDADD = $(INTERNALLIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) libwesnoth.a $(THELIBS) -+test_LDADD = $(INTERNALLIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) -lwesnoth $(THELIBS) - test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a - - ############################################################################# |