jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-26 04:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/ogre: remove libglu dependency

Browse Source 
"The inclusion of GLU is historical. [...] I'd recommend using
 -DGLEW_NO_GLU since GLU is rarely seen in modern codebases nowadays."
https://github.com/nigels-com/glew/issues/192#issuecomment-411641657

Add -DGLEW_NO_GLU to get rid of the libglu dependency.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[yann.morin.1998@free.fr:
  - fix mismatch between OGRE_CXX_FLAGS and OGRE_CXXFLAGS
  - also use OGRE_CFLAGS for symetry with OGRE_CXXFLAGS
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Bernd Kuhls 2020-05-03 19:12:24 +02:00 committed by Yann E. MORIN
parent de70d9b933
commit 2c2346eee7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/ogre/Config.in
View File

@ -10,7 +10,6 @@ config BR2_PACKAGE_OGRE
depends on BR2_USE_WCHAR # use wchar_t depends on BR2_USE_WCHAR # use wchar_t
select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_LIBFREEIMAGE select BR2_PACKAGE_LIBFREEIMAGE
select BR2_PACKAGE_LIBGLU # GL/glu.h
select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2
select BR2_PACKAGE_SDL2_OPENGL select BR2_PACKAGE_SDL2_OPENGL
select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11 select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11

10
package/ogre/ogre.mk
View File

@ -15,7 +15,6 @@ OGRE_DEPENDENCIES = host-pkgconf \
freetype \ freetype \
libfreeimage \ libfreeimage \
libgl \ libgl \
libglu \
sdl2 \ sdl2 \
xlib_libX11 \ xlib_libX11 \
xlib_libXaw \ xlib_libXaw \
@ -23,12 +22,17 @@ OGRE_DEPENDENCIES = host-pkgconf \
xlib_libXrandr \ xlib_libXrandr \
zziplib zziplib
OGRE_CFLAGS = $(TARGET_CFLAGS) -DGLEW_NO_GLU
OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU
# Unbundle freetype and zziplib. # Unbundle freetype and zziplib.
# Disable java and nvidia cg support. # Disable java and nvidia cg support.
OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \
-DOGRE_BUILD_COMPONENT_JAVA=OFF \ -DOGRE_BUILD_COMPONENT_JAVA=OFF \
-DOGRE_BUILD_PLUGIN_CG=OFF \ -DOGRE_BUILD_PLUGIN_CG=OFF \
-DOGRE_INSTALL_DOCS=OFF -DOGRE_INSTALL_DOCS=OFF \
-DCMAKE_C_FLAGS="$(OGRE_CFLAGS)" \
-DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)"
# Enable optional python component if python interpreter is present on the target. # Enable optional python component if python interpreter is present on the target.
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
@ -41,7 +45,7 @@ endif
# Uses __atomic_fetch_add_8 # Uses __atomic_fetch_add_8
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
OGRE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" OGRE_CXXFLAGS += -latomic
endif endif
$(eval $(cmake-package)) $(eval $(cmake-package))