mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0023712: Remove dependency on Aspect_GraphicDevice from Aspect_Window
This commit is contained in:
@@ -37,6 +37,7 @@ unix {
|
||||
|
||||
!macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
|
||||
!macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
|
||||
equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
|
||||
DEFINES += OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
|
||||
!macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
|
||||
LIBS += -lfreeimageplus
|
||||
|
@@ -4,6 +4,10 @@ export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
|
||||
cd $aSamplePath
|
||||
qmake Tutorial.pro
|
||||
if test `uname -s` != "Darwin"; then
|
||||
make
|
||||
if [ "$(uname -s)" != "Darwin" ] || [ "$MACOSX_USE_GLX" == "true" ]; then
|
||||
if [ "${CASDEB}" == "d" ]; then
|
||||
make debug
|
||||
else
|
||||
make release
|
||||
fi
|
||||
fi
|
||||
|
@@ -10,7 +10,7 @@ STATION=$host
|
||||
RES_DIR="${aSamplePath}/res"
|
||||
|
||||
aSystem=`uname -s`
|
||||
if [ "$aSystem" == "Darwin" ]; then
|
||||
if [ "$aSystem" == "Darwin" ] && [ "$MACOSX_USE_GLX" != "true" ]; then
|
||||
if [ "${CASDEB}" == "d" ]; then
|
||||
BIN_DIR="${aSamplePath}/build/Debug/Tutorial.app/Contents/MacOS"
|
||||
else
|
||||
@@ -30,7 +30,7 @@ export PATH
|
||||
|
||||
if test ! -r "${BIN_DIR}/Tutorial"; then
|
||||
echo "Executable \"${BIN_DIR}/Tutorial\" not found."
|
||||
if [ "$aSystem" == "Darwin" ]; then
|
||||
if [ "$aSystem" == "Darwin" ] && [ "$MACOSX_USE_GLX" != "true" ]; then
|
||||
echo "Probably you don't compile the application. Build it with Xcode."
|
||||
else
|
||||
echo "Probably you don't compile the application. Execute \"make\"."
|
||||
|
Reference in New Issue
Block a user