immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

latest changes

dev-ui
erihel 2012-12-21 17:31:55 +01:00
parent f0e76ad446
commit 6d607e3ae8
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -5,4 +5,4 @@ script: cmake . -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test
before_install: before_install:
- git submodule update --init --recursive - git submodule update --init --recursive
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libltdl-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz

1
cmake/mxe.cmake
View File

@ -18,7 +18,6 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS))
${CMAKE_FIND_ROOT_PATH}/lib/libiconv.a ${CMAKE_FIND_ROOT_PATH}/lib/libiconv.a
${CMAKE_FIND_ROOT_PATH}/lib/libglew32s.a ${CMAKE_FIND_ROOT_PATH}/lib/libglew32s.a
${CMAKE_FIND_ROOT_PATH}/lib/libfreetype.a ${CMAKE_FIND_ROOT_PATH}/lib/libfreetype.a
${CMAKE_FIND_ROOT_PATH}/lib/libltdl.a
${CMAKE_FIND_ROOT_PATH}/lib/libopengl32.a ${CMAKE_FIND_ROOT_PATH}/lib/libopengl32.a
${CMAKE_FIND_ROOT_PATH}/lib/libjpeg.a ${CMAKE_FIND_ROOT_PATH}/lib/libjpeg.a
${CMAKE_FIND_ROOT_PATH}/lib/libwinmm.a ${CMAKE_FIND_ROOT_PATH}/lib/libwinmm.a

17
src/app/app.cpp
View File

@ -40,6 +40,11 @@
#include <unistd.h> #include <unistd.h>
#ifdef OPENAL_SOUND
#include "sound/oalsound/alsound.h"
#endif
template<> CApplication* CSingleton<CApplication>::mInstance = nullptr; template<> CApplication* CSingleton<CApplication>::mInstance = nullptr;
//! Static buffer for putenv locale //! Static buffer for putenv locale
@ -332,12 +337,12 @@ bool CApplication::Create()
if (GetProfile().GetLocalProfileString("Resources", "Data", path)) if (GetProfile().GetLocalProfileString("Resources", "Data", path))
m_dataPath = path; m_dataPath = path;
m_sound = static_cast<CSoundInterface*>(CInstanceManager::GetInstancePointer()->SearchInstance(CLASS_SOUND)); #ifdef OPENAL_SOUND
m_sound = static_cast<CSoundInterface *>(new ALSound());
if (!m_sound) { #else
GetLogger()->Error("Sound not loaded, falling back to fake sound!\n"); GetLogger()->Info("No sound support.\n");
m_sound = new CSoundInterface(); m_sound = new CSoundInterface();
} #endif
m_sound->Create(true); m_sound->Create(true);
if (GetProfile().GetLocalProfileString("Resources", "Sound", path)) if (GetProfile().GetLocalProfileString("Resources", "Sound", path))

2
src/common/config.h.cmake
View File

@ -10,3 +10,5 @@
#define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@" #define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@"
#define COLOBOT_I18N_DIR "@COLOBOT_INSTALL_I18N_DIR@" #define COLOBOT_I18N_DIR "@COLOBOT_INSTALL_I18N_DIR@"
#cmakedefine OPENAL_SOUND