diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:14 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:14 (GMT) |
| commit | 5ed6ba7d1520049ba57512c5bc034f188a697fc9 (patch) | |
| tree | bcfeab686697250d4bcde2967d5703f41df2fb7a | |
| parent | c3e055c37a4916b96840f4c54eae40595cf648cf (diff) | |
| download | Qt-5ed6ba7d1520049ba57512c5bc034f188a697fc9.zip Qt-5ed6ba7d1520049ba57512c5bc034f188a697fc9.tar.gz Qt-5ed6ba7d1520049ba57512c5bc034f188a697fc9.tar.bz2 | |
Revert "Switched windows opengl to es2"
This reverts commit ec883d531143b8de15f527ff770c4f198c6bf723.
| -rw-r--r-- | Makefile.mingw64 | 2 | ||||
| -rw-r--r-- | buildqt64.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.mingw64 b/Makefile.mingw64 index aea36c7..bbd0280 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -80,7 +80,7 @@ qt.$(ARCH): -qt-libpng \ -qt-pcre \ -qt-freetype \ - -opengl es2 \ + -opengl desktop \ -openssl \ -I$(QT_INST_PATH)/include \ -L$(QT_INST_PATH)/lib \ diff --git a/buildqt64.bat b/buildqt64.bat index 33682b4..46ea712 100644 --- a/buildqt64.bat +++ b/buildqt64.bat @@ -77,7 +77,7 @@ rename qt-everywhere-src-%QT_FULL_VER% qt-%QT_VERSION% SET PREFIX=%BASEDIR%qt-%QT_VERSION%-%INST_ARCH%\
cd %SRC_DIR%
del config.cache
-call .\configure -prefix %PREFIX% -mp -static -shared -platform win32-msvc -release -nomake examples -nomake tests -skip qtdoc -skip qtgamepad -skip qtwebengine -ssl -openssl -I%BASEDIR%openssl-%INST_ARCH%\include -L%BASEDIR%openssl-%INST_ARCH%\lib -opensource -qt-zlib -qt-libjpeg -qt-libpng -qt-pcre -qt-freetype -opengl es2 -confirm-license
+call .\configure -prefix %PREFIX% -mp -static -shared -platform win32-msvc -release -nomake examples -nomake tests -skip qtdoc -skip qtgamepad -skip qtwebengine -ssl -openssl -I%BASEDIR%openssl-%INST_ARCH%\include -L%BASEDIR%openssl-%INST_ARCH%\lib -opensource -qt-zlib -qt-libjpeg -qt-libpng -qt-pcre -qt-freetype -opengl desktop -confirm-license
if %errorlevel% neq 0 exit /b %errorlevel%
call nmake
if %errorlevel% neq 0 exit /b %errorlevel%
|