basic android audio support (#156), support for bigger android screens (#160)

2012-12-18 15:49:19 +01:00
parent 35628b057c
commit 652aa2ce7c
11 changed files with 510 additions and 55 deletions
@@ -211,7 +211,9 @@ HEADERS += src/engine/game.h \
    src/gui/qt/sound/soundevents.h \
    src/gui/qt/mymessagebox/mymessagebox.h \
    src/gui/qt/logfiledialog/logfiledialog.h \
-    src/gui/qt/logfiledialog/callback.h
+    src/gui/qt/logfiledialog/callback.h \
+    src/gui/qt/sound/androidaudio.h \
+    src/gui/qt/sound/androidsoundeffect.h

 !gui_800x480 {
    FORMS += src/gui/qt/gametable.ui \
@@ -290,7 +292,9 @@ SOURCES += src/pokerth.cpp \
    src/gui/qt/sound/soundevents.cpp \
    src/gui/qt/mymessagebox/mymessagebox.cpp \
    src/gui/qt/logfiledialog/logfiledialog.cpp \
-    src/gui/qt/logfiledialog/callback.cpp
+    src/gui/qt/logfiledialog/callback.cpp \
+    src/gui/qt/sound/androidaudio.cpp \
+    src/gui/qt/sound/androidsoundeffect.cpp
 TRANSLATIONS = ts/pokerth_af.ts \
 	ts/pokerth_bg.ts \
 	ts/pokerth_zhcn.ts \
@@ -510,7 +514,7 @@ unix:!mac {
 		LIBS += -ltinyxml
 		LIBS += $$BOOST_LIBS
 		LIBS += -lgsasl -lidn
-                LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf-lite
+        LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf-lite -lOpenSLES
 	}
 	TARGETDEPS += ./lib/libpokerth_lib.a \
 		./lib/libpokerth_db.a \