From a357fcba5d698d6b2176bcf059035dc9d8e8a28c Mon Sep 17 00:00:00 2001 From: sisah Date: Sun, 10 Dec 2023 07:03:18 -0500 Subject: [PATCH] aaa --- buildscripts/CMakeLists.txt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/buildscripts/CMakeLists.txt b/buildscripts/CMakeLists.txt index 62e2c7015..7133562de 100644 --- a/buildscripts/CMakeLists.txt +++ b/buildscripts/CMakeLists.txt @@ -487,9 +487,9 @@ ExternalProject_Add(libcollada -DBoost_INCLUDE_DIR=${prefix}/include -DHAVE_STRTOQ=0 -DUSE_FILE32API=1 - -D CMAKE_CXX_FLAGS='-Dauto_ptr=unique_ptr' - -DCMAKE_CXX_FLAGS=--std=c++11 - +# -D CMAKE_CXX_FLAGS='-Dauto_ptr=unique_ptr' +# -DCMAKE_CXX_FLAGS=--std=c++11 + -DCMAKE_CXX_FLAGS=-std=gnu++11\ -DMYGUI_DONT_REPLACE_NULLPTR\ -I${prefix}/include/\ $ENV{CXXFLAGS} BUILD_COMMAND ${wrapper_command} $(MAKE) @@ -499,9 +499,9 @@ ExternalProject_Add(libcollada set(OSG_COMMON -DOPENGL_PROFILE="GL1" -DDYNAMIC_OPENTHREADS=OFF - -DDYNAMIC_OPENSCENEGRAPH=OFF + -DDYNAMIC_OPENSCENEGRAPH=ON -DBUILD_OSG_PLUGIN_OSG=ON - -DBUILD_OSG_PLUGIN_DAE=OFF + -DBUILD_OSG_PLUGIN_DAE=ON -DBUILD_OSG_PLUGIN_DDS=ON -DBUILD_OSG_PLUGIN_TGA=ON -DBUILD_OSG_PLUGIN_BMP=ON @@ -528,6 +528,9 @@ set(OSG_COMMON -DBUILD_OSG_APPLICATIONS=OFF -DBUILD_OSG_PLUGINS_BY_DEFAULT=OFF -DBUILD_OSG_DEPRECATED_SERIALIZERS=OFF + #-DOPENGL_opengl_LIBRARY=${prefix}/lib/libGL.so + #-DOPENGL_glx_LIBRARY=${prefix}/lib/libGL.so + #-DOPENGL_INCLUDE_DIR=${prefix}/include/gl4es/ ) set(OSG_PATCH @@ -557,8 +560,10 @@ ExternalProject_Add(osg ${COMMON_CMAKE_ARGS} ${OSG_COMMON} #-D CMAKE_CXX_FLAGS='-Dauto_ptr=unique_ptr' - #-DCMAKE_CXX_FLAGS=--std=c++11 - + #-DCMAKE_CXX_FLAGS=--std=gnu++11 + #-DCMAKE_CXX_FLAGS=--std=c++11 + -DCMAKE_CXX_FLAGS=-std=gnu++11\ -DMYGUI_DONT_REPLACE_NULLPTR\ -I${prefix}/include/\ $ENV{CXXFLAGS} + BUILD_COMMAND ${wrapper_command} $(MAKE) INSTALL_COMMAND mkdir -p /3rdparty/build/libpng /3rdparty/build/libjpeg /3rdparty/build/freetype