From b0d9b36fea4072474b53bfa7fef7aee5158597c1 Mon Sep 17 00:00:00 2001 From: doitux Date: Thu, 22 Nov 2012 08:19:38 +0100 Subject: [PATCH] next steps on #141 --- pokerth_game.pro | 12 +++++------- src/gui/qt/sound/sdlplayer.cpp | 4 ++-- src/gui/qt/sound/sdlplayer.h | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index 2011d454..85ae9d55 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -347,11 +347,10 @@ win32 { ../mysql/lib \ ../zlib - #-lSDL_mixer \ - #-lSDL \ - #-lSDLmain \ - - LIBS += -ltinyxml \ + LIBS += -lSDL_mixer \ + -lSDL \ + -lSDLmain \ + -ltinyxml \ -lz \ -lssh2 \ -lgnutls \ @@ -367,8 +366,7 @@ win32 { debug:LIBPATH += debug/lib release:LIBPATH += release/lib LIBS += -lsqlite3 - #-lsmpeg -lvorbisfile -lvorbis -logg - LIBS += -lntlm -lmodplug -lddraw -ldxguid + LIBS += -lntlm -lmodplug -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg LIBS += -lboost_thread_win32-mt LIBS += -lboost_filesystem-mt LIBS += -lboost_regex-mt diff --git a/src/gui/qt/sound/sdlplayer.cpp b/src/gui/qt/sound/sdlplayer.cpp index 291b9d70..a40b6d38 100644 --- a/src/gui/qt/sound/sdlplayer.cpp +++ b/src/gui/qt/sound/sdlplayer.cpp @@ -19,9 +19,9 @@ #ifndef ANDROID #if (defined __APPLE__) -//#include +#include #else -//#include +#include #endif #endif diff --git a/src/gui/qt/sound/sdlplayer.h b/src/gui/qt/sound/sdlplayer.h index f71990d7..9b9ab3f8 100644 --- a/src/gui/qt/sound/sdlplayer.h +++ b/src/gui/qt/sound/sdlplayer.h @@ -25,9 +25,9 @@ #ifndef ANDROID #ifdef __APPLE__ -//#include +#include #else -//#include +#include #endif #endif