[althreat commit] r71 - in trunk: armes decors fonts images levels po po/fr_FR/LC_MESSAGES sons src src/widgets vai...

0 views

Skip to first unread message

codesite...@google.com

unread,

Jan 5, 2008, 5:33:36 AM1/5/08

to althre...@googlegroups.com

Author: colin.pitrat
Date: Sat Jan 5 02:32:55 2008
New Revision: 71

Modified:
trunk/armes/Makefile.am
trunk/armes/Makefile.in
trunk/decors/Makefile.am
trunk/decors/Makefile.in
trunk/fonts/Makefile.am
trunk/fonts/Makefile.in
trunk/images/Makefile.am
trunk/images/Makefile.in
trunk/levels/Makefile.am
trunk/levels/Makefile.in
trunk/levels/level4
trunk/po/AlThreat.pot
trunk/po/fr_FR/LC_MESSAGES/AlThreat.po
trunk/sons/Makefile.am
trunk/sons/Makefile.in
trunk/src/AlThreat.cc
trunk/src/Configuration.cc
trunk/src/Configuration.h
trunk/src/Game.cc
trunk/src/Makefile.am
trunk/src/Makefile.in
trunk/src/Menu.cc
trunk/src/Menu.h
trunk/src/Options.cc
trunk/src/Options.h
trunk/src/widgets/Makefile.am
trunk/src/widgets/Makefile.in
trunk/src/widgets/liste.cc
trunk/vaisseaux/Makefile.am
trunk/vaisseaux/Makefile.in

Log:
Correct problems preventing make distcheck to work.
Translation.

Modified: trunk/armes/Makefile.am
==============================================================================
--- trunk/armes/Makefile.am (original)
+++ trunk/armes/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,7 +1,7 @@
-laser1dir = $(datadir)/armes/laser1
+laser1dir = $(pkgdatadir)/armes/laser1
laser1_DATA = laser1/arme laser1/arme.png laser1/destructArme
laser1/explode1.png laser1/explode2.png laser1/explode3.png
laser1/explode4.png laser1/explode5.png laser1/skinArme

-missile1dir = $(datadir)/armes/missile1
+missile1dir = $(pkgdatadir)/armes/missile1
missile1_DATA = missile1/arme missile1/arme.png missile1/destructArme
missile1/explode1.png missile1/explode2.png missile1/explode3.png
missile1/explode4.png missile1/explode5.png missile1/skinArme

EXTRA_DIST = $(laser1_DATA) $(missile1_DATA)

Modified: trunk/armes/Makefile.in
==============================================================================
--- trunk/armes/Makefile.in (original)
+++ trunk/armes/Makefile.in Sat Jan 5 02:32:55 2008
@@ -174,9 +174,9 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-laser1dir = $(datadir)/armes/laser1
+laser1dir = $(pkgdatadir)/armes/laser1
laser1_DATA = laser1/arme laser1/arme.png laser1/destructArme
laser1/explode1.png laser1/explode2.png laser1/explode3.png
laser1/explode4.png laser1/explode5.png laser1/skinArme
-missile1dir = $(datadir)/armes/missile1
+missile1dir = $(pkgdatadir)/armes/missile1
missile1_DATA = missile1/arme missile1/arme.png missile1/destructArme
missile1/explode1.png missile1/explode2.png missile1/explode3.png
missile1/explode4.png missile1/explode5.png missile1/skinArme
EXTRA_DIST = $(laser1_DATA) $(missile1_DATA)
all: all-am

Modified: trunk/decors/Makefile.am
==============================================================================
--- trunk/decors/Makefile.am (original)
+++ trunk/decors/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,25 +1,28 @@
-asteroide1dir = $(datadir)/decors/asteroide1
+asteroide1dir = $(pkgdatadir)/decors/asteroide1
asteroide1_DATA = asteroide1/ast1.bmp asteroide1/asteroide1.png
asteroide1/explode1.png asteroide1/explode3.png asteroide1/explode5.png
asteroide1/explode7.png asteroide1/explosion1 asteroide1/asteroide1
asteroide1/description asteroide1/explode2.png asteroide1/explode4.png
asteroide1/explode6.png asteroide1/explode8.png

-asteroide2dir = $(datadir)/decors/asteroide2
+asteroide2dir = $(pkgdatadir)/decors/asteroide2
asteroide2_DATA = asteroide2/0001.png asteroide2/0003.png
asteroide2/0005.png asteroide2/0007.png asteroide2/0009.png
asteroide2/0011.png asteroide2/0013.png asteroide2/asteroide2
asteroide2/explode1.png asteroide2/explode3.png asteroide2/explosion2
asteroide2/0002.png asteroide2/0004.png asteroide2/0006.png
asteroide2/0008.png asteroide2/0010.png asteroide2/0012.png
asteroide2/0014.png asteroide2/description asteroide2/explode2.png asteroide2/explode4.png

-bonus1dir = $(datadir)/decors/bonus1
+bonus1dir = $(pkgdatadir)/decors/bonus1
bonus1_DATA = bonus1/bonus1 bonus1/bonus1-1.png bonus1/bonus1-2.png
bonus1/bonus1-3.png bonus1/bonus1-4.png bonus1/bonus1-5.png
bonus1/bonus1-6.png bonus1/bonus1-7.png bonus1/bonus1-8.png
bonus1/bonus1.png bonus1/description

-bonus2dir = $(datadir)/decors/bonus2
+bonus2dir = $(pkgdatadir)/decors/bonus2
bonus2_DATA = bonus2/bonus2 bonus2/bonus2-10.png bonus2/bonus2-3.png
bonus2/bonus2-5.png bonus2/bonus2-7.png bonus2/bonus2-9.png
bonus2/bonus2-1.png bonus2/bonus2-2.png bonus2/bonus2-4.png
bonus2/bonus2-6.png bonus2/bonus2-8.png bonus2/description

-ovni1dir = $(datadir)/decors/ovni1
+bonus3dir = $(pkgdatadir)/decors/bonus3
+bonus3_DATA = bonus3/bonus3 bonus3/bonus3-1.png bonus3/bonus3-2.png
bonus3/bonus3-3.png bonus3/description
+
+ovni1dir = $(pkgdatadir)/decors/ovni1
ovni1_DATA = ovni1/description ovni1/explosion1 ovni1/ovni1
ovni1/ovni1.png ovni1/ovni10.png ovni1/ovni2.png ovni1/ovni3.png
ovni1/ovni4.png ovni1/ovni5.png ovni1/ovni6.png ovni1/ovni7.png
ovni1/ovni8.png ovni1/ovni9.png

-ovni2dir = $(datadir)/decors/ovni2
+ovni2dir = $(pkgdatadir)/decors/ovni2
ovni2_DATA = ovni2/description ovni2/explode11.png ovni2/explode14.png
ovni2/explode2.png ovni2/explode5.png ovni2/explode8.png ovni2/feu3.gif
ovni2/ovni11.png ovni2/ovni14.png ovni2/ovni2.png ovni2/ovni5.png
ovni2/ovni8.png ovni2/explode1.png ovni2/explode12.png
ovni2/explode15.png ovni2/explode3.png ovni2/explode6.png
ovni2/explode9.png ovni2/ovni1.png ovni2/ovni12.png ovni2/ovni15.png
ovni2/ovni3.png ovni2/ovni6.png ovni2/ovni9.png ovni2/explode10.png
ovni2/explode13.png ovni2/explode16.png ovni2/explode4.png
ovni2/explode7.png ovni2/explosion2 ovni2/ovni10.png ovni2/ovni13.png
ovni2/ovni2 ovni2/ovni4.png ovni2/ovni7.png

-tunnel1basdir = $(datadir)/decors/tunnel1bas
+tunnel1basdir = $(pkgdatadir)/decors/tunnel1bas
tunnel1bas_DATA = tunnel1bas/description tunnel1bas/explosion1
tunnel1bas/tunnel1bas tunnel1bas/tunnel1bas1.png
tunnel1bas/tunnel1bas2.png tunnel1bas/tunnel1bas3.png

-tunnel1hautdir= $(datadir)/decors/tunnel1haut
+tunnel1hautdir= $(pkgdatadir)/decors/tunnel1haut
tunnel1haut_DATA = tunnel1haut/description tunnel1haut/explosion1
tunnel1haut/tunnel1haut tunnel1haut/tunnel1haut1.png
tunnel1haut/tunnel1haut2.png tunnel1haut/tunnel1haut3.png

-EXTRA_DIST = $(asteroide1_DATA) $(asteroide2_DATA) $(bonus1_DATA)
$(bonus2_DATA) $(ovni1_DATA) $(ovni2_DATA) $(tunnel1bas_DATA) $(tunnel1haut_DATA)
+EXTRA_DIST = $(asteroide1_DATA) $(asteroide2_DATA) $(bonus1_DATA)
$(bonus2_DATA) $(bonus3_DATA) $(ovni1_DATA) $(ovni2_DATA)
$(tunnel1bas_DATA) $(tunnel1haut_DATA)

