added keywords for debian and switch to dyn libs in travis

actorid
Bret Curtis 11 years ago
parent 3452bd2e0b
commit 862f2f0883

@ -9,13 +9,13 @@ before_install:
- pwd - pwd
- git submodule update --init --recursive - git submodule update --init --recursive
- echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
- echo "yes" | sudo apt-add-repository ppa:openmw/deps - echo "yes" | sudo apt-add-repository ppa:openmw/openmw
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev - sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev
- sudo apt-get install -qq libqt4-dev libxaw7-dev libxrandr-dev libfreeimage-dev libpng-dev - sudo apt-get install -qq libqt4-dev libxaw7-dev libxrandr-dev libfreeimage-dev libpng-dev
- sudo apt-get install -qq libopenal-dev libmpg123-dev libsndfile1-dev - sudo apt-get install -qq libopenal-dev libmpg123-dev libsndfile1-dev
- sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev - sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev
- sudo apt-get install -qq libbullet-dev libogre-static-dev libmygui-static-dev libsdl2-static-dev libunshield-dev - sudo apt-get install -qq libbullet-dev libogre-1.8-dev libmygui-dev libsdl2-dev libunshield-dev
- sudo mkdir /usr/src/gtest/build - sudo mkdir /usr/src/gtest/build
- cd /usr/src/gtest/build - cd /usr/src/gtest/build
- sudo cmake .. -DBUILD_SHARED_LIBS=1 - sudo cmake .. -DBUILD_SHARED_LIBS=1
@ -26,7 +26,7 @@ before_script:
- cd - - cd -
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1 -DBOOST_STATIC=1 -DSDL2_STATIC=1 -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1 - cmake .. -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1 DBUILD_WITH_DPKG=1
script: script:
- make -j4 - make -j4
after_script: after_script:

@ -552,3 +552,9 @@ clear_if_changed(OGRE_PREFIX_WATCH OGRE_MEDIA_DIR)
find_path(OGRE_MEDIA_DIR NAMES packs/cubemapsJS.zip HINTS ${OGRE_MEDIA_SEARCH_PATH} find_path(OGRE_MEDIA_DIR NAMES packs/cubemapsJS.zip HINTS ${OGRE_MEDIA_SEARCH_PATH}
PATHS ${OGRE_PREFIX_PATH} PATH_SUFFIXES ${OGRE_MEDIA_SEARCH_SUFFIX}) PATHS ${OGRE_PREFIX_PATH} PATH_SUFFIXES ${OGRE_MEDIA_SEARCH_SUFFIX})
if (OGRE_RenderSystem_GL_FOUND)
MESSAGE("-- OpenGL -- Found!")
else()
MESSAGE("-- OpenGL -- Not Found!")
endif()
MESSAGE("-- ${OGRE_RenderSystem_GL_LIBRARIES} ${OPENGL_LIBRARIES}")

@ -3,6 +3,7 @@ Type=Application
Name=OpenMW Content Editor Name=OpenMW Content Editor
GenericName=Content Editor GenericName=Content Editor
Comment=A replacement for the Morrowind Construction Set. Comment=A replacement for the Morrowind Construction Set.
Keywords=Morrowind;Construction Set;Creation Kit Editor;Set;Kit
TryExec=opencs TryExec=opencs
Exec=opencs Exec=opencs
Icon=opencs Icon=opencs

@ -3,6 +3,7 @@ Type=Application
Name=OpenMW Launcher Name=OpenMW Launcher
GenericName=Role Playing Game GenericName=Role Playing Game
Comment=An engine replacement for The Elder Scrolls III: Morrowind Comment=An engine replacement for The Elder Scrolls III: Morrowind
Keywords=Morrowind;Reimplementation Mods;esm;bsa
TryExec=omwlauncher TryExec=omwlauncher
Exec=omwlauncher Exec=omwlauncher
Icon=openmw Icon=openmw

Loading…
Cancel
Save