Audio on/off changes, android gui fixes, android crash bugfix (1st step in internetlogindialog)

This commit is contained in:
doitux
2012-12-20 09:11:57 +01:00
parent 51ad6c5580
commit 31c3771d59
16 changed files with 156 additions and 64 deletions
+7 -4
View File
@@ -157,8 +157,7 @@ HEADERS += src/engine/game.h \
src/engine/network_engine/clienthand.h \
src/engine/network_engine/clientplayer.h \
src/engine/network_engine/clientbero.h \
src/gui/qt/chattools/chattools.h \
src/gui/qt/sound/sdlplayer.h \
src/gui/qt/chattools/chattools.h \
src/gui/qt/gametable/gametableimpl.h \
src/gui/qt/gametable/mycardspixmaplabel.h \
src/gui/qt/gametable/mysetlabel.h \
@@ -236,8 +235,7 @@ HEADERS += src/engine/game.h \
}
SOURCES += src/pokerth.cpp \
src/gui/qt/chattools/chattools.cpp \
src/gui/qt/sound/sdlplayer.cpp \
src/gui/qt/chattools/chattools.cpp \
src/gui/qt/guiwrapper.cpp \
src/gui/qt/qttools/qttoolswrapper.cpp \
src/gui/qt/qttools/qthelper/qthelper.cpp \
@@ -636,6 +634,11 @@ android{
src/gui/qt/sound/androidsoundeffect.cpp
}
!android{
HEADERS += src/gui/qt/sound/sdlplayer.h
SOURCES += src/gui/qt/sound/sdlplayer.cpp
}
maemo{
DEFINES += MAEMO
}