Modified: trunk/decors/Makefile.in
==============================================================================
--- trunk/decors/Makefile.in (original)
+++ trunk/decors/Makefile.in Sat Jan 5 02:32:55 2008
@@ -56,20 +56,21 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(asteroide1dir)" \
"$(DESTDIR)$(asteroide2dir)" "$(DESTDIR)$(bonus1dir)" \
- "$(DESTDIR)$(bonus2dir)" "$(DESTDIR)$(ovni1dir)" \
- "$(DESTDIR)$(ovni2dir)" "$(DESTDIR)$(tunnel1basdir)" \
- "$(DESTDIR)$(tunnel1hautdir)"
+ "$(DESTDIR)$(bonus2dir)" "$(DESTDIR)$(bonus3dir)" \
+ "$(DESTDIR)$(ovni1dir)" "$(DESTDIR)$(ovni2dir)" \
+ "$(DESTDIR)$(tunnel1basdir)" "$(DESTDIR)$(tunnel1hautdir)"
asteroide1DATA_INSTALL = $(INSTALL_DATA)
asteroide2DATA_INSTALL = $(INSTALL_DATA)
bonus1DATA_INSTALL = $(INSTALL_DATA)
bonus2DATA_INSTALL = $(INSTALL_DATA)
+bonus3DATA_INSTALL = $(INSTALL_DATA)
ovni1DATA_INSTALL = $(INSTALL_DATA)
ovni2DATA_INSTALL = $(INSTALL_DATA)
tunnel1basDATA_INSTALL = $(INSTALL_DATA)
tunnel1hautDATA_INSTALL = $(INSTALL_DATA)
DATA = $(asteroide1_DATA) $(asteroide2_DATA) $(bonus1_DATA) \
- $(bonus2_DATA) $(ovni1_DATA) $(ovni2_DATA) $(tunnel1bas_DATA) \
- $(tunnel1haut_DATA)
+ $(bonus2_DATA) $(bonus3_DATA) $(ovni1_DATA) $(ovni2_DATA) \
+ $(tunnel1bas_DATA) $(tunnel1haut_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -186,23 +187,25 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-asteroide1dir = $(datadir)/decors/asteroide1
+asteroide1dir = $(pkgdatadir)/decors/asteroide1
asteroide1_DATA = asteroide1/ast1.bmp asteroide1/asteroide1.png
asteroide1/explode1.png asteroide1/explode3.png asteroide1/explode5.png
asteroide1/explode7.png asteroide1/explosion1 asteroide1/asteroide1
asteroide1/description asteroide1/explode2.png asteroide1/explode4.png
asteroide1/explode6.png asteroide1/explode8.png
-asteroide2dir = $(datadir)/decors/asteroide2
+asteroide2dir = $(pkgdatadir)/decors/asteroide2
asteroide2_DATA = asteroide2/0001.png asteroide2/0003.png
asteroide2/0005.png asteroide2/0007.png asteroide2/0009.png
asteroide2/0011.png asteroide2/0013.png asteroide2/asteroide2
asteroide2/explode1.png asteroide2/explode3.png asteroide2/explosion2
asteroide2/0002.png asteroide2/0004.png asteroide2/0006.png
asteroide2/0008.png asteroide2/0010.png asteroide2/0012.png
asteroide2/0014.png asteroide2/description asteroide2/explode2.png asteroide2/explode4.png
-bonus1dir = $(datadir)/decors/bonus1
+bonus1dir = $(pkgdatadir)/decors/bonus1
bonus1_DATA = bonus1/bonus1 bonus1/bonus1-1.png bonus1/bonus1-2.png
bonus1/bonus1-3.png bonus1/bonus1-4.png bonus1/bonus1-5.png
bonus1/bonus1-6.png bonus1/bonus1-7.png bonus1/bonus1-8.png
bonus1/bonus1.png bonus1/description
-bonus2dir = $(datadir)/decors/bonus2
+bonus2dir = $(pkgdatadir)/decors/bonus2
bonus2_DATA = bonus2/bonus2 bonus2/bonus2-10.png bonus2/bonus2-3.png
bonus2/bonus2-5.png bonus2/bonus2-7.png bonus2/bonus2-9.png
bonus2/bonus2-1.png bonus2/bonus2-2.png bonus2/bonus2-4.png
bonus2/bonus2-6.png bonus2/bonus2-8.png bonus2/description
-ovni1dir = $(datadir)/decors/ovni1
+bonus3dir = $(pkgdatadir)/decors/bonus3
+bonus3_DATA = bonus3/bonus3 bonus3/bonus3-1.png bonus3/bonus3-2.png
bonus3/bonus3-3.png bonus3/description
+ovni1dir = $(pkgdatadir)/decors/ovni1
ovni1_DATA = ovni1/description ovni1/explosion1 ovni1/ovni1
ovni1/ovni1.png ovni1/ovni10.png ovni1/ovni2.png ovni1/ovni3.png
ovni1/ovni4.png ovni1/ovni5.png ovni1/ovni6.png ovni1/ovni7.png
ovni1/ovni8.png ovni1/ovni9.png
-ovni2dir = $(datadir)/decors/ovni2
+ovni2dir = $(pkgdatadir)/decors/ovni2
ovni2_DATA = ovni2/description ovni2/explode11.png ovni2/explode14.png
ovni2/explode2.png ovni2/explode5.png ovni2/explode8.png ovni2/feu3.gif
ovni2/ovni11.png ovni2/ovni14.png ovni2/ovni2.png ovni2/ovni5.png
ovni2/ovni8.png ovni2/explode1.png ovni2/explode12.png
ovni2/explode15.png ovni2/explode3.png ovni2/explode6.png
ovni2/explode9.png ovni2/ovni1.png ovni2/ovni12.png ovni2/ovni15.png
ovni2/ovni3.png ovni2/ovni6.png ovni2/ovni9.png ovni2/explode10.png
ovni2/explode13.png ovni2/explode16.png ovni2/explode4.png
ovni2/explode7.png ovni2/explosion2 ovni2/ovni10.png ovni2/ovni13.png
ovni2/ovni2 ovni2/ovni4.png ovni2/ovni7.png
-tunnel1basdir = $(datadir)/decors/tunnel1bas
+tunnel1basdir = $(pkgdatadir)/decors/tunnel1bas
tunnel1bas_DATA = tunnel1bas/description tunnel1bas/explosion1
tunnel1bas/tunnel1bas tunnel1bas/tunnel1bas1.png
tunnel1bas/tunnel1bas2.png tunnel1bas/tunnel1bas3.png
-tunnel1hautdir = $(datadir)/decors/tunnel1haut
+tunnel1hautdir = $(pkgdatadir)/decors/tunnel1haut
tunnel1haut_DATA = tunnel1haut/description tunnel1haut/explosion1
tunnel1haut/tunnel1haut tunnel1haut/tunnel1haut1.png
tunnel1haut/tunnel1haut2.png tunnel1haut/tunnel1haut3.png
-EXTRA_DIST = $(asteroide1_DATA) $(asteroide2_DATA) $(bonus1_DATA)
$(bonus2_DATA) $(ovni1_DATA) $(ovni2_DATA) $(tunnel1bas_DATA) $(tunnel1haut_DATA)
+EXTRA_DIST = $(asteroide1_DATA) $(asteroide2_DATA) $(bonus1_DATA)
$(bonus2_DATA) $(bonus3_DATA) $(ovni1_DATA) $(ovni2_DATA)
$(tunnel1bas_DATA) $(tunnel1haut_DATA)
all: all-am

.SUFFIXES:
@@ -303,6 +306,23 @@
echo " rm -f '$(DESTDIR)$(bonus2dir)/$$f'"; \
rm -f "$(DESTDIR)$(bonus2dir)/$$f"; \
done
+install-bonus3DATA: $(bonus3_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(bonus3dir)" || $(MKDIR_P) "$(DESTDIR)$(bonus3dir)"
+ @list='$(bonus3_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo "
$(bonus3DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(bonus3dir)/$$f'"; \
+ $(bonus3DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(bonus3dir)/$$f"; \
+ done
+
+uninstall-bonus3DATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bonus3_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(bonus3dir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bonus3dir)/$$f"; \
+ done
install-ovni1DATA: $(ovni1_DATA)
@$(NORMAL_INSTALL)
test -z "$(ovni1dir)" || $(MKDIR_P) "$(DESTDIR)$(ovni1dir)"
@@ -408,7 +428,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir
in "$(DESTDIR)$(asteroide1dir)" "$(DESTDIR)$(asteroide2dir)" "$(DESTDIR)$(bonus1dir)" "$(DESTDIR)$(bonus2dir)" "$(DESTDIR)$(ovni1dir)" "$(DESTDIR)$(ovni2dir)" "$(DESTDIR)$(tunnel1basdir)" "$(DESTDIR)$(tunnel1hautdir)";
do \
+ for dir
in "$(DESTDIR)$(asteroide1dir)" "$(DESTDIR)$(asteroide2dir)" "$(DESTDIR)$(bonus1dir)" "$(DESTDIR)$(bonus2dir)" "$(DESTDIR)$(bonus3dir)" "$(DESTDIR)$(ovni1dir)" "$(DESTDIR)$(ovni2dir)" "$(DESTDIR)$(tunnel1basdir)" "$(DESTDIR)$(tunnel1hautdir)";
do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -454,8 +474,8 @@
info-am:

install-data-am: install-asteroide1DATA install-asteroide2DATA \
- install-bonus1DATA install-bonus2DATA install-ovni1DATA \
- install-ovni2DATA install-tunnel1basDATA \
+ install-bonus1DATA install-bonus2DATA install-bonus3DATA \
+ install-ovni1DATA install-ovni2DATA install-tunnel1basDATA \
install-tunnel1hautDATA

install-dvi: install-dvi-am
@@ -491,9 +511,9 @@
ps-am:

uninstall-am: uninstall-asteroide1DATA uninstall-asteroide2DATA \
- uninstall-bonus1DATA uninstall-bonus2DATA uninstall-ovni1DATA \
- uninstall-ovni2DATA uninstall-tunnel1basDATA \
- uninstall-tunnel1hautDATA
+ uninstall-bonus1DATA uninstall-bonus2DATA uninstall-bonus3DATA \
+ uninstall-ovni1DATA uninstall-ovni2DATA \
+ uninstall-tunnel1basDATA uninstall-tunnel1hautDATA

.MAKE: install-am install-strip

@@ -501,18 +521,18 @@
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-asteroide1DATA \
install-asteroide2DATA install-bonus1DATA install-bonus2DATA \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-ovni1DATA \
- install-ovni2DATA install-pdf install-pdf-am install-ps \
- install-ps-am install-strip install-tunnel1basDATA \
+ install-bonus3DATA install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-ovni1DATA install-ovni2DATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip install-tunnel1basDATA \
install-tunnel1hautDATA installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
uninstall-am uninstall-asteroide1DATA uninstall-asteroide2DATA \
- uninstall-bonus1DATA uninstall-bonus2DATA uninstall-ovni1DATA \
- uninstall-ovni2DATA uninstall-tunnel1basDATA \
- uninstall-tunnel1hautDATA
+ uninstall-bonus1DATA uninstall-bonus2DATA uninstall-bonus3DATA \
+ uninstall-ovni1DATA uninstall-ovni2DATA \
+ uninstall-tunnel1basDATA uninstall-tunnel1hautDATA

# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

Modified: trunk/fonts/Makefile.am
==============================================================================
--- trunk/fonts/Makefile.am (original)
+++ trunk/fonts/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,4 +1,4 @@
-fontsdir = $(datadir)/fonts
+fontsdir = $(pkgdatadir)/fonts
fonts_DATA = babelfish.ttf vera.ttf

EXTRA_DIST = $(fonts_DATA)

Modified: trunk/fonts/Makefile.in
==============================================================================
--- trunk/fonts/Makefile.in (original)
+++ trunk/fonts/Makefile.in Sat Jan 5 02:32:55 2008
@@ -173,7 +173,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-fontsdir = $(datadir)/fonts
+fontsdir = $(pkgdatadir)/fonts
fonts_DATA = babelfish.ttf vera.ttf
EXTRA_DIST = $(fonts_DATA)
all: all-am

Modified: trunk/images/Makefile.am
==============================================================================
--- trunk/images/Makefile.am (original)
+++ trunk/images/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,4 +1,4 @@
-imagesdir = $(datadir)/images
+imagesdir = $(pkgdatadir)/images
images_DATA = Choix.png Menu.png off.png on.png puce

EXTRA_DIST = $(images_DATA)

Modified: trunk/images/Makefile.in
==============================================================================
--- trunk/images/Makefile.in (original)
+++ trunk/images/Makefile.in Sat Jan 5 02:32:55 2008
@@ -173,7 +173,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-imagesdir = $(datadir)/images
+imagesdir = $(pkgdatadir)/images
images_DATA = Choix.png Menu.png off.png on.png puce
EXTRA_DIST = $(images_DATA)
all: all-am

Modified: trunk/levels/Makefile.am
==============================================================================
--- trunk/levels/Makefile.am (original)
+++ trunk/levels/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,4 +1,4 @@
-levelsdir = $(datadir)/levels
+levelsdir = $(pkgdatadir)/levels
levels_DATA = level1 level2 level3 level4 level5 level6 levels.lst

EXTRA_DIST = $(levels_DATA)

Modified: trunk/levels/Makefile.in
==============================================================================
--- trunk/levels/Makefile.in (original)
+++ trunk/levels/Makefile.in Sat Jan 5 02:32:55 2008
@@ -173,7 +173,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-levelsdir = $(datadir)/levels
+levelsdir = $(pkgdatadir)/levels
levels_DATA = level1 level2 level3 level4 level5 level6 levels.lst
EXTRA_DIST = $(levels_DATA)
all: all-am

Modified: trunk/levels/level4
==============================================================================
--- trunk/levels/level4 (original)
+++ trunk/levels/level4 Sat Jan 5 02:32:55 2008
@@ -1044,5 +1044,8 @@
1 9779 82 5 -3
1 9786 292 3 4
1 9799 364 3 -3
-0
-0
+1
+decors/bonus3/description
+2
+1 10 400 1 0
+1 9410 600 1 -1

Modified: trunk/po/AlThreat.pot
==============================================================================
--- trunk/po/AlThreat.pot (original)
+++ trunk/po/AlThreat.pot Sat Jan 5 02:32:55 2008
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: alth...@googlegroups.com\n"
-"POT-Creation-Date: 2007-11-10 00:00+0100\n"
+"POT-Creation-Date: 2008-01-05 11:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <L...@li.org>\n"
@@ -48,51 +48,51 @@
msgid " Energy: "
msgstr ""

-#: ../src/Menu.cc:77
+#: ../src/Menu.cc:76
msgid "Adventure"
msgstr ""

-#: ../src/Menu.cc:78
+#: ../src/Menu.cc:77
msgid "Training"
msgstr ""

-#: ../src/Menu.cc:79 ../src/MenuJeu.cc:14
+#: ../src/Menu.cc:78 ../src/MenuJeu.cc:14
msgid "Options"
msgstr ""

-#: ../src/Menu.cc:80
+#: ../src/Menu.cc:79
msgid "Credits"
msgstr ""

-#: ../src/Menu.cc:81
+#: ../src/Menu.cc:80
msgid "Quit"
msgstr ""

-#: ../src/Menu.cc:117 ../src/Options.cc:72
+#: ../src/Menu.cc:118 ../src/Options.cc:82
msgid "OK"
msgstr ""

-#: ../src/Menu.cc:146
+#: ../src/Menu.cc:147
msgid "Development: Skippy"
msgstr ""

-#: ../src/Menu.cc:147
+#: ../src/Menu.cc:148
msgid "Graphisms: Raz & Skippy"
msgstr ""

-#: ../src/Menu.cc:148
+#: ../src/Menu.cc:149
msgid "Music: Raz & Vavrek"
msgstr ""

-#: ../src/Menu.cc:149
+#: ../src/Menu.cc:150
msgid "-=( the3fold )=-"
msgstr ""

-#: ../src/Menu.cc:150
+#: ../src/Menu.cc:151
msgid "http://www.vavrek.com"
msgstr ""

-#: ../src/Menu.cc:151
+#: ../src/Menu.cc:152
msgid "http://the3fold.free.fr"
msgstr ""

@@ -121,46 +121,50 @@
msgstr ""

#: ../src/Options.cc:50
+msgid "Joystick sensibility:"
+msgstr ""
+
+#: ../src/Options.cc:60
msgid "Modify controls"
msgstr ""

-#: ../src/Options.cc:55
+#: ../src/Options.cc:65
msgid "Language:"
msgstr ""

-#: ../src/Options.cc:77
+#: ../src/Options.cc:87
msgid "Cancel"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Up"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Down"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Left"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Right"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Fire"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Special weapon"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Shield"
msgstr ""

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Pause"
msgstr ""

Modified: trunk/po/fr_FR/LC_MESSAGES/AlThreat.po
==============================================================================
--- trunk/po/fr_FR/LC_MESSAGES/AlThreat.po (original)
+++ trunk/po/fr_FR/LC_MESSAGES/AlThreat.po Sat Jan 5 02:32:55 2008
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: AlThreat 0.3\n"
"Report-Msgid-Bugs-To: alth...@googlegroups.com\n"
-"POT-Creation-Date: 2007-11-10 00:00+0100\n"
+"POT-Creation-Date: 2008-01-05 10:53+0100\n"
"PO-Revision-Date: 2007-11-07 22:38+0100\n"
"Last-Translator: <colin....@gmail.com>\n"
"Language-Team: French\n"
@@ -49,51 +49,51 @@
msgid " Energy: "
msgstr " Energie : "

-#: ../src/Menu.cc:77
+#: ../src/Menu.cc:76
msgid "Adventure"
msgstr "Aventure"

-#: ../src/Menu.cc:78
+#: ../src/Menu.cc:77
msgid "Training"
msgstr "Entrainement"

-#: ../src/Menu.cc:79 ../src/MenuJeu.cc:14
+#: ../src/Menu.cc:78 ../src/MenuJeu.cc:14
msgid "Options"
msgstr "Options"

-#: ../src/Menu.cc:80
+#: ../src/Menu.cc:79
msgid "Credits"
msgstr "Credits"

-#: ../src/Menu.cc:81
+#: ../src/Menu.cc:80
msgid "Quit"
msgstr "Quitter"

-#: ../src/Menu.cc:117 ../src/Options.cc:72
+#: ../src/Menu.cc:118 ../src/Options.cc:82
msgid "OK"
msgstr "OK"

-#: ../src/Menu.cc:146
+#: ../src/Menu.cc:147
msgid "Development: Skippy"
msgstr "Programmation : Skippy"

-#: ../src/Menu.cc:147
+#: ../src/Menu.cc:148
msgid "Graphisms: Raz & Skippy"
msgstr "Graphismes : Raz & Skippy"

-#: ../src/Menu.cc:148
+#: ../src/Menu.cc:149
msgid "Music: Raz & Vavrek"
msgstr "Musique : Raz & Vavrek"

-#: ../src/Menu.cc:149
+#: ../src/Menu.cc:150
msgid "-=( the3fold )=-"
msgstr ""

-#: ../src/Menu.cc:150
+#: ../src/Menu.cc:151
msgid "http://www.vavrek.com"
msgstr ""

-#: ../src/Menu.cc:151
+#: ../src/Menu.cc:152
msgid "http://the3fold.free.fr"
msgstr ""

@@ -122,46 +122,50 @@
msgstr "Volume des effets sonores :"

#: ../src/Options.cc:50
+msgid "Joystick sensibility:"
+msgstr ""
+
+#: ../src/Options.cc:60
msgid "Modify controls"
msgstr "Modifier les controles"

-#: ../src/Options.cc:55
+#: ../src/Options.cc:65
msgid "Language:"
msgstr "Langue"

-#: ../src/Options.cc:77
+#: ../src/Options.cc:87
msgid "Cancel"
msgstr "Annuler"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Up"
msgstr "Haut"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Down"
msgstr "Bas"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Left"
msgstr "Gauche"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Right"
msgstr "Droite"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Fire"
msgstr "Feu"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Special weapon"
msgstr "Arme speciale"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Shield"
msgstr "Bouclier"

-#: ../src/Options.cc:258
+#: ../src/Options.cc:279
msgid "Pause"
msgstr "Pause"

Modified: trunk/sons/Makefile.am
==============================================================================
--- trunk/sons/Makefile.am (original)
+++ trunk/sons/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,4 +1,4 @@
-sonsdir = $(datadir)/sons
-sons_DATA = Level1.ogg Level2.ogg Level3.ogg Level4.ogg Level5.ogg
Level6.ogg Licenses.txt bonus1.wav bonus2.wav explode.wav explos.wav
laser.wav laser2.wav Menusong.ogg
+sonsdir = $(pkgdatadir)/sons
+sons_DATA = Level1.ogg Level2.ogg Level3.ogg Level4.ogg Level5.ogg
Level6.ogg Licenses.txt bonus1.wav bonus2.wav bonus3.wav explode.wav
explos.wav laser.wav laser2.wav Menusong.ogg

EXTRA_DIST = $(sons_DATA)

Modified: trunk/sons/Makefile.in
==============================================================================
--- trunk/sons/Makefile.in (original)
+++ trunk/sons/Makefile.in Sat Jan 5 02:32:55 2008
@@ -173,8 +173,8 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-sonsdir = $(datadir)/sons
-sons_DATA = Level1.ogg Level2.ogg Level3.ogg Level4.ogg Level5.ogg
Level6.ogg Licenses.txt bonus1.wav bonus2.wav explode.wav explos.wav
laser.wav laser2.wav Menusong.ogg
+sonsdir = $(pkgdatadir)/sons
+sons_DATA = Level1.ogg Level2.ogg Level3.ogg Level4.ogg Level5.ogg
Level6.ogg Licenses.txt bonus1.wav bonus2.wav bonus3.wav explode.wav
explos.wav laser.wav laser2.wav Menusong.ogg
EXTRA_DIST = $(sons_DATA)
all: all-am

Modified: trunk/src/AlThreat.cc
==============================================================================
--- trunk/src/AlThreat.cc (original)
+++ trunk/src/AlThreat.cc Sat Jan 5 02:32:55 2008
@@ -38,7 +38,7 @@
if(event.key.keysym.sym == configuration->touche(TOUCHE_DROITE))
dir |= Droite;
if(event.key.keysym.sym == configuration->touche(TOUCHE_ARME))
- shoot = 1;
+ shoot = true;
if(event.key.keysym.sym == configuration->touche(TOUCHE_PAUSE))
{
// TODO : Copier l'image du jeu
@@ -58,20 +58,20 @@
if(event.key.keysym.sym == configuration->touche(TOUCHE_DROITE))
dir &= ~Droite;
if(event.key.keysym.sym == configuration->touche(TOUCHE_ARME))
- shoot = 0;
+ shoot = false;
break;
case SDL_JOYBUTTONDOWN:
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_HAUT))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_HAUT))
dir |= Haut;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_BAS))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_BAS))
dir |= Bas;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_GAUCHE))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_GAUCHE))
dir |= Gauche;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_DROITE))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_DROITE))
dir |= Droite;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
- shoot = 1;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_PAUSE))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
+ shoot = true;
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_PAUSE))
{
// TODO : Copier l'image du jeu
SDL_Surface* fondMenu = SDL_CreateRGBSurface(Screen->flags,
Screen->w, Screen->h, Screen->format->BitsPerPixel,
Screen->format->Rmask, Screen->format->Gmask, Screen->format->Bmask, Screen->format->Amask);
@@ -81,58 +81,58 @@
}
break;
case SDL_JOYBUTTONUP:
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_HAUT))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_HAUT))
dir &= ~Haut;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_BAS))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_BAS))
dir &= ~Bas;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_GAUCHE))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_GAUCHE))
dir &= ~Gauche;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_DROITE))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_DROITE))
dir &= ~Droite;
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
- shoot = 0;
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
+ shoot = false;
break;
case SDL_JOYAXISMOTION:
// TODO : Handle an axis sensibility
if(SIGN(event.jaxis.value) != 0)
{
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_HAUT))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_HAUT))
dir |= Haut;
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_BAS))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_BAS))
dir |= Bas;
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_GAUCHE))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_GAUCHE))
dir |= Gauche;
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_DROITE))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_DROITE))
dir |= Droite;
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_ARME))
- shoot = 0;
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_ARME))
+ shoot = true;
}
else
{
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, 1, TOUCHE_HAUT))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, configuration->joySensibility()+1, TOUCHE_HAUT))
{
dir &= ~Bas;
dir &= ~Haut;
}
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, 1, TOUCHE_BAS))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, configuration->joySensibility()+1, TOUCHE_BAS))
{
dir &= ~Bas;
dir &= ~Haut;
}
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, 1, TOUCHE_GAUCHE))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, configuration->joySensibility()+1, TOUCHE_GAUCHE))
{
dir &= ~Gauche;
dir &= ~Droite;
}
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, 1, TOUCHE_DROITE))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, configuration->joySensibility()+1, TOUCHE_DROITE))
{
dir &= ~Gauche;
dir &= ~Droite;
}
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, 1, TOUCHE_ARME))
- shoot = 0;
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, -1, TOUCHE_ARME))
- shoot = 0;
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, configuration->joySensibility()+1, TOUCHE_ARME))
+ shoot = false;
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis,
-configuration->joySensibility()-1, TOUCHE_ARME))
+ shoot = false;
}
break;
case SDL_QUIT:
@@ -248,11 +248,11 @@
}
break;
case SDL_JOYAXISMOTION:
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_ARME))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_ARME))
finished = true;
break;
case SDL_JOYBUTTONDOWN:
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
finished = true;
break;
case SDL_QUIT:
@@ -357,11 +357,11 @@
}
break;
case SDL_JOYAXISMOTION:
- if(configuration->isJoystickEvent(event.jaxis.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_ARME))
+ if(configuration->isJoystickEvent(event.type,
event.jaxis.which, event.jaxis.axis, event.jaxis.value, TOUCHE_ARME))
finished = true;
break;
case SDL_JOYBUTTONDOWN:
- if(configuration->isJoystickEvent(event.jbutton.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
+ if(configuration->isJoystickEvent(event.type,
event.jbutton.which, event.jbutton.button, 1, TOUCHE_ARME))
finished = true;
break;
case SDL_QUIT:
@@ -384,7 +384,6 @@
void Jeu(bool practice = false)
{
bool FinJeu = false;
- bool pause = false;
unsigned int dir = Arret;
SDL_Surface *Screen = SDL_GetVideoSurface();
std::string levelsListName("levels/levels.lst");
@@ -394,6 +393,7 @@
Uint32 beginning = SDL_GetTicks();
Uint32 frames = 0;
bool nextLevel = true;
+ bool shoot = false;
while(!FinJeu && !jeu->estMort())
{
if(nextLevel)
@@ -401,7 +401,6 @@
FinJeu = !jeu->nextLevel(levelsListName);
level++;
}
- bool shoot = false;
Uint32 debut = SDL_GetTicks();

while((!FinJeu) && (jeu->getLevel()->getPos() <
jeu->getLevel()->getEnd()) && !jeu->getVaisseau()->isDead())

Modified: trunk/src/Configuration.cc
==============================================================================
--- trunk/src/Configuration.cc (original)
+++ trunk/src/Configuration.cc Sat Jan 5 02:32:55 2008
@@ -11,6 +11,7 @@
_joystick = true;
_musicvol = MIX_MAX_VOLUME;
_soundFXvol = MIX_MAX_VOLUME;
+ _joysens = DEFAULT_JOY_SENSIBILITY;
_verbose = false;
_debug = false;
nbJoysticks = 0;
@@ -125,6 +126,8 @@
fichier >> _fullscreen;
if(propertieName=="Language")
fichier >> _lang;
+ if(propertieName=="JoySensibility")
+ fichier >> _joysens;
if(propertieName=="Touche")
{
int i;
@@ -227,6 +230,7 @@
fichier << "FXVol " << _soundFXvol << std::endl;
fichier << "Fullscreen " << _fullscreen << std::endl;
fichier << "Language " << _lang << std::endl;
+ fichier << "JoySensibility " << _joysens << std::endl;
for(int i = 0; i < nbControles; i++)
fichier << "Touche " << i << " " << keys[i] << std::endl;
for(int i = 0; i < nbControles; i++)

Modified: trunk/src/Configuration.h
==============================================================================
--- trunk/src/Configuration.h (original)
+++ trunk/src/Configuration.h Sat Jan 5 02:32:55 2008
@@ -8,8 +8,10 @@
#include <sstream>
#include "Joystick.h"

-#define JOY_SENSIBILITY 0
-#define SIGN(x) ((x)>JOY_SENSIBILITY ? 1 : ((x)<-JOY_SENSIBILITY ?
-1 : 0))
+#define MAX_JOY_SENSIBILITY 32767
+#define DEFAULT_JOY_SENSIBILITY 10000
+#define JOY_SENSIBILITY_STEP 1000
+#define SIGN(x) ((x)>(signed int)configuration->joySensibility() ? 1 :
((x)<-(signed int)configuration->joySensibility() ? -1 : 0))

// Les touches sont :
// 0 - Haut
@@ -36,6 +38,7 @@
bool debug() { return _debug; };
int musicvol() { return _musicvol; };
int soundFXvol() { return _soundFXvol; };
+ unsigned int joySensibility() { return _joysens; };
int touche(Controles touche) { return keys[touche]; };
std::string language() { return _lang; };
std::string getDataDir() { return datadir; };
@@ -46,6 +49,7 @@
void setMusicVol(unsigned int vol) { _musicvol = vol;
if(!_nosound) Mix_VolumeMusic(vol); };
void setSoundFXVol(unsigned int vol) { _soundFXvol = vol;
if(!_nosound) Mix_Volume(-1, vol); };
void setNoSound(bool opt) { _nosound = opt; };
+ void setJoySensibility(unsigned int opt) { _joysens = opt; };
void setJoystick(bool opt) { _joystick = opt; };
void setSpectrum(bool opt) { _spectrum = opt; };
void setFullscreen(bool opt) { _fullscreen = opt; };
@@ -66,6 +70,7 @@
int keys[nbControles];
int _musicvol;
int _soundFXvol;
+ unsigned int _joysens;
bool _nosound;
bool _spectrum;
bool _fullscreen;

Modified: trunk/src/Game.cc
==============================================================================
--- trunk/src/Game.cc (original)
+++ trunk/src/Game.cc Sat Jan 5 02:32:55 2008
@@ -132,7 +132,7 @@
std::string levelFile;
unsigned int nbLevels;

- // Recherche le fichier correspondant au prochain level dans la
liste des levels
+ // Recharge le fichier correspondant au level
{
levelsList.open((configuration->getDataDir() + filename.c_str()).c_str(),std::ios::in);
if(!levelsList)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sat Jan 5 02:32:55 2008
@@ -4,6 +4,7 @@
SUBDIRS = widgets

bin_PROGRAMS = AlThreat AlThreat_install
+AlThreat_CXXFLAGS = -Wall
AlThreat_CPPFLAGS = -DDATADIR="\"$(pkgdatadir)\"" -DSRCDIR="\"$(srcdir)\""
AlThreat_SOURCES = AlThreat.cc Arme.cc Bonus.cc Configuration.cc
Ennemi.cc Game.cc Level.cc Menu.cc MenuJeu.cc Options.cc Projectile.cc
Sprite.cc SpriteData.cc TypeBonus.cc TypeEnnemi.cc Vaisseau.cc
graphics.cc Arme.h Bonus.h Configuration.h Ennemi.h Game.h Level.h
Menu.h MenuJeu.h Options.h Projectile.h Sprite.h SpriteData.h
TypeBonus.h TypeEnnemi.h Vaisseau.h config.h graphics.h Joystick.h lang.h
AlThreat_install_SOURCES = AlThreat_install.in

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in (original)
+++ trunk/src/Makefile.in Sat Jan 5 02:32:55 2008
@@ -63,6 +63,8 @@
AlThreat_OBJECTS = $(am_AlThreat_OBJECTS)
AlThreat_LDADD = $(LDADD)
AlThreat_DEPENDENCIES = $(top_builddir)/src/widgets/libT3F_Widgets.a
+AlThreat_LINK = $(CXXLD) $(AlThreat_CXXFLAGS) $(CXXFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_AlThreat_install_OBJECTS =
AlThreat_install_OBJECTS = $(am_AlThreat_install_OBJECTS)
AlThreat_install_LDADD = $(LDADD)
@@ -213,6 +215,7 @@
INCLUDES = -I$(top_srcdir)/widgets
LDADD = $(top_builddir)/src/widgets/libT3F_Widgets.a
SUBDIRS = widgets
+AlThreat_CXXFLAGS = -Wall
AlThreat_CPPFLAGS = -DDATADIR="\"$(pkgdatadir)\"" -DSRCDIR="\"$(srcdir)\""
AlThreat_SOURCES = AlThreat.cc Arme.cc Bonus.cc Configuration.cc
Ennemi.cc Game.cc Level.cc Menu.cc MenuJeu.cc Options.cc Projectile.cc
Sprite.cc SpriteData.cc TypeBonus.cc TypeEnnemi.cc Vaisseau.cc
graphics.cc Arme.h Bonus.h Configuration.h Ennemi.h Game.h Level.h
Menu.h MenuJeu.h Options.h Projectile.h Sprite.h SpriteData.h
TypeBonus.h TypeEnnemi.h Vaisseau.h config.h graphics.h Joystick.h lang.h
AlThreat_install_SOURCES = AlThreat_install.in
@@ -294,7 +297,7 @@
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
AlThreat$(EXEEXT): $(AlThreat_OBJECTS) $(AlThreat_DEPENDENCIES)
@rm -f AlThreat$(EXEEXT)
- $(CXXLINK) $(AlThreat_OBJECTS) $(AlThreat_LDADD) $(LIBS)
+ $(AlThreat_LINK) $(AlThreat_OBJECTS) $(AlThreat_LDADD) $(LIBS)

mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -335,242 +338,242 @@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

AlThreat-AlThreat.o: AlThreat.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-AlThreat.o -MD -MP -MF $(DEPDIR)/AlThreat-AlThreat.Tpo -c -o
AlThreat-AlThreat.o `test -f 'AlThreat.cc' || echo '$(srcdir)/'`AlThreat.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-AlThreat.o -MD -MP -MF $(DEPDIR)/AlThreat-AlThreat.Tpo -c -o
AlThreat-AlThreat.o `test -f 'AlThreat.cc' || echo '$(srcdir)/'`AlThreat.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-AlThreat.Tpo $(DEPDIR)/AlThreat-AlThreat.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='AlThreat.cc'
object='AlThreat-AlThreat.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-AlThreat.o `test -f 'AlThreat.cc' || echo '$(srcdir)/'`AlThreat.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-AlThreat.o `test -f 'AlThreat.cc' || echo '$(srcdir)/'`AlThreat.cc

AlThreat-AlThreat.obj: AlThreat.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-AlThreat.obj -MD -MP -MF $(DEPDIR)/AlThreat-AlThreat.Tpo -c -o
AlThreat-AlThreat.obj `if test -f 'AlThreat.cc'; then
$(CYGPATH_W) 'AlThreat.cc'; else $(CYGPATH_W) '$(srcdir)/AlThreat.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-AlThreat.obj -MD -MP -MF $(DEPDIR)/AlThreat-AlThreat.Tpo -c -o
AlThreat-AlThreat.obj `if test -f 'AlThreat.cc'; then
$(CYGPATH_W) 'AlThreat.cc'; else $(CYGPATH_W) '$(srcdir)/AlThreat.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-AlThreat.Tpo $(DEPDIR)/AlThreat-AlThreat.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='AlThreat.cc'
object='AlThreat-AlThreat.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-AlThreat.obj `if test -f 'AlThreat.cc'; then
$(CYGPATH_W) 'AlThreat.cc'; else $(CYGPATH_W) '$(srcdir)/AlThreat.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-AlThreat.obj `if test -f 'AlThreat.cc'; then
$(CYGPATH_W) 'AlThreat.cc'; else $(CYGPATH_W) '$(srcdir)/AlThreat.cc'; fi`

AlThreat-Arme.o: Arme.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Arme.o -MD -MP -MF $(DEPDIR)/AlThreat-Arme.Tpo -c -o
AlThreat-Arme.o `test -f 'Arme.cc' || echo '$(srcdir)/'`Arme.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Arme.o -MD -MP -MF $(DEPDIR)/AlThreat-Arme.Tpo -c -o
AlThreat-Arme.o `test -f 'Arme.cc' || echo '$(srcdir)/'`Arme.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Arme.Tpo $(DEPDIR)/AlThreat-Arme.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Arme.cc'
object='AlThreat-Arme.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Arme.o `test -f 'Arme.cc' || echo '$(srcdir)/'`Arme.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Arme.o `test -f 'Arme.cc' || echo '$(srcdir)/'`Arme.cc

AlThreat-Arme.obj: Arme.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Arme.obj -MD -MP -MF $(DEPDIR)/AlThreat-Arme.Tpo -c -o
AlThreat-Arme.obj `if test -f 'Arme.cc'; then $(CYGPATH_W) 'Arme.cc';
else $(CYGPATH_W) '$(srcdir)/Arme.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Arme.obj -MD -MP -MF $(DEPDIR)/AlThreat-Arme.Tpo -c -o
AlThreat-Arme.obj `if test -f 'Arme.cc'; then $(CYGPATH_W) 'Arme.cc';
else $(CYGPATH_W) '$(srcdir)/Arme.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Arme.Tpo $(DEPDIR)/AlThreat-Arme.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Arme.cc'
object='AlThreat-Arme.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Arme.obj `if test -f 'Arme.cc'; then $(CYGPATH_W) 'Arme.cc';
else $(CYGPATH_W) '$(srcdir)/Arme.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Arme.obj `if test -f 'Arme.cc'; then $(CYGPATH_W) 'Arme.cc';
else $(CYGPATH_W) '$(srcdir)/Arme.cc'; fi`

AlThreat-Bonus.o: Bonus.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Bonus.o -MD -MP -MF $(DEPDIR)/AlThreat-Bonus.Tpo -c -o
AlThreat-Bonus.o `test -f 'Bonus.cc' || echo '$(srcdir)/'`Bonus.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Bonus.o -MD -MP -MF $(DEPDIR)/AlThreat-Bonus.Tpo -c -o
AlThreat-Bonus.o `test -f 'Bonus.cc' || echo '$(srcdir)/'`Bonus.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Bonus.Tpo $(DEPDIR)/AlThreat-Bonus.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Bonus.cc'
object='AlThreat-Bonus.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Bonus.o `test -f 'Bonus.cc' || echo '$(srcdir)/'`Bonus.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Bonus.o `test -f 'Bonus.cc' || echo '$(srcdir)/'`Bonus.cc

AlThreat-Bonus.obj: Bonus.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Bonus.obj -MD -MP -MF $(DEPDIR)/AlThreat-Bonus.Tpo -c -o
AlThreat-Bonus.obj `if test -f 'Bonus.cc'; then
$(CYGPATH_W) 'Bonus.cc'; else $(CYGPATH_W) '$(srcdir)/Bonus.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Bonus.obj -MD -MP -MF $(DEPDIR)/AlThreat-Bonus.Tpo -c -o
AlThreat-Bonus.obj `if test -f 'Bonus.cc'; then
$(CYGPATH_W) 'Bonus.cc'; else $(CYGPATH_W) '$(srcdir)/Bonus.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Bonus.Tpo $(DEPDIR)/AlThreat-Bonus.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Bonus.cc'
object='AlThreat-Bonus.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Bonus.obj `if test -f 'Bonus.cc'; then
$(CYGPATH_W) 'Bonus.cc'; else $(CYGPATH_W) '$(srcdir)/Bonus.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Bonus.obj `if test -f 'Bonus.cc'; then
$(CYGPATH_W) 'Bonus.cc'; else $(CYGPATH_W) '$(srcdir)/Bonus.cc'; fi`

AlThreat-Configuration.o: Configuration.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Configuration.o -MD -MP -MF
$(DEPDIR)/AlThreat-Configuration.Tpo -c -o AlThreat-Configuration.o
`test -f 'Configuration.cc' || echo '$(srcdir)/'`Configuration.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Configuration.o -MD -MP -MF
$(DEPDIR)/AlThreat-Configuration.Tpo -c -o AlThreat-Configuration.o
`test -f 'Configuration.cc' || echo '$(srcdir)/'`Configuration.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Configuration.Tpo $(DEPDIR)/AlThreat-Configuration.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Configuration.cc'
object='AlThreat-Configuration.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Configuration.o `test -f 'Configuration.cc' || echo '$(srcdir)/'`Configuration.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Configuration.o `test -f 'Configuration.cc' || echo '$(srcdir)/'`Configuration.cc

AlThreat-Configuration.obj: Configuration.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Configuration.obj -MD -MP -MF
$(DEPDIR)/AlThreat-Configuration.Tpo -c -o AlThreat-Configuration.obj
`if test -f 'Configuration.cc'; then $(CYGPATH_W) 'Configuration.cc';
else $(CYGPATH_W) '$(srcdir)/Configuration.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Configuration.obj -MD -MP -MF
$(DEPDIR)/AlThreat-Configuration.Tpo -c -o AlThreat-Configuration.obj
`if test -f 'Configuration.cc'; then $(CYGPATH_W) 'Configuration.cc';
else $(CYGPATH_W) '$(srcdir)/Configuration.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Configuration.Tpo $(DEPDIR)/AlThreat-Configuration.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Configuration.cc'
object='AlThreat-Configuration.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Configuration.obj `if test -f 'Configuration.cc'; then
$(CYGPATH_W) 'Configuration.cc'; else
$(CYGPATH_W) '$(srcdir)/Configuration.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Configuration.obj `if test -f 'Configuration.cc'; then
$(CYGPATH_W) 'Configuration.cc'; else
$(CYGPATH_W) '$(srcdir)/Configuration.cc'; fi`

AlThreat-Ennemi.o: Ennemi.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Ennemi.o -MD -MP -MF $(DEPDIR)/AlThreat-Ennemi.Tpo -c -o
AlThreat-Ennemi.o `test -f 'Ennemi.cc' || echo '$(srcdir)/'`Ennemi.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Ennemi.o -MD -MP -MF $(DEPDIR)/AlThreat-Ennemi.Tpo -c -o
AlThreat-Ennemi.o `test -f 'Ennemi.cc' || echo '$(srcdir)/'`Ennemi.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Ennemi.Tpo $(DEPDIR)/AlThreat-Ennemi.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Ennemi.cc'
object='AlThreat-Ennemi.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Ennemi.o `test -f 'Ennemi.cc' || echo '$(srcdir)/'`Ennemi.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Ennemi.o `test -f 'Ennemi.cc' || echo '$(srcdir)/'`Ennemi.cc

AlThreat-Ennemi.obj: Ennemi.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Ennemi.obj -MD -MP -MF $(DEPDIR)/AlThreat-Ennemi.Tpo -c -o
AlThreat-Ennemi.obj `if test -f 'Ennemi.cc'; then
$(CYGPATH_W) 'Ennemi.cc'; else $(CYGPATH_W) '$(srcdir)/Ennemi.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Ennemi.obj -MD -MP -MF $(DEPDIR)/AlThreat-Ennemi.Tpo -c -o
AlThreat-Ennemi.obj `if test -f 'Ennemi.cc'; then
$(CYGPATH_W) 'Ennemi.cc'; else $(CYGPATH_W) '$(srcdir)/Ennemi.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Ennemi.Tpo $(DEPDIR)/AlThreat-Ennemi.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Ennemi.cc'
object='AlThreat-Ennemi.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Ennemi.obj `if test -f 'Ennemi.cc'; then
$(CYGPATH_W) 'Ennemi.cc'; else $(CYGPATH_W) '$(srcdir)/Ennemi.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Ennemi.obj `if test -f 'Ennemi.cc'; then
$(CYGPATH_W) 'Ennemi.cc'; else $(CYGPATH_W) '$(srcdir)/Ennemi.cc'; fi`

AlThreat-Game.o: Game.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Game.o -MD -MP -MF $(DEPDIR)/AlThreat-Game.Tpo -c -o
AlThreat-Game.o `test -f 'Game.cc' || echo '$(srcdir)/'`Game.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Game.o -MD -MP -MF $(DEPDIR)/AlThreat-Game.Tpo -c -o
AlThreat-Game.o `test -f 'Game.cc' || echo '$(srcdir)/'`Game.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Game.Tpo $(DEPDIR)/AlThreat-Game.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Game.cc'
object='AlThreat-Game.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Game.o `test -f 'Game.cc' || echo '$(srcdir)/'`Game.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Game.o `test -f 'Game.cc' || echo '$(srcdir)/'`Game.cc

AlThreat-Game.obj: Game.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Game.obj -MD -MP -MF $(DEPDIR)/AlThreat-Game.Tpo -c -o
AlThreat-Game.obj `if test -f 'Game.cc'; then $(CYGPATH_W) 'Game.cc';
else $(CYGPATH_W) '$(srcdir)/Game.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Game.obj -MD -MP -MF $(DEPDIR)/AlThreat-Game.Tpo -c -o
AlThreat-Game.obj `if test -f 'Game.cc'; then $(CYGPATH_W) 'Game.cc';
else $(CYGPATH_W) '$(srcdir)/Game.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Game.Tpo $(DEPDIR)/AlThreat-Game.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Game.cc'
object='AlThreat-Game.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Game.obj `if test -f 'Game.cc'; then $(CYGPATH_W) 'Game.cc';
else $(CYGPATH_W) '$(srcdir)/Game.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Game.obj `if test -f 'Game.cc'; then $(CYGPATH_W) 'Game.cc';
else $(CYGPATH_W) '$(srcdir)/Game.cc'; fi`

AlThreat-Level.o: Level.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Level.o -MD -MP -MF $(DEPDIR)/AlThreat-Level.Tpo -c -o
AlThreat-Level.o `test -f 'Level.cc' || echo '$(srcdir)/'`Level.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Level.o -MD -MP -MF $(DEPDIR)/AlThreat-Level.Tpo -c -o
AlThreat-Level.o `test -f 'Level.cc' || echo '$(srcdir)/'`Level.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Level.Tpo $(DEPDIR)/AlThreat-Level.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Level.cc'
object='AlThreat-Level.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Level.o `test -f 'Level.cc' || echo '$(srcdir)/'`Level.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Level.o `test -f 'Level.cc' || echo '$(srcdir)/'`Level.cc

AlThreat-Level.obj: Level.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Level.obj -MD -MP -MF $(DEPDIR)/AlThreat-Level.Tpo -c -o
AlThreat-Level.obj `if test -f 'Level.cc'; then
$(CYGPATH_W) 'Level.cc'; else $(CYGPATH_W) '$(srcdir)/Level.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Level.obj -MD -MP -MF $(DEPDIR)/AlThreat-Level.Tpo -c -o
AlThreat-Level.obj `if test -f 'Level.cc'; then
$(CYGPATH_W) 'Level.cc'; else $(CYGPATH_W) '$(srcdir)/Level.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Level.Tpo $(DEPDIR)/AlThreat-Level.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Level.cc'
object='AlThreat-Level.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Level.obj `if test -f 'Level.cc'; then
$(CYGPATH_W) 'Level.cc'; else $(CYGPATH_W) '$(srcdir)/Level.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Level.obj `if test -f 'Level.cc'; then
$(CYGPATH_W) 'Level.cc'; else $(CYGPATH_W) '$(srcdir)/Level.cc'; fi`

AlThreat-Menu.o: Menu.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Menu.o -MD -MP -MF $(DEPDIR)/AlThreat-Menu.Tpo -c -o
AlThreat-Menu.o `test -f 'Menu.cc' || echo '$(srcdir)/'`Menu.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Menu.o -MD -MP -MF $(DEPDIR)/AlThreat-Menu.Tpo -c -o
AlThreat-Menu.o `test -f 'Menu.cc' || echo '$(srcdir)/'`Menu.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Menu.Tpo $(DEPDIR)/AlThreat-Menu.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Menu.cc'
object='AlThreat-Menu.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Menu.o `test -f 'Menu.cc' || echo '$(srcdir)/'`Menu.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Menu.o `test -f 'Menu.cc' || echo '$(srcdir)/'`Menu.cc

AlThreat-Menu.obj: Menu.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Menu.obj -MD -MP -MF $(DEPDIR)/AlThreat-Menu.Tpo -c -o
AlThreat-Menu.obj `if test -f 'Menu.cc'; then $(CYGPATH_W) 'Menu.cc';
else $(CYGPATH_W) '$(srcdir)/Menu.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Menu.obj -MD -MP -MF $(DEPDIR)/AlThreat-Menu.Tpo -c -o
AlThreat-Menu.obj `if test -f 'Menu.cc'; then $(CYGPATH_W) 'Menu.cc';
else $(CYGPATH_W) '$(srcdir)/Menu.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Menu.Tpo $(DEPDIR)/AlThreat-Menu.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Menu.cc'
object='AlThreat-Menu.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Menu.obj `if test -f 'Menu.cc'; then $(CYGPATH_W) 'Menu.cc';
else $(CYGPATH_W) '$(srcdir)/Menu.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Menu.obj `if test -f 'Menu.cc'; then $(CYGPATH_W) 'Menu.cc';
else $(CYGPATH_W) '$(srcdir)/Menu.cc'; fi`

AlThreat-MenuJeu.o: MenuJeu.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-MenuJeu.o -MD -MP -MF $(DEPDIR)/AlThreat-MenuJeu.Tpo -c -o
AlThreat-MenuJeu.o `test -f 'MenuJeu.cc' || echo '$(srcdir)/'`MenuJeu.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-MenuJeu.o -MD -MP -MF $(DEPDIR)/AlThreat-MenuJeu.Tpo -c -o
AlThreat-MenuJeu.o `test -f 'MenuJeu.cc' || echo '$(srcdir)/'`MenuJeu.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-MenuJeu.Tpo $(DEPDIR)/AlThreat-MenuJeu.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MenuJeu.cc'
object='AlThreat-MenuJeu.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-MenuJeu.o `test -f 'MenuJeu.cc' || echo '$(srcdir)/'`MenuJeu.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-MenuJeu.o `test -f 'MenuJeu.cc' || echo '$(srcdir)/'`MenuJeu.cc

AlThreat-MenuJeu.obj: MenuJeu.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-MenuJeu.obj -MD -MP -MF $(DEPDIR)/AlThreat-MenuJeu.Tpo -c -o
AlThreat-MenuJeu.obj `if test -f 'MenuJeu.cc'; then
$(CYGPATH_W) 'MenuJeu.cc'; else $(CYGPATH_W) '$(srcdir)/MenuJeu.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-MenuJeu.obj -MD -MP -MF $(DEPDIR)/AlThreat-MenuJeu.Tpo -c -o
AlThreat-MenuJeu.obj `if test -f 'MenuJeu.cc'; then
$(CYGPATH_W) 'MenuJeu.cc'; else $(CYGPATH_W) '$(srcdir)/MenuJeu.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-MenuJeu.Tpo $(DEPDIR)/AlThreat-MenuJeu.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MenuJeu.cc'
object='AlThreat-MenuJeu.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-MenuJeu.obj `if test -f 'MenuJeu.cc'; then
$(CYGPATH_W) 'MenuJeu.cc'; else $(CYGPATH_W) '$(srcdir)/MenuJeu.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-MenuJeu.obj `if test -f 'MenuJeu.cc'; then
$(CYGPATH_W) 'MenuJeu.cc'; else $(CYGPATH_W) '$(srcdir)/MenuJeu.cc'; fi`

AlThreat-Options.o: Options.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Options.o -MD -MP -MF $(DEPDIR)/AlThreat-Options.Tpo -c -o
AlThreat-Options.o `test -f 'Options.cc' || echo '$(srcdir)/'`Options.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Options.o -MD -MP -MF $(DEPDIR)/AlThreat-Options.Tpo -c -o
AlThreat-Options.o `test -f 'Options.cc' || echo '$(srcdir)/'`Options.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Options.Tpo $(DEPDIR)/AlThreat-Options.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Options.cc'
object='AlThreat-Options.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Options.o `test -f 'Options.cc' || echo '$(srcdir)/'`Options.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Options.o `test -f 'Options.cc' || echo '$(srcdir)/'`Options.cc

AlThreat-Options.obj: Options.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Options.obj -MD -MP -MF $(DEPDIR)/AlThreat-Options.Tpo -c -o
AlThreat-Options.obj `if test -f 'Options.cc'; then
$(CYGPATH_W) 'Options.cc'; else $(CYGPATH_W) '$(srcdir)/Options.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Options.obj -MD -MP -MF $(DEPDIR)/AlThreat-Options.Tpo -c -o
AlThreat-Options.obj `if test -f 'Options.cc'; then
$(CYGPATH_W) 'Options.cc'; else $(CYGPATH_W) '$(srcdir)/Options.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Options.Tpo $(DEPDIR)/AlThreat-Options.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Options.cc'
object='AlThreat-Options.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Options.obj `if test -f 'Options.cc'; then
$(CYGPATH_W) 'Options.cc'; else $(CYGPATH_W) '$(srcdir)/Options.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Options.obj `if test -f 'Options.cc'; then
$(CYGPATH_W) 'Options.cc'; else $(CYGPATH_W) '$(srcdir)/Options.cc'; fi`

AlThreat-Projectile.o: Projectile.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Projectile.o -MD -MP -MF $(DEPDIR)/AlThreat-Projectile.Tpo -c
-o AlThreat-Projectile.o `test -f 'Projectile.cc' || echo '$(srcdir)/'`Projectile.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Projectile.o -MD -MP -MF $(DEPDIR)/AlThreat-Projectile.Tpo -c
-o AlThreat-Projectile.o `test -f 'Projectile.cc' || echo '$(srcdir)/'`Projectile.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Projectile.Tpo $(DEPDIR)/AlThreat-Projectile.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Projectile.cc'
object='AlThreat-Projectile.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Projectile.o `test -f 'Projectile.cc' || echo '$(srcdir)/'`Projectile.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Projectile.o `test -f 'Projectile.cc' || echo '$(srcdir)/'`Projectile.cc

AlThreat-Projectile.obj: Projectile.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Projectile.obj -MD -MP -MF $(DEPDIR)/AlThreat-Projectile.Tpo
-c -o AlThreat-Projectile.obj `if test -f 'Projectile.cc'; then
$(CYGPATH_W) 'Projectile.cc'; else
$(CYGPATH_W) '$(srcdir)/Projectile.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Projectile.obj -MD -MP -MF $(DEPDIR)/AlThreat-Projectile.Tpo
-c -o AlThreat-Projectile.obj `if test -f 'Projectile.cc'; then
$(CYGPATH_W) 'Projectile.cc'; else
$(CYGPATH_W) '$(srcdir)/Projectile.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Projectile.Tpo $(DEPDIR)/AlThreat-Projectile.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Projectile.cc'
object='AlThreat-Projectile.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Projectile.obj `if test -f 'Projectile.cc'; then
$(CYGPATH_W) 'Projectile.cc'; else
$(CYGPATH_W) '$(srcdir)/Projectile.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Projectile.obj `if test -f 'Projectile.cc'; then
$(CYGPATH_W) 'Projectile.cc'; else
$(CYGPATH_W) '$(srcdir)/Projectile.cc'; fi`

AlThreat-Sprite.o: Sprite.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Sprite.o -MD -MP -MF $(DEPDIR)/AlThreat-Sprite.Tpo -c -o
AlThreat-Sprite.o `test -f 'Sprite.cc' || echo '$(srcdir)/'`Sprite.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Sprite.o -MD -MP -MF $(DEPDIR)/AlThreat-Sprite.Tpo -c -o
AlThreat-Sprite.o `test -f 'Sprite.cc' || echo '$(srcdir)/'`Sprite.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Sprite.Tpo $(DEPDIR)/AlThreat-Sprite.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Sprite.cc'
object='AlThreat-Sprite.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Sprite.o `test -f 'Sprite.cc' || echo '$(srcdir)/'`Sprite.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Sprite.o `test -f 'Sprite.cc' || echo '$(srcdir)/'`Sprite.cc

AlThreat-Sprite.obj: Sprite.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Sprite.obj -MD -MP -MF $(DEPDIR)/AlThreat-Sprite.Tpo -c -o
AlThreat-Sprite.obj `if test -f 'Sprite.cc'; then
$(CYGPATH_W) 'Sprite.cc'; else $(CYGPATH_W) '$(srcdir)/Sprite.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Sprite.obj -MD -MP -MF $(DEPDIR)/AlThreat-Sprite.Tpo -c -o
AlThreat-Sprite.obj `if test -f 'Sprite.cc'; then
$(CYGPATH_W) 'Sprite.cc'; else $(CYGPATH_W) '$(srcdir)/Sprite.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Sprite.Tpo $(DEPDIR)/AlThreat-Sprite.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Sprite.cc'
object='AlThreat-Sprite.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Sprite.obj `if test -f 'Sprite.cc'; then
$(CYGPATH_W) 'Sprite.cc'; else $(CYGPATH_W) '$(srcdir)/Sprite.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Sprite.obj `if test -f 'Sprite.cc'; then
$(CYGPATH_W) 'Sprite.cc'; else $(CYGPATH_W) '$(srcdir)/Sprite.cc'; fi`

AlThreat-SpriteData.o: SpriteData.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-SpriteData.o -MD -MP -MF $(DEPDIR)/AlThreat-SpriteData.Tpo -c
-o AlThreat-SpriteData.o `test -f 'SpriteData.cc' || echo '$(srcdir)/'`SpriteData.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-SpriteData.o -MD -MP -MF $(DEPDIR)/AlThreat-SpriteData.Tpo -c
-o AlThreat-SpriteData.o `test -f 'SpriteData.cc' || echo '$(srcdir)/'`SpriteData.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-SpriteData.Tpo $(DEPDIR)/AlThreat-SpriteData.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='SpriteData.cc'
object='AlThreat-SpriteData.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-SpriteData.o `test -f 'SpriteData.cc' || echo '$(srcdir)/'`SpriteData.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-SpriteData.o `test -f 'SpriteData.cc' || echo '$(srcdir)/'`SpriteData.cc

AlThreat-SpriteData.obj: SpriteData.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-SpriteData.obj -MD -MP -MF $(DEPDIR)/AlThreat-SpriteData.Tpo
-c -o AlThreat-SpriteData.obj `if test -f 'SpriteData.cc'; then
$(CYGPATH_W) 'SpriteData.cc'; else
$(CYGPATH_W) '$(srcdir)/SpriteData.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-SpriteData.obj -MD -MP -MF $(DEPDIR)/AlThreat-SpriteData.Tpo
-c -o AlThreat-SpriteData.obj `if test -f 'SpriteData.cc'; then
$(CYGPATH_W) 'SpriteData.cc'; else
$(CYGPATH_W) '$(srcdir)/SpriteData.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-SpriteData.Tpo $(DEPDIR)/AlThreat-SpriteData.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='SpriteData.cc'
object='AlThreat-SpriteData.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-SpriteData.obj `if test -f 'SpriteData.cc'; then
$(CYGPATH_W) 'SpriteData.cc'; else
$(CYGPATH_W) '$(srcdir)/SpriteData.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-SpriteData.obj `if test -f 'SpriteData.cc'; then
$(CYGPATH_W) 'SpriteData.cc'; else
$(CYGPATH_W) '$(srcdir)/SpriteData.cc'; fi`

AlThreat-TypeBonus.o: TypeBonus.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeBonus.o -MD -MP -MF $(DEPDIR)/AlThreat-TypeBonus.Tpo -c -o
AlThreat-TypeBonus.o `test -f 'TypeBonus.cc' || echo '$(srcdir)/'`TypeBonus.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeBonus.o -MD -MP -MF $(DEPDIR)/AlThreat-TypeBonus.Tpo -c -o
AlThreat-TypeBonus.o `test -f 'TypeBonus.cc' || echo '$(srcdir)/'`TypeBonus.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-TypeBonus.Tpo $(DEPDIR)/AlThreat-TypeBonus.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TypeBonus.cc'
object='AlThreat-TypeBonus.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeBonus.o `test -f 'TypeBonus.cc' || echo '$(srcdir)/'`TypeBonus.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeBonus.o `test -f 'TypeBonus.cc' || echo '$(srcdir)/'`TypeBonus.cc

AlThreat-TypeBonus.obj: TypeBonus.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeBonus.obj -MD -MP -MF $(DEPDIR)/AlThreat-TypeBonus.Tpo -c
-o AlThreat-TypeBonus.obj `if test -f 'TypeBonus.cc'; then
$(CYGPATH_W) 'TypeBonus.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeBonus.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeBonus.obj -MD -MP -MF $(DEPDIR)/AlThreat-TypeBonus.Tpo -c
-o AlThreat-TypeBonus.obj `if test -f 'TypeBonus.cc'; then
$(CYGPATH_W) 'TypeBonus.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeBonus.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-TypeBonus.Tpo $(DEPDIR)/AlThreat-TypeBonus.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TypeBonus.cc'
object='AlThreat-TypeBonus.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeBonus.obj `if test -f 'TypeBonus.cc'; then
$(CYGPATH_W) 'TypeBonus.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeBonus.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeBonus.obj `if test -f 'TypeBonus.cc'; then
$(CYGPATH_W) 'TypeBonus.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeBonus.cc'; fi`

AlThreat-TypeEnnemi.o: TypeEnnemi.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeEnnemi.o -MD -MP -MF $(DEPDIR)/AlThreat-TypeEnnemi.Tpo -c
-o AlThreat-TypeEnnemi.o `test -f 'TypeEnnemi.cc' || echo '$(srcdir)/'`TypeEnnemi.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeEnnemi.o -MD -MP -MF $(DEPDIR)/AlThreat-TypeEnnemi.Tpo -c
-o AlThreat-TypeEnnemi.o `test -f 'TypeEnnemi.cc' || echo '$(srcdir)/'`TypeEnnemi.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-TypeEnnemi.Tpo $(DEPDIR)/AlThreat-TypeEnnemi.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TypeEnnemi.cc'
object='AlThreat-TypeEnnemi.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeEnnemi.o `test -f 'TypeEnnemi.cc' || echo '$(srcdir)/'`TypeEnnemi.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeEnnemi.o `test -f 'TypeEnnemi.cc' || echo '$(srcdir)/'`TypeEnnemi.cc

AlThreat-TypeEnnemi.obj: TypeEnnemi.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeEnnemi.obj -MD -MP -MF $(DEPDIR)/AlThreat-TypeEnnemi.Tpo
-c -o AlThreat-TypeEnnemi.obj `if test -f 'TypeEnnemi.cc'; then
$(CYGPATH_W) 'TypeEnnemi.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeEnnemi.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-TypeEnnemi.obj -MD -MP -MF $(DEPDIR)/AlThreat-TypeEnnemi.Tpo
-c -o AlThreat-TypeEnnemi.obj `if test -f 'TypeEnnemi.cc'; then
$(CYGPATH_W) 'TypeEnnemi.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeEnnemi.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-TypeEnnemi.Tpo $(DEPDIR)/AlThreat-TypeEnnemi.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TypeEnnemi.cc'
object='AlThreat-TypeEnnemi.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeEnnemi.obj `if test -f 'TypeEnnemi.cc'; then
$(CYGPATH_W) 'TypeEnnemi.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeEnnemi.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-TypeEnnemi.obj `if test -f 'TypeEnnemi.cc'; then
$(CYGPATH_W) 'TypeEnnemi.cc'; else
$(CYGPATH_W) '$(srcdir)/TypeEnnemi.cc'; fi`

AlThreat-Vaisseau.o: Vaisseau.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Vaisseau.o -MD -MP -MF $(DEPDIR)/AlThreat-Vaisseau.Tpo -c -o
AlThreat-Vaisseau.o `test -f 'Vaisseau.cc' || echo '$(srcdir)/'`Vaisseau.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Vaisseau.o -MD -MP -MF $(DEPDIR)/AlThreat-Vaisseau.Tpo -c -o
AlThreat-Vaisseau.o `test -f 'Vaisseau.cc' || echo '$(srcdir)/'`Vaisseau.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Vaisseau.Tpo $(DEPDIR)/AlThreat-Vaisseau.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Vaisseau.cc'
object='AlThreat-Vaisseau.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Vaisseau.o `test -f 'Vaisseau.cc' || echo '$(srcdir)/'`Vaisseau.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Vaisseau.o `test -f 'Vaisseau.cc' || echo '$(srcdir)/'`Vaisseau.cc

AlThreat-Vaisseau.obj: Vaisseau.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Vaisseau.obj -MD -MP -MF $(DEPDIR)/AlThreat-Vaisseau.Tpo -c -o
AlThreat-Vaisseau.obj `if test -f 'Vaisseau.cc'; then
$(CYGPATH_W) 'Vaisseau.cc'; else $(CYGPATH_W) '$(srcdir)/Vaisseau.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-Vaisseau.obj -MD -MP -MF $(DEPDIR)/AlThreat-Vaisseau.Tpo -c -o
AlThreat-Vaisseau.obj `if test -f 'Vaisseau.cc'; then
$(CYGPATH_W) 'Vaisseau.cc'; else $(CYGPATH_W) '$(srcdir)/Vaisseau.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-Vaisseau.Tpo $(DEPDIR)/AlThreat-Vaisseau.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Vaisseau.cc'
object='AlThreat-Vaisseau.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Vaisseau.obj `if test -f 'Vaisseau.cc'; then
$(CYGPATH_W) 'Vaisseau.cc'; else $(CYGPATH_W) '$(srcdir)/Vaisseau.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-Vaisseau.obj `if test -f 'Vaisseau.cc'; then
$(CYGPATH_W) 'Vaisseau.cc'; else $(CYGPATH_W) '$(srcdir)/Vaisseau.cc'; fi`

AlThreat-graphics.o: graphics.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-graphics.o -MD -MP -MF $(DEPDIR)/AlThreat-graphics.Tpo -c -o
AlThreat-graphics.o `test -f 'graphics.cc' || echo '$(srcdir)/'`graphics.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-graphics.o -MD -MP -MF $(DEPDIR)/AlThreat-graphics.Tpo -c -o
AlThreat-graphics.o `test -f 'graphics.cc' || echo '$(srcdir)/'`graphics.cc
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-graphics.Tpo $(DEPDIR)/AlThreat-graphics.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='graphics.cc'
object='AlThreat-graphics.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-graphics.o `test -f 'graphics.cc' || echo '$(srcdir)/'`graphics.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-graphics.o `test -f 'graphics.cc' || echo '$(srcdir)/'`graphics.cc

AlThreat-graphics.obj: graphics.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-graphics.obj -MD -MP -MF $(DEPDIR)/AlThreat-graphics.Tpo -c -o
AlThreat-graphics.obj `if test -f 'graphics.cc'; then
$(CYGPATH_W) 'graphics.cc'; else $(CYGPATH_W) '$(srcdir)/graphics.cc'; fi`
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -MT
AlThreat-graphics.obj -MD -MP -MF $(DEPDIR)/AlThreat-graphics.Tpo -c -o
AlThreat-graphics.obj `if test -f 'graphics.cc'; then
$(CYGPATH_W) 'graphics.cc'; else $(CYGPATH_W) '$(srcdir)/graphics.cc'; fi`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/AlThreat-graphics.Tpo $(DEPDIR)/AlThreat-graphics.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='graphics.cc'
object='AlThreat-graphics.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-graphics.obj `if test -f 'graphics.cc'; then
$(CYGPATH_W) 'graphics.cc'; else $(CYGPATH_W) '$(srcdir)/graphics.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AlThreat_CPPFLAGS) $(CPPFLAGS) $(AlThreat_CXXFLAGS) $(CXXFLAGS) -c -o
AlThreat-graphics.obj `if test -f 'graphics.cc'; then
$(CYGPATH_W) 'graphics.cc'; else $(CYGPATH_W) '$(srcdir)/graphics.cc'; fi`

# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.

Modified: trunk/src/Menu.cc
==============================================================================
--- trunk/src/Menu.cc (original)
+++ trunk/src/Menu.cc Sat Jan 5 02:32:55 2008
@@ -11,7 +11,6 @@
texte = NULL;
fond = NULL;

- SDL_Surface *Screen = SDL_GetVideoSurface();
configuration = Configuration::getConfiguration();
if(!configuration->nosound())
{
@@ -21,10 +20,9 @@

}
fond = loadImage((configuration->getDataDir() + "images/Menu.png").c_str());
- Selected = 0;

menuLayer = new FocusContainer();
- init_text();
+ init_text(MenuItem_Adventure);
}

Menu::~Menu()
@@ -66,19 +64,20 @@
}
}

-void Menu::init_text()
+void Menu::init_text(MenuItems sel)
{
SDL_Surface *Screen = SDL_GetVideoSurface();
if(texte) delete[] texte;
+ texte = NULL;
if(menuLayer) menuLayer->deleteAll();

- nbChoix = 5;
+ nbChoix = NbMenuItems;
texte = new std::string[nbChoix];
- texte[0] = _("Adventure");
- texte[1] = _("Training");
- texte[2] = _("Options");
- texte[3] = _("Credits");
- texte[4] = _("Quit");
+ texte[MenuItem_Adventure] = _("Adventure");
+ texte[MenuItem_Training] = _("Training");
+ texte[MenuItem_Options] = _("Options");
+ texte[MenuItem_Credits] = _("Credits");
+ texte[MenuItem_Quit] = _("Quit");

SDL_Rect dest[nbChoix];
MenuButton *choixBoutons[nbChoix];
@@ -93,14 +92,16 @@
menuLayer->addWidget(choixBoutons[i]);
}

- menuLayer->focus(choixBoutons[0]);
+ if(sel < MenuItem_Adventure || sel >= NbMenuItems) sel = MenuItem_Adventure;
+ Selected = sel;
+ menuLayer->focus(choixBoutons[sel]);
}

void Menu::show_options()
{
- Options *options = new Options(fond, musique,
configuration->getDataDir() + "sons/Menusong.ogg");
- options->afficher();
- init_text();
+ Options options(fond, musique, configuration->getDataDir() + "sons/Menusong.ogg");
+ options.afficher();
+ init_text(MenuItem_Options);
}

void Menu::show_credits()

Modified: trunk/src/Menu.h
==============================================================================
--- trunk/src/Menu.h (original)
+++ trunk/src/Menu.h Sat Jan 5 02:32:55 2008
@@ -10,6 +10,8 @@
#include "widgets/switch.h"
#include "widgets/menubutton.h"

+enum MenuItems { MenuItem_Adventure = 0, MenuItem_Training,
MenuItem_Options, MenuItem_Credits, MenuItem_Quit, NbMenuItems };
+
class Menu
{
public:
@@ -19,7 +21,7 @@
unsigned char show(Game *&jeu);
~Menu();
void init();
- void init_text();
+ void init_text(MenuItems sel);

private:
Menu();

Modified: trunk/src/Options.cc
==============================================================================
--- trunk/src/Options.cc (original)
+++ trunk/src/Options.cc Sat Jan 5 02:32:55 2008
@@ -10,7 +10,7 @@
optionsLayer = new FocusContainer();

SDL_Rect fs_pos;
- fs_pos.x = 70; fs_pos.y = 150; fs_pos.w = 300; fs_pos.h = 25;
+ fs_pos.x = 70; fs_pos.y = 130; fs_pos.w = 300; fs_pos.h = 25;
std::string textefs = _("Fullscreen");
Checkbox *fs_box = new Checkbox(fs_pos, textefs, &fs_var);
fs_box->setImages((configuration->getDataDir()
+ "images/on.png").c_str(), (configuration->getDataDir() + "images/off.png").c_str());
@@ -18,7 +18,7 @@
fs_box->setBorderSize(0);

SDL_Rect ns_pos;
- ns_pos.x = 70; ns_pos.y = 180; ns_pos.w = 300; ns_pos.h = 25;
+ ns_pos.x = 70; ns_pos.y = 160; ns_pos.w = 300; ns_pos.h = 25;
std::string textens = _("Mute");
Checkbox *ns_box = new Checkbox(ns_pos, textens, &ns_var);
ns_box->setImages((configuration->getDataDir()
+ "images/on.png").c_str(), (configuration->getDataDir() + "images/off.png").c_str());
@@ -26,25 +26,35 @@
ns_box->setBorderSize(0);

SDL_Rect mus_label_pos;
- mus_label_pos.x = 70; mus_label_pos.y = 230; mus_label_pos.w = 250;
mus_label_pos.h = 25;
+ mus_label_pos.x = 100; mus_label_pos.y = 210; mus_label_pos.w = 250;
mus_label_pos.h = 25;
Label *mus_label = new Label(mus_label_pos, _("Music volume:"), T3F_LEFT);
mus_label->setFont((configuration->getDataDir()
+ "fonts/vera.ttf").c_str(), 20);
mus_label->setBorderSize(0);

SDL_Rect mus_pos;
- mus_pos.x = 330; mus_pos.y = 230; mus_pos.w = 300; mus_pos.h = 25;
+ mus_pos.x = 350; mus_pos.y = 210; mus_pos.w = 300; mus_pos.h = 25;
Jauge *mus_jauge = new Jauge(mus_pos, 0, MIX_MAX_VOLUME, &mus_vol, T3F_HOR);

SDL_Rect fx_label_pos;
- fx_label_pos.x = 70; fx_label_pos.y = 265; fx_label_pos.w = 250;
fx_label_pos.h = 25;
+ fx_label_pos.x = 100; fx_label_pos.y = 245; fx_label_pos.w = 250;
fx_label_pos.h = 25;
Label *fx_label = new Label(fx_label_pos, _("Sounds FX volume:"), T3F_LEFT);
fx_label->setFont((configuration->getDataDir()
+ "fonts/vera.ttf").c_str(), 20);
fx_label->setBorderSize(0);

SDL_Rect fx_pos;
- fx_pos.x = 330; fx_pos.y = 265; fx_pos.w = 300; fx_pos.h = 25;
+ fx_pos.x = 350; fx_pos.y = 245; fx_pos.w = 300; fx_pos.h = 25;
Jauge *fx_jauge = new Jauge(fx_pos, 0, MIX_MAX_VOLUME, &fx_vol, T3F_HOR);

+ SDL_Rect sens_label_pos;
+ sens_label_pos.x = 70; sens_label_pos.y = 300; sens_label_pos.w =
250; sens_label_pos.h = 25;
+ Label *sens_label = new Label(sens_label_pos, _("Joystick
sensibility:"), T3F_LEFT);
+ sens_label->setFont((configuration->getDataDir()
+ "fonts/vera.ttf").c_str(), 20);
+ sens_label->setBorderSize(0);
+
+ SDL_Rect sens_pos;
+ sens_pos.x = 350; sens_pos.y = 300; sens_pos.w = 300; sens_pos.h = 25;
+ Jauge *sens_jauge = new Jauge(sens_pos, 0,
MAX_JOY_SENSIBILITY/JOY_SENSIBILITY_STEP, &joy_sens, T3F_HOR);
+
SDL_Rect control_pos;
control_pos.x = 70; control_pos.y = 330; control_pos.w = 300;
control_pos.h = 25;
Switch *control_bouton = new Switch(control_pos, _("Modify
controls"), &controlModif);
@@ -60,7 +70,7 @@
lang_pos.x = 330; lang_pos.y = 380; lang_pos.w = 300; lang_pos.h = 100;
lang_list = new Liste(lang_pos);
lang_list->setFont((configuration->getDataDir()
+ "fonts/babelfish.ttf"), 30);
- for(int i=0; i < sizeof(language_names)/sizeof(std::string); i++)
+ for(unsigned int i=0; i <
sizeof(language_names)/sizeof(std::string); i++)
{
lang_list->addValue(new std::string(language_names[i]));
if(language_codes[i] == configuration->language())
@@ -85,10 +95,18 @@
fx_jauge->setActive(false);
}

+ if(!configuration->joystick())
+ {
+ sens_jauge->setActive(false);
+ sens_label->setActive(false);
+ }
+
unactiveMusLabel = mus_label->getUnactivePtr();
unactiveMusJauge = mus_jauge->getUnactivePtr();
unactiveFXLabel = fx_label->getUnactivePtr();
unactiveFXJauge = fx_jauge->getUnactivePtr();
+ unactiveSensLabel = sens_label->getUnactivePtr();
+ unactiveSensJauge = sens_jauge->getUnactivePtr();

optionsLayer->addWidget(fs_box);
optionsLayer->addWidget(ns_box);
@@ -96,6 +114,8 @@
optionsLayer->addWidget(mus_jauge);
optionsLayer->addWidget(fx_label);
optionsLayer->addWidget(fx_jauge);
+ optionsLayer->addWidget(sens_label);
+ optionsLayer->addWidget(sens_jauge);
optionsLayer->addWidget(control_bouton);
optionsLayer->addWidget(lang_label);
optionsLayer->addWidget(lang_list);
@@ -222,6 +242,7 @@
ns_var = configuration->nosound();
mus_vol = configuration->musicvol();
fx_vol = configuration->soundFXvol();
+ joy_sens = (MAX_JOY_SENSIBILITY - configuration->joySensibility())/JOY_SENSIBILITY_STEP;
keysModified = false;

view->clear();
@@ -371,9 +392,9 @@
}
}
if(fx_vol != configuration->soundFXvol())
- {
configuration->setSoundFXVol(fx_vol);
- }
+ if((unsigned int)joy_sens != (MAX_JOY_SENSIBILITY - configuration->joySensibility())/JOY_SENSIBILITY_STEP)
+ configuration->setJoySensibility(MAX_JOY_SENSIBILITY-joy_sens*JOY_SENSIBILITY_STEP);
std::string lang_var = language_codes[lang_list->getIntValue()];
if(lang_var != configuration->language())
configuration->setLanguage(lang_var);

Modified: trunk/src/Options.h
==============================================================================
--- trunk/src/Options.h (original)
+++ trunk/src/Options.h Sat Jan 5 02:32:55 2008
@@ -37,6 +37,7 @@
bool ns_var;
int mus_vol;
int fx_vol;
+ int joy_sens;
int keys[nbControles];
bool keysModified;

@@ -47,6 +48,8 @@
bool *unactiveMusJauge;
bool *unactiveFXLabel;
bool *unactiveFXJauge;
+ bool *unactiveSensLabel;
+ bool *unactiveSensJauge;
std::string music_file;
};

Modified: trunk/src/widgets/Makefile.am
==============================================================================
--- trunk/src/widgets/Makefile.am (original)
+++ trunk/src/widgets/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,2 +1,3 @@
noinst_LIBRARIES = libT3F_Widgets.a
+libT3F_Widgets_a_CXXFLAGS = -Wall
libT3F_Widgets_a_SOURCES = bouton.cc checkbox.cc container.cc edit.cc
focuscontainer.cc jauge.cc label.cc liste.cc menubutton.cc switch.cc
view.cc widget.cc bouton.h checkbox.h constantes.h container.h edit.h
focuscontainer.h jauge.h label.h liste.h menubutton.h switch.h view.h widget.h

Modified: trunk/src/widgets/Makefile.in
==============================================================================
--- trunk/src/widgets/Makefile.in (original)
+++ trunk/src/widgets/Makefile.in Sat Jan 5 02:32:55 2008
@@ -51,11 +51,18 @@
ARFLAGS = cru
libT3F_Widgets_a_AR = $(AR) $(ARFLAGS)
libT3F_Widgets_a_LIBADD =
-am_libT3F_Widgets_a_OBJECTS = bouton.$(OBJEXT) checkbox.$(OBJEXT) \
- container.$(OBJEXT) edit.$(OBJEXT) focuscontainer.$(OBJEXT) \
- jauge.$(OBJEXT) label.$(OBJEXT) liste.$(OBJEXT) \
- menubutton.$(OBJEXT) switch.$(OBJEXT) view.$(OBJEXT) \
- widget.$(OBJEXT)
+am_libT3F_Widgets_a_OBJECTS = libT3F_Widgets_a-bouton.$(OBJEXT) \
+ libT3F_Widgets_a-checkbox.$(OBJEXT) \
+ libT3F_Widgets_a-container.$(OBJEXT) \
+ libT3F_Widgets_a-edit.$(OBJEXT) \
+ libT3F_Widgets_a-focuscontainer.$(OBJEXT) \
+ libT3F_Widgets_a-jauge.$(OBJEXT) \
+ libT3F_Widgets_a-label.$(OBJEXT) \
+ libT3F_Widgets_a-liste.$(OBJEXT) \
+ libT3F_Widgets_a-menubutton.$(OBJEXT) \
+ libT3F_Widgets_a-switch.$(OBJEXT) \
+ libT3F_Widgets_a-view.$(OBJEXT) \
+ libT3F_Widgets_a-widget.$(OBJEXT)
libT3F_Widgets_a_OBJECTS = $(am_libT3F_Widgets_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -190,6 +197,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libT3F_Widgets.a
+libT3F_Widgets_a_CXXFLAGS = -Wall
libT3F_Widgets_a_SOURCES = bouton.cc checkbox.cc container.cc edit.cc
focuscontainer.cc jauge.cc label.cc liste.cc menubutton.cc switch.cc
view.cc widget.cc bouton.h checkbox.h constantes.h container.h edit.h
focuscontainer.h jauge.h label.h liste.h menubutton.h switch.h view.h widget.h
all: all-am

@@ -238,18 +246,18 @@
distclean-compile:
-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bouton.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkbox.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/container.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/focuscontainer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jauge.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liste.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menubutton.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widget.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-bouton.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-checkbox.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-container.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-edit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-focuscontainer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-jauge.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-label.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-liste.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-menubutton.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-switch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-view.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libT3F_Widgets_a-widget.Po@am__quote@

.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -264,6 +272,174 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+libT3F_Widgets_a-bouton.o: bouton.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-bouton.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-bouton.Tpo -c -o libT3F_Widgets_a-bouton.o
`test -f 'bouton.cc' || echo '$(srcdir)/'`bouton.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-bouton.Tpo $(DEPDIR)/libT3F_Widgets_a-bouton.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='bouton.cc'
object='libT3F_Widgets_a-bouton.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-bouton.o `test -f 'bouton.cc' || echo '$(srcdir)/'`bouton.cc
+
+libT3F_Widgets_a-bouton.obj: bouton.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-bouton.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-bouton.Tpo -c -o libT3F_Widgets_a-bouton.obj
`if test -f 'bouton.cc'; then $(CYGPATH_W) 'bouton.cc'; else
$(CYGPATH_W) '$(srcdir)/bouton.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-bouton.Tpo $(DEPDIR)/libT3F_Widgets_a-bouton.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='bouton.cc'
object='libT3F_Widgets_a-bouton.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-bouton.obj `if test -f 'bouton.cc'; then
$(CYGPATH_W) 'bouton.cc'; else $(CYGPATH_W) '$(srcdir)/bouton.cc'; fi`
+
+libT3F_Widgets_a-checkbox.o: checkbox.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-checkbox.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-checkbox.Tpo -c -o
libT3F_Widgets_a-checkbox.o `test -f 'checkbox.cc' || echo '$(srcdir)/'`checkbox.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-checkbox.Tpo $(DEPDIR)/libT3F_Widgets_a-checkbox.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='checkbox.cc'
object='libT3F_Widgets_a-checkbox.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-checkbox.o `test -f 'checkbox.cc' || echo '$(srcdir)/'`checkbox.cc
+
+libT3F_Widgets_a-checkbox.obj: checkbox.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-checkbox.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-checkbox.Tpo -c -o
libT3F_Widgets_a-checkbox.obj `if test -f 'checkbox.cc'; then
$(CYGPATH_W) 'checkbox.cc'; else $(CYGPATH_W) '$(srcdir)/checkbox.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-checkbox.Tpo $(DEPDIR)/libT3F_Widgets_a-checkbox.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='checkbox.cc'
object='libT3F_Widgets_a-checkbox.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-checkbox.obj `if test -f 'checkbox.cc'; then
$(CYGPATH_W) 'checkbox.cc'; else $(CYGPATH_W) '$(srcdir)/checkbox.cc'; fi`
+
+libT3F_Widgets_a-container.o: container.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-container.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-container.Tpo -c -o
libT3F_Widgets_a-container.o `test -f 'container.cc' || echo '$(srcdir)/'`container.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-container.Tpo $(DEPDIR)/libT3F_Widgets_a-container.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='container.cc'
object='libT3F_Widgets_a-container.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-container.o `test -f 'container.cc' || echo '$(srcdir)/'`container.cc
+
+libT3F_Widgets_a-container.obj: container.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-container.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-container.Tpo -c -o
libT3F_Widgets_a-container.obj `if test -f 'container.cc'; then
$(CYGPATH_W) 'container.cc'; else
$(CYGPATH_W) '$(srcdir)/container.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-container.Tpo $(DEPDIR)/libT3F_Widgets_a-container.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='container.cc'
object='libT3F_Widgets_a-container.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-container.obj `if test -f 'container.cc'; then
$(CYGPATH_W) 'container.cc'; else
$(CYGPATH_W) '$(srcdir)/container.cc'; fi`
+
+libT3F_Widgets_a-edit.o: edit.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-edit.o -MD -MP -MF $(DEPDIR)/libT3F_Widgets_a-edit.Tpo
-c -o libT3F_Widgets_a-edit.o `test -f 'edit.cc' || echo '$(srcdir)/'`edit.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-edit.Tpo $(DEPDIR)/libT3F_Widgets_a-edit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='edit.cc'
object='libT3F_Widgets_a-edit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-edit.o `test -f 'edit.cc' || echo '$(srcdir)/'`edit.cc
+
+libT3F_Widgets_a-edit.obj: edit.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-edit.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-edit.Tpo -c -o libT3F_Widgets_a-edit.obj `if
test -f 'edit.cc'; then $(CYGPATH_W) 'edit.cc'; else
$(CYGPATH_W) '$(srcdir)/edit.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-edit.Tpo $(DEPDIR)/libT3F_Widgets_a-edit.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='edit.cc'
object='libT3F_Widgets_a-edit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-edit.obj `if test -f 'edit.cc'; then
$(CYGPATH_W) 'edit.cc'; else $(CYGPATH_W) '$(srcdir)/edit.cc'; fi`
+
+libT3F_Widgets_a-focuscontainer.o: focuscontainer.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-focuscontainer.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-focuscontainer.Tpo -c -o
libT3F_Widgets_a-focuscontainer.o `test -f 'focuscontainer.cc' || echo '$(srcdir)/'`focuscontainer.cc
+@am__fastdepCXX_TRUE@ mv -f
$(DEPDIR)/libT3F_Widgets_a-focuscontainer.Tpo $(DEPDIR)/libT3F_Widgets_a-focuscontainer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='focuscontainer.cc'
object='libT3F_Widgets_a-focuscontainer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-focuscontainer.o `test -f 'focuscontainer.cc' || echo '$(srcdir)/'`focuscontainer.cc
+
+libT3F_Widgets_a-focuscontainer.obj: focuscontainer.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-focuscontainer.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-focuscontainer.Tpo -c -o
libT3F_Widgets_a-focuscontainer.obj `if test -f 'focuscontainer.cc';
then $(CYGPATH_W) 'focuscontainer.cc'; else
$(CYGPATH_W) '$(srcdir)/focuscontainer.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f
$(DEPDIR)/libT3F_Widgets_a-focuscontainer.Tpo $(DEPDIR)/libT3F_Widgets_a-focuscontainer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='focuscontainer.cc'
object='libT3F_Widgets_a-focuscontainer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-focuscontainer.obj `if test -f 'focuscontainer.cc';
then $(CYGPATH_W) 'focuscontainer.cc'; else
$(CYGPATH_W) '$(srcdir)/focuscontainer.cc'; fi`
+
+libT3F_Widgets_a-jauge.o: jauge.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-jauge.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-jauge.Tpo -c -o libT3F_Widgets_a-jauge.o
`test -f 'jauge.cc' || echo '$(srcdir)/'`jauge.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-jauge.Tpo $(DEPDIR)/libT3F_Widgets_a-jauge.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='jauge.cc'
object='libT3F_Widgets_a-jauge.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-jauge.o `test -f 'jauge.cc' || echo '$(srcdir)/'`jauge.cc
+
+libT3F_Widgets_a-jauge.obj: jauge.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-jauge.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-jauge.Tpo -c -o libT3F_Widgets_a-jauge.obj
`if test -f 'jauge.cc'; then $(CYGPATH_W) 'jauge.cc'; else
$(CYGPATH_W) '$(srcdir)/jauge.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-jauge.Tpo $(DEPDIR)/libT3F_Widgets_a-jauge.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='jauge.cc'
object='libT3F_Widgets_a-jauge.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-jauge.obj `if test -f 'jauge.cc'; then
$(CYGPATH_W) 'jauge.cc'; else $(CYGPATH_W) '$(srcdir)/jauge.cc'; fi`
+
+libT3F_Widgets_a-label.o: label.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-label.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-label.Tpo -c -o libT3F_Widgets_a-label.o
`test -f 'label.cc' || echo '$(srcdir)/'`label.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-label.Tpo $(DEPDIR)/libT3F_Widgets_a-label.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='label.cc'
object='libT3F_Widgets_a-label.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-label.o `test -f 'label.cc' || echo '$(srcdir)/'`label.cc
+
+libT3F_Widgets_a-label.obj: label.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-label.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-label.Tpo -c -o libT3F_Widgets_a-label.obj
`if test -f 'label.cc'; then $(CYGPATH_W) 'label.cc'; else
$(CYGPATH_W) '$(srcdir)/label.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-label.Tpo $(DEPDIR)/libT3F_Widgets_a-label.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='label.cc'
object='libT3F_Widgets_a-label.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-label.obj `if test -f 'label.cc'; then
$(CYGPATH_W) 'label.cc'; else $(CYGPATH_W) '$(srcdir)/label.cc'; fi`
+
+libT3F_Widgets_a-liste.o: liste.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-liste.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-liste.Tpo -c -o libT3F_Widgets_a-liste.o
`test -f 'liste.cc' || echo '$(srcdir)/'`liste.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-liste.Tpo $(DEPDIR)/libT3F_Widgets_a-liste.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='liste.cc'
object='libT3F_Widgets_a-liste.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-liste.o `test -f 'liste.cc' || echo '$(srcdir)/'`liste.cc
+
+libT3F_Widgets_a-liste.obj: liste.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-liste.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-liste.Tpo -c -o libT3F_Widgets_a-liste.obj
`if test -f 'liste.cc'; then $(CYGPATH_W) 'liste.cc'; else
$(CYGPATH_W) '$(srcdir)/liste.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-liste.Tpo $(DEPDIR)/libT3F_Widgets_a-liste.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='liste.cc'
object='libT3F_Widgets_a-liste.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-liste.obj `if test -f 'liste.cc'; then
$(CYGPATH_W) 'liste.cc'; else $(CYGPATH_W) '$(srcdir)/liste.cc'; fi`
+
+libT3F_Widgets_a-menubutton.o: menubutton.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-menubutton.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-menubutton.Tpo -c -o
libT3F_Widgets_a-menubutton.o `test -f 'menubutton.cc' || echo '$(srcdir)/'`menubutton.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-menubutton.Tpo $(DEPDIR)/libT3F_Widgets_a-menubutton.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='menubutton.cc'
object='libT3F_Widgets_a-menubutton.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-menubutton.o `test -f 'menubutton.cc' || echo '$(srcdir)/'`menubutton.cc
+
+libT3F_Widgets_a-menubutton.obj: menubutton.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-menubutton.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-menubutton.Tpo -c -o
libT3F_Widgets_a-menubutton.obj `if test -f 'menubutton.cc'; then
$(CYGPATH_W) 'menubutton.cc'; else
$(CYGPATH_W) '$(srcdir)/menubutton.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-menubutton.Tpo $(DEPDIR)/libT3F_Widgets_a-menubutton.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='menubutton.cc'
object='libT3F_Widgets_a-menubutton.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-menubutton.obj `if test -f 'menubutton.cc'; then
$(CYGPATH_W) 'menubutton.cc'; else
$(CYGPATH_W) '$(srcdir)/menubutton.cc'; fi`
+
+libT3F_Widgets_a-switch.o: switch.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-switch.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-switch.Tpo -c -o libT3F_Widgets_a-switch.o
`test -f 'switch.cc' || echo '$(srcdir)/'`switch.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-switch.Tpo $(DEPDIR)/libT3F_Widgets_a-switch.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='switch.cc'
object='libT3F_Widgets_a-switch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-switch.o `test -f 'switch.cc' || echo '$(srcdir)/'`switch.cc
+
+libT3F_Widgets_a-switch.obj: switch.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-switch.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-switch.Tpo -c -o libT3F_Widgets_a-switch.obj
`if test -f 'switch.cc'; then $(CYGPATH_W) 'switch.cc'; else
$(CYGPATH_W) '$(srcdir)/switch.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-switch.Tpo $(DEPDIR)/libT3F_Widgets_a-switch.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='switch.cc'
object='libT3F_Widgets_a-switch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-switch.obj `if test -f 'switch.cc'; then
$(CYGPATH_W) 'switch.cc'; else $(CYGPATH_W) '$(srcdir)/switch.cc'; fi`
+
+libT3F_Widgets_a-view.o: view.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-view.o -MD -MP -MF $(DEPDIR)/libT3F_Widgets_a-view.Tpo
-c -o libT3F_Widgets_a-view.o `test -f 'view.cc' || echo '$(srcdir)/'`view.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-view.Tpo $(DEPDIR)/libT3F_Widgets_a-view.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='view.cc'
object='libT3F_Widgets_a-view.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-view.o `test -f 'view.cc' || echo '$(srcdir)/'`view.cc
+
+libT3F_Widgets_a-view.obj: view.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-view.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-view.Tpo -c -o libT3F_Widgets_a-view.obj `if
test -f 'view.cc'; then $(CYGPATH_W) 'view.cc'; else
$(CYGPATH_W) '$(srcdir)/view.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-view.Tpo $(DEPDIR)/libT3F_Widgets_a-view.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='view.cc'
object='libT3F_Widgets_a-view.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-view.obj `if test -f 'view.cc'; then
$(CYGPATH_W) 'view.cc'; else $(CYGPATH_W) '$(srcdir)/view.cc'; fi`
+
+libT3F_Widgets_a-widget.o: widget.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-widget.o -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-widget.Tpo -c -o libT3F_Widgets_a-widget.o
`test -f 'widget.cc' || echo '$(srcdir)/'`widget.cc
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-widget.Tpo $(DEPDIR)/libT3F_Widgets_a-widget.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='widget.cc'
object='libT3F_Widgets_a-widget.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-widget.o `test -f 'widget.cc' || echo '$(srcdir)/'`widget.cc
+
+libT3F_Widgets_a-widget.obj: widget.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -MT
libT3F_Widgets_a-widget.obj -MD -MP -MF
$(DEPDIR)/libT3F_Widgets_a-widget.Tpo -c -o libT3F_Widgets_a-widget.obj
`if test -f 'widget.cc'; then $(CYGPATH_W) 'widget.cc'; else
$(CYGPATH_W) '$(srcdir)/widget.cc'; fi`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libT3F_Widgets_a-widget.Tpo $(DEPDIR)/libT3F_Widgets_a-widget.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='widget.cc'
object='libT3F_Widgets_a-widget.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libT3F_Widgets_a_CXXFLAGS) $(CXXFLAGS) -c
-o libT3F_Widgets_a-widget.obj `if test -f 'widget.cc'; then
$(CYGPATH_W) 'widget.cc'; else $(CYGPATH_W) '$(srcdir)/widget.cc'; fi`

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

Modified: trunk/src/widgets/liste.cc
==============================================================================
--- trunk/src/widgets/liste.cc (original)
+++ trunk/src/widgets/liste.cc Sat Jan 5 02:32:55 2008
@@ -91,11 +91,11 @@
if(focused && event->type == SDL_KEYDOWN)
{
int key = event->key.keysym.sym;
- if (key == SDLK_UP)
+ if (key == SDLK_UP || key == SDLK_LEFT)
{
prevValue();
}
- if (key == SDLK_DOWN)
+ if (key == SDLK_DOWN || key == SDLK_RIGHT)
{
nextValue();
}

Modified: trunk/vaisseaux/Makefile.am
==============================================================================
--- trunk/vaisseaux/Makefile.am (original)
+++ trunk/vaisseaux/Makefile.am Sat Jan 5 02:32:55 2008
@@ -1,10 +1,10 @@
-vaisseauxdir = $(datadir)/vaisseaux
+vaisseauxdir = $(pkgdatadir)/vaisseaux
vaisseaux_DATA = vaisseaux.lst

-Explorerdir = $(datadir)/vaisseaux/Explorer
+Explorerdir = $(pkgdatadir)/vaisseaux/Explorer
Explorer_DATA = Explorer/Explorer Explorer/explorer-1.png
Explorer/explorer.png Explorer/explosion Explorer/preview Explorer/proprietes

-z95dir = $(datadir)/vaisseaux/z95
+z95dir = $(pkgdatadir)/vaisseaux/z95
z95_DATA = z95/explosion z95/z95-1.png z95/z95-13.png z95/z95-17.png
z95/z95-20.png z95/z95-24.png z95/z95-28.png z95/z95-31.png
z95/z95-35.png z95/z95-7.png z95/preview z95/z95-10.png z95/z95-14.png
z95/z95-18.png z95/z95-21.png z95/z95-25.png z95/z95-29.png
z95/z95-32.png z95/z95-4.png z95/z95-8.png z95/proprietes
z95/z95-11.png z95/z95-15.png z95/z95-19.png z95/z95-22.png
z95/z95-26.png z95/z95-3.png z95/z95-33.png z95/z95-5.png z95/z95-9.png
z95/z95 z95/z95-12.png z95/z95-16.png z95/z95-2.png z95/z95-23.png
z95/z95-27.png z95/z95-30.png z95/z95-34.png z95/z95-6.png z95/z95.png

EXTRA_DIST = $(vaisseaux_DATA) $(Explorer_DATA) $(z95_DATA)

Modified: trunk/vaisseaux/Makefile.in
==============================================================================
--- trunk/vaisseaux/Makefile.in (original)
+++ trunk/vaisseaux/Makefile.in Sat Jan 5 02:32:55 2008
@@ -176,11 +176,11 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-vaisseauxdir = $(datadir)/vaisseaux
+vaisseauxdir = $(pkgdatadir)/vaisseaux
vaisseaux_DATA = vaisseaux.lst
-Explorerdir = $(datadir)/vaisseaux/Explorer
+Explorerdir = $(pkgdatadir)/vaisseaux/Explorer
Explorer_DATA = Explorer/Explorer Explorer/explorer-1.png
Explorer/explorer.png Explorer/explosion Explorer/preview Explorer/proprietes
-z95dir = $(datadir)/vaisseaux/z95
+z95dir = $(pkgdatadir)/vaisseaux/z95
z95_DATA = z95/explosion z95/z95-1.png z95/z95-13.png z95/z95-17.png
z95/z95-20.png z95/z95-24.png z95/z95-28.png z95/z95-31.png
z95/z95-35.png z95/z95-7.png z95/preview z95/z95-10.png z95/z95-14.png
z95/z95-18.png z95/z95-21.png z95/z95-25.png z95/z95-29.png
z95/z95-32.png z95/z95-4.png z95/z95-8.png z95/proprietes
z95/z95-11.png z95/z95-15.png z95/z95-19.png z95/z95-22.png
z95/z95-26.png z95/z95-3.png z95/z95-33.png z95/z95-5.png z95/z95-9.png
z95/z95 z95/z95-12.png z95/z95-16.png z95/z95-2.png z95/z95-23.png
z95/z95-27.png z95/z95-30.png z95/z95-34.png z95/z95-6.png z95/z95.png
EXTRA_DIST = $(vaisseaux_DATA) $(Explorer_DATA) $(z95_DATA)
all: all-am

codesite...@google.com

unread,

Jan 5, 2008, 5:33:36 AM1/5/08

to althre...@googlegroups.com

Reply all

Reply to author

Forward

0 new messages