Fixes for building on armel.

Closes: #845054
Thanks: Emilio Pozuelo Monfort
parent fe31bc25
...@@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 7.0.50), ...@@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 7.0.50),
libgdal-dev, libgdal-dev,
libx11-dev, libx11-dev,
libxmu-dev, libxmu-dev,
freeglut3-dev [!armhf], freeglut3-dev [!armel !armhf],
libgl1-mesa-dev [!armhf] | libgl-dev [!armhf], libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
libegl1-mesa-dev [armhf], libegl1-mesa-dev [armel armhf],
libgles2-mesa-dev [armhf], libgles2-mesa-dev [armel armhf],
libxine2-dev, libxine2-dev,
libavcodec-dev, libavcodec-dev,
libswscale-dev, libswscale-dev,
...@@ -44,8 +44,8 @@ Section: libdevel ...@@ -44,8 +44,8 @@ Section: libdevel
Architecture: any Architecture: any
Depends: ${misc:Depends}, Depends: ${misc:Depends},
libopenthreads-dev, libopenthreads-dev,
libgl1-mesa-dev [!armhf] | libgl-dev [!armhf], libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
libgles2-mesa-dev [armhf], libgles2-mesa-dev [armel armhf],
libglu-dev, libglu-dev,
libopenscenegraph-3.4-130 (= ${binary:Version}) libopenscenegraph-3.4-130 (= ${binary:Version})
Suggests: openscenegraph-doc, Suggests: openscenegraph-doc,
......
...@@ -64,10 +64,10 @@ CXXFLAGS := ${CXXFLAGS} ${ARCH_CXX_FLAGS} ...@@ -64,10 +64,10 @@ CXXFLAGS := ${CXXFLAGS} ${ARCH_CXX_FLAGS}
LDFLAGS += -Wl,--as-needed LDFLAGS += -Wl,--as-needed
ifeq (armhf,$(DEB_HOST_ARCH)) ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
EGL_LDFLAGS=$(shell pkg-config egl --libs) EGL_LDFLAGS=$(shell pkg-config egl --libs)
OPENGLES_LDFLAGS=$(shell pkg-config glesv2 --libs) OPENGLES_LDFLAGS=$(shell pkg-config glesv2 --libs)
ARMHF_DEFINES=-D OSG_GL1_AVAILABLE:BOOL=OFF \ ARM_DEFINES=-D OSG_GL1_AVAILABLE:BOOL=OFF \
-D OSG_GL2_AVAILABLE:BOOL=OFF \ -D OSG_GL2_AVAILABLE:BOOL=OFF \
-D OSG_GL3_AVAILABLE:BOOL=OFF \ -D OSG_GL3_AVAILABLE:BOOL=OFF \
-D OSG_GLES1_AVAILABLE:BOOL=OFF \ -D OSG_GLES1_AVAILABLE:BOOL=OFF \
...@@ -451,7 +451,7 @@ build-stamp: ...@@ -451,7 +451,7 @@ build-stamp:
-D CMAKE_BUILD_TYPE=RelWithDebInfo \ -D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D CMAKE_RELWITHDEBINFO_POSTFIX="" \ -D CMAKE_RELWITHDEBINFO_POSTFIX="" \
-D OSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF \ -D OSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF \
${ARMHF_DEFINES} \ ${ARM_DEFINES} \
../.. ../..
${MAKE} ${PARALLEL_OPTIONS} VERBOSE=1 -C build/osg ${MAKE} ${PARALLEL_OPTIONS} VERBOSE=1 -C build/osg
......
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