Commit e9d2da7b authored by bret curtis's avatar bret curtis

armhf fix

parent 37278b50
openmw (0.40.0-2) unstable; urgency=low
[ Bret Curtis ]
* Fix armhf problems (Closes: #838792)
-- Bret Curtis <psi29a@gmail.com> Sat, 01 Oct 2016 08:14:09 +0200
openmw (0.40.0-1) experimental; urgency=low
[ Bret Curtis ]
......
......@@ -7,8 +7,9 @@ Build-Depends: debhelper (>= 9~), cmake, libbullet-dev,
libopenal-dev, libtinyxml-dev, libavcodec-dev, libavformat-dev,
libavutil-dev, libswscale-dev, libswresample-dev, libsdl2-dev,
libmygui-dev (>= 3.2.1), libunshield-dev, libopenscenegraph-3.4-dev,
libqt4-opengl-dev
Standards-Version: 3.9.7
libqt4-opengl-dev, libgles1-mesa-dev [armhf], libgles2-mesa-dev [armhf],
freeglut3-dev [!armhf], libgl1-mesa-dev [!armhf] | libgl-dev [!armhf],
Standards-Version: 3.9.8
Homepage: http://openmw.org
Vcs-Git: https://anonscm.debian.org/git/pkg-games/openmw.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openmw.git
......@@ -24,7 +25,7 @@ Description: Reimplementation of The Elder Scrolls III: Morrowind
The Morrowind "Data Files" from the original game are required to play.
Package: openmw-cs
Architecture: any
Architecture: any-amd64 any-i386 alpha arm64 hppa hurd-i386 m68k mips64el powerpc ppc64 ppc64el s390x sh4 sparc64 x32
Recommends: openmw
Depends: ${shlibs:Depends}, ${misc:Depends}, openmw-data (= ${source:Version})
Description: Replacement of The Elder Scrolls Construction Set
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 124193a..c18db58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -550,7 +550,7 @@ endif(WIN32)
# Extern
add_subdirectory (extern/osg-ffmpeg-videoplayer)
add_subdirectory (extern/oics)
-if (USE_QT)
+if (BUILD_OPENCS)
add_subdirectory (extern/osgQt)
endif()
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index 4a0aae3..f15a9a1 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -1,6 +1,10 @@
#ifndef OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUIRENDERMANAGER_H
#define OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUIRENDERMANAGER_H
+#if defined(OPENGL_ES)
+# include <GLES/gl.h>
+#endif
+
#include <MyGUI_RenderManager.h>
#include <osg/ref_ptr>
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 0d8610e..7e52a7f 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -1,6 +1,10 @@
#ifndef OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
#define OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
+#if defined(OPENGL_ES)
+# include <GLES/gl.h>
+#endif
+
#include <osg/Light>
#include <osg/Group>
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index d6c9703..8acb201 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -1,6 +1,10 @@
#ifndef OPENMW_COMPONENTS_LIGHTUTIL_H
#define OPENMW_COMPONENTS_LIGHTUTIL_H
+#if defined(OPENGL_ES)
+# include <GLES/gl.h>
+#endif
+
namespace osg
{
class Group;
......@@ -23,8 +23,13 @@ CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
ifeq (armhf,$(DEB_HOST_ARCH))
OPENGLES_LDFLAGS=$(shell pkg-config glesv2 --libs)
ARMHF_DEFINES=-DOPENGL_ES="TRUE" -DBUILD_OPENCS="FALSE" -DOPENGL_gl_LIBRARY="${OPENGLES_LDFLAGS}"
endif
override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DUSE_SYSTEM_TINYXML="TRUE" -DCMAKE_VERBOSE_MAKEFILE="FALSE" -DBUILD_ESMTOOL="FALSE" -DBUILD_ESSIMPORTER="TRUE" -DBUILD_BSATOOL="FALSE" -DBUILD_NIFTEST="FALSE" -DBUILD_MYGUI_PLUGIN="FALSE"
dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DUSE_SYSTEM_TINYXML="TRUE" -DCMAKE_VERBOSE_MAKEFILE="FALSE" -DBUILD_ESMTOOL="FALSE" -DBUILD_ESSIMPORTER="TRUE" -DBUILD_BSATOOL="FALSE" -DBUILD_NIFTEST="FALSE" -DBUILD_MYGUI_PLUGIN="FALSE" ${ARMHF_DEFINES}
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG.md
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment