diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/opengl/util/glsl_to_include.sh | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/opengl/util/glsl_to_include.sh')
-rwxr-xr-x | src/opengl/util/glsl_to_include.sh | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/src/opengl/util/glsl_to_include.sh b/src/opengl/util/glsl_to_include.sh deleted file mode 100755 index c97239bfdd..0000000000 --- a/src/opengl/util/glsl_to_include.sh +++ /dev/null @@ -1,73 +0,0 @@ -#! /bin/sh -############################################################################# -## -## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. -## Contact: Nokia Corporation (qt-info@nokia.com) -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## GNU Lesser General Public License Usage -## This file may be used under the terms of the GNU Lesser General Public -## License version 2.1 as published by the Free Software Foundation and -## appearing in the file LICENSE.LGPL included in the packaging of this -## file. Please review the following information to ensure the GNU Lesser -## General Public License version 2.1 requirements will be met: -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## In addition, as a special exception, Nokia gives you certain additional -## rights. These rights are described in the Nokia Qt LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU General -## Public License version 3.0 as published by the Free Software Foundation -## and appearing in the file LICENSE.GPL included in the packaging of this -## file. Please review the following information to ensure the GNU General -## Public License version 3.0 requirements will be met: -## http://www.gnu.org/copyleft/gpl.html. -## -## Other Usage -## Alternatively, this file may be used in accordance with the terms and -## conditions contained in a signed written agreement between you and Nokia. -## -## -## -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -# Compile a .glsl file to a file that can be included in a C++ program -USAGE="Usage: $0 <file.glsl>" -CGC=cgc -CGC_PROFILE=arbfp1 - -if test $# -ne 1 -then - echo $USAGE - exit 1 -fi - -GLSL_FILE=$1 -FRAG_FILE=`basename $1 .glsl`.frag -#GLSL_INC_FILE=`basename $1 .glsl`.glsl_quoted - -echo "// Generated by src/opengl/util/$0 from $1" > $FRAG_FILE -$CGC -quiet -oglsl -profile $CGC_PROFILE $GLSL_FILE | while read line -do - if test `echo $line | cut -c1` != "#" - then - echo -e \"$line\" >> $FRAG_FILE - fi -done -echo "; // Generated by src/opengl/util/$0 from $1" >> $FRAG_FILE - -#echo "// Generated by src/opengl/util/$0 from $1" > $GLSL_INC_FILE -#cat $GLSL_FILE | while read line -#do -# printf \"%s\\\\n\"\\n "$line" >> $GLSL_INC_FILE -#done -#echo "; // Generated by src/opengl/util/$0 from $1" >> $GLSL_INC_FILE |