From 90ac61454fb44a9b5cb8bbc80c0ac90a90437e67 Mon Sep 17 00:00:00 2001 From: dbv Date: Thu, 27 Sep 2012 15:58:32 +0400 Subject: [PATCH] 0023448: Fix QT samples for Mac OS X Fixed QT samples so they can be built on Mac OS X with qt-x11 --- samples/qt/IESample/IESample.pro | 15 ++++++++------- samples/qt/IESample/custom.sh | 15 +++------------ samples/qt/IESample/env.sh | 20 +++++++++++++++++++- samples/qt/Tutorial/Tutorial.pro | 15 ++++++++------- samples/qt/Tutorial/custom.sh | 15 +++------------ samples/qt/Tutorial/env.sh | 20 +++++++++++++++++++- 6 files changed, 60 insertions(+), 40 deletions(-) mode change 100644 => 100755 samples/qt/IESample/IESample.pro mode change 100644 => 100755 samples/qt/IESample/custom.sh mode change 100644 => 100755 samples/qt/IESample/env.sh mode change 100644 => 100755 samples/qt/Tutorial/custom.sh mode change 100644 => 100755 samples/qt/Tutorial/env.sh diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro old mode 100644 new mode 100755 index 57094a711c..3041d86cad --- a/samples/qt/IESample/IESample.pro +++ b/samples/qt/IESample/IESample.pro @@ -13,7 +13,8 @@ TS_FILES = ./src/Common-icon.ts \ DEFINES = CSFDB unix { - INCLUDES = $$(CSF_OPT_INC) + UNAME = $$system(uname -s) + INCLUDES = $$(CSF_OPT_INC) PATHS = $$split(INCLUDES,":") for(path, PATHS):INCLUDEPATH += $${path} LIBLIST = $$(LD_LIBRARY_PATH) @@ -21,13 +22,13 @@ unix { for(lib, LIBPATHS):LIBS += -L$${lib} CONFIG(debug, debug|release) { - DESTDIR = ./Linux/bind - OBJECTS_DIR = ./Linux/objd - MOC_DIR = ./Linux/srcd + DESTDIR = ./$$UNAME/bind + OBJECTS_DIR = ./$$UNAME/objd + MOC_DIR = ./$$UNAME/srcd } else { - DESTDIR = ./Linux/bin - OBJECTS_DIR = ./Linux/obj - MOC_DIR = ./Linux/src + DESTDIR = ./$$UNAME/bin + OBJECTS_DIR = ./$$UNAME/obj + MOC_DIR = ./$$UNAME/src } INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL diff --git a/samples/qt/IESample/custom.sh b/samples/qt/IESample/custom.sh old mode 100644 new mode 100755 index 4506c961a2..7442d2290f --- a/samples/qt/IESample/custom.sh +++ b/samples/qt/IESample/custom.sh @@ -1,19 +1,10 @@ #!/bin/sh -#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake +#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake. +#If you are using Mac OS X it is necessary to define WOKHOME as a path to your WOK installation directory. export CASROOT="" export QTDIR="" -if test "${CASROOT}" == ""; then - echo "Environment variable \"CASROOT\" not defined." - exit 1 -fi - -if test "${QTDIR}" == ""; then - echo "Environment variable \"QTDIR\" not defined." - exit 1 -fi - -export PATH=${QTDIR}/bin:${PATH} \ No newline at end of file +export WOKHOME="" diff --git a/samples/qt/IESample/env.sh b/samples/qt/IESample/env.sh old mode 100644 new mode 100755 index 01a895b246..a8b897d82c --- a/samples/qt/IESample/env.sh +++ b/samples/qt/IESample/env.sh @@ -1,5 +1,23 @@ #!/bin/sh if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi + +if test "${CASROOT}" == ""; then + echo "Environment variable \"CASROOT\" not defined. Define it in \"custom.sh\" script." + exit 1 +fi + +if test "${QTDIR}" == ""; then + echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script." + exit 1 +fi + +if test `uname -s` == "Darwin" && test "${WOKHOME}" == ""; then + echo "Environment variable \"WOKHOME\" not defined. Define it in \"custom.sh\" script." + exit 1 +fi + +export PATH=${QTDIR}/bin:${PATH} + source $CASROOT/env.sh -export CSF_OPT_INC="${CSF_OPT_INC}${CASROOT}/inc:" +export CSF_OPT_INC="${CASROOT}/inc:${WOKHOME}/lib:${CSF_OPT_INC}" diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro index 1fd4d202e0..524c5c4c87 100755 --- a/samples/qt/Tutorial/Tutorial.pro +++ b/samples/qt/Tutorial/Tutorial.pro @@ -15,21 +15,22 @@ TS_FILES = ./src/Common-icon.ts \ DEFINES = CSFDB unix { + UNAME = $$system(uname -s) INCLUDES = $$(CSF_OPT_INC) PATHS = $$split(INCLUDES,":") for(path, PATHS):INCLUDEPATH += $${path} LIBLIST = $$(LD_LIBRARY_PATH) LIBPATHS = $$split(LIBLIST,":") for(lib, LIBPATHS):LIBS += -L$${lib} - + CONFIG(debug, debug|release) { - DESTDIR = ./Linux/bind - OBJECTS_DIR = ./Linux/objd - MOC_DIR = ./Linux/srcd + DESTDIR = ./$$UNAME/bind + OBJECTS_DIR = ./$$UNAME/objd + MOC_DIR = ./$$UNAME/srcd } else { - DESTDIR = ./Linux/bin - OBJECTS_DIR = ./Linux/obj - MOC_DIR = ./Linux/src + DESTDIR = ./$$UNAME/bin + OBJECTS_DIR = ./$$UNAME/obj + MOC_DIR = ./$$UNAME/src } INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H diff --git a/samples/qt/Tutorial/custom.sh b/samples/qt/Tutorial/custom.sh old mode 100644 new mode 100755 index 4506c961a2..7442d2290f --- a/samples/qt/Tutorial/custom.sh +++ b/samples/qt/Tutorial/custom.sh @@ -1,19 +1,10 @@ #!/bin/sh -#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake +#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake. +#If you are using Mac OS X it is necessary to define WOKHOME as a path to your WOK installation directory. export CASROOT="" export QTDIR="" -if test "${CASROOT}" == ""; then - echo "Environment variable \"CASROOT\" not defined." - exit 1 -fi - -if test "${QTDIR}" == ""; then - echo "Environment variable \"QTDIR\" not defined." - exit 1 -fi - -export PATH=${QTDIR}/bin:${PATH} \ No newline at end of file +export WOKHOME="" diff --git a/samples/qt/Tutorial/env.sh b/samples/qt/Tutorial/env.sh old mode 100644 new mode 100755 index 01a895b246..a8b897d82c --- a/samples/qt/Tutorial/env.sh +++ b/samples/qt/Tutorial/env.sh @@ -1,5 +1,23 @@ #!/bin/sh if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi + +if test "${CASROOT}" == ""; then + echo "Environment variable \"CASROOT\" not defined. Define it in \"custom.sh\" script." + exit 1 +fi + +if test "${QTDIR}" == ""; then + echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script." + exit 1 +fi + +if test `uname -s` == "Darwin" && test "${WOKHOME}" == ""; then + echo "Environment variable \"WOKHOME\" not defined. Define it in \"custom.sh\" script." + exit 1 +fi + +export PATH=${QTDIR}/bin:${PATH} + source $CASROOT/env.sh -export CSF_OPT_INC="${CSF_OPT_INC}${CASROOT}/inc:" +export CSF_OPT_INC="${CASROOT}/inc:${WOKHOME}/lib:${CSF_OPT_INC}" -- 2.20.1