From 8e5456ffddecf42af9760baf49dbad94f83130a6 Mon Sep 17 00:00:00 2001 From: ooxi <85fcd0ef4ec8@f977375cdcd6.anonbox.net> Date: Wed, 31 Oct 2012 01:11:06 +0100 Subject: [PATCH] Improved OpenBSD supported Included patches provided by [jasperla/openbsd-wip](https://github.com/jasperla/openbsd-wip/tree/c6d0138d3af42d773b44769e59b1d0c88ecfae71/games/violetland/patches) --- CHANGELOG.md | 1 + CMakeLists.txt | 3 ++- src/system/utility/FileUtility.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) mode change 100755 => 100644 CMakeLists.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 31d20dde..08769da4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Legend Upcoming release ---------------- + * `[!]` Improved OpenBSD Support * `[+]` As of [issue 64](https://github.com/ooxi/violetland/pull/64) the control style can be toggled between "classic" and "modern" * `[*]` Added more available video modes in [issue 63](https://github.com/ooxi/violetland/pull/63), since auto detection doesn't seam to work * `[!]` Fixed i18n support in [issue 62](https://github.com/ooxi/violetland/pull/62) diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index 875c02eb..4b87795f --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ find_package(SDL_image REQUIRED) find_package(SDL_ttf REQUIRED) find_package(SDL_mixer REQUIRED) find_package(OpenGL REQUIRED) +find_package(Gettext REQUIRED) find_package(Boost COMPONENTS filesystem system REQUIRED) add_definitions(-DBOOST_FILESYSTEM_VERSION=2) @@ -14,7 +15,7 @@ if(${MINGW}) set(INTL_LIBRARY intl) endif(${MINGW}) -set(incDirList ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) +set(incDirList ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${GETTEXT_INCLUDE_DIR}) set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${INTL_LIBRARY}) if (DEFINED LOCALE_INSTALL_DIR) diff --git a/src/system/utility/FileUtility.cpp b/src/system/utility/FileUtility.cpp index 52091b36..edbf965d 100644 --- a/src/system/utility/FileUtility.cpp +++ b/src/system/utility/FileUtility.cpp @@ -65,7 +65,7 @@ FileUtility::FileUtility(char *argPath) { m_resPath = m_appPath; m_usrPath = m_resPath; #endif //_WIN32 -#if defined linux || defined __FreeBSD__ +#if defined linux || defined __FreeBSD__ || defined __OpenBSD__ #ifndef INSTALL_PREFIX #define INSTALL_PREFIX "/usr/local"; #endif //INSTALL_PREFIX