diff options
Diffstat (limited to 'mkspecs/common')
-rw-r--r-- | mkspecs/common/angle.conf | 9 | ||||
-rw-r--r-- | mkspecs/common/gcc-base-mac.conf | 5 | ||||
-rw-r--r-- | mkspecs/common/gcc-base-unix.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/gcc-base.conf | 8 | ||||
-rw-r--r-- | mkspecs/common/ghs-base.conf | 15 | ||||
-rw-r--r-- | mkspecs/common/ghs-integrity-armv7.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/ios/clang.conf | 29 | ||||
-rw-r--r-- | mkspecs/common/macx.conf | 6 | ||||
-rw-r--r-- | mkspecs/common/msvc-desktop.conf | 8 | ||||
-rw-r--r-- | mkspecs/common/msvc-version.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/uikit.conf | 3 | ||||
-rw-r--r-- | mkspecs/common/uikit/clang.conf | 7 | ||||
-rw-r--r-- | mkspecs/common/uikit/qmake.conf (renamed from mkspecs/common/ios/qmake.conf) | 2 | ||||
-rw-r--r-- | mkspecs/common/windows-gles.conf | 7 | ||||
-rw-r--r-- | mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in | 47 | ||||
-rw-r--r-- | mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in | 48 | ||||
-rw-r--r-- | mkspecs/common/winrt_winphone/qmake.conf | 6 |
17 files changed, 50 insertions, 156 deletions
diff --git a/mkspecs/common/angle.conf b/mkspecs/common/angle.conf deleted file mode 100644 index fffdb581c5..0000000000 --- a/mkspecs/common/angle.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Renaming these files requires that the LIBRARY entry of their corresponding -# def files are also updated to reflect the name. -# The .def files are found in the angle directories: -# -# qtbase\src\3rdparty\angle\src\libEGL\libEGL[d?].def -# qtbase\src\3rdparty\angle\src\libEGL\libGLESv2[d?].def - -LIBEGL_NAME="libEGL" -LIBGLESV2_NAME="libGLESv2" diff --git a/mkspecs/common/gcc-base-mac.conf b/mkspecs/common/gcc-base-mac.conf index e9bf780ec1..6008952537 100644 --- a/mkspecs/common/gcc-base-mac.conf +++ b/mkspecs/common/gcc-base-mac.conf @@ -8,16 +8,17 @@ # you can use the manual test in tests/manual/mkspecs. # +QMAKE_CFLAGS_PIC = -fPIC + include(gcc-base.conf) QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 __APPLE_CC__ -QMAKE_LFLAGS += -headerpad_max_install_names - QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_INCREMENTAL += -undefined suppress -flat_namespace QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE} +QMAKE_LFLAGS_HEADERPAD += -headerpad_max_install_names QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE} diff --git a/mkspecs/common/gcc-base-unix.conf b/mkspecs/common/gcc-base-unix.conf index 0178bda75a..2d63877dc9 100644 --- a/mkspecs/common/gcc-base-unix.conf +++ b/mkspecs/common/gcc-base-unix.conf @@ -8,6 +8,8 @@ # you can use the manual test in tests/manual/mkspecs. # +QMAKE_CFLAGS_PIC = -fPIC + include(gcc-base.conf) QMAKE_LFLAGS_SHLIB += -shared diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 52667f130e..9ddebae506 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -33,6 +33,7 @@ QMAKE_CFLAGS_OPTIMIZE = -O2 QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 +QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M @@ -41,9 +42,9 @@ QMAKE_CFLAGS_WARN_OFF += -w QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g QMAKE_CFLAGS_DEBUG += -g -QMAKE_CFLAGS_SHLIB += -fPIC -QMAKE_CFLAGS_STATIC_LIB += -fPIC -QMAKE_CFLAGS_APP += -fPIC +QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC +QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC +QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC QMAKE_CFLAGS_ISYSTEM = -isystem QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden @@ -84,6 +85,7 @@ QMAKE_CFLAGS_SSE3 += -msse3 QMAKE_CFLAGS_SSSE3 += -mssse3 QMAKE_CFLAGS_SSE4_1 += -msse4.1 QMAKE_CFLAGS_SSE4_2 += -msse4.2 +QMAKE_CFLAGS_F16C += -mf16c QMAKE_CFLAGS_AVX += -mavx QMAKE_CFLAGS_AVX2 += -mavx2 QMAKE_CFLAGS_AVX512F += -mavx512f diff --git a/mkspecs/common/ghs-base.conf b/mkspecs/common/ghs-base.conf index ad452ecc43..bd1f3eb5ab 100644 --- a/mkspecs/common/ghs-base.conf +++ b/mkspecs/common/ghs-base.conf @@ -8,7 +8,7 @@ QMAKE_COMPILER = ghs QMAKE_CFLAGS += --signed_fields --no_commons --diag_suppress=1,82,228,236,381,611,961,997,1795,1974 QMAKE_CFLAGS_DEPS += -MD -QMAKE_CFLAGS_RELEASE += -Ospeed -Olink -Omax -uvfd +QMAKE_CFLAGS_RELEASE += -Ospeed -Olink -Omax QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE -g QMAKE_CFLAGS_DEBUG += -g -Omaxdebug QMAKE_CFLAGS_SHLIB += @@ -17,7 +17,7 @@ QMAKE_CFLAGS_APP += QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared --exceptions --new_outside_of_constructor +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF @@ -29,11 +29,14 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -QMAKE_CXXFLAGS_CXX11 += --c++11 --thread_local_storage +QMAKE_CXXFLAGS_CXX11 += --c++11 --thread_local_storage +QMAKE_CXXFLAGS_EXCEPTIONS_ON += --exceptions -QMAKE_LFLAGS += --no_commons -non_shared --link_once_templates --exceptions --stdle -QMAKE_LFLAGS_RELEASE += -Ospeed -Olink -uvfd +QMAKE_LFLAGS += --signed_fields --no_commons --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor +QMAKE_LFLAGS_DEBUG += -g -Omaxdebug +QMAKE_LFLAGS_RELEASE += -Ospeed -Olink -Omax QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_LFLAGS_RELEASE -g +QMAKE_LFLAGS_CXX11 += --c++11 --thread_local_storage +QMAKE_LFLAGS_EXCEPTIONS_ON += --exceptions QMAKE_LIBS_CORE = -lposix -livfs -lsocket -lnet -ldl -QMAKE_LIBS_GUI = -lfbdev -lhiddev diff --git a/mkspecs/common/ghs-integrity-armv7.conf b/mkspecs/common/ghs-integrity-armv7.conf index f678edb958..0c39e8ccdf 100644 --- a/mkspecs/common/ghs-integrity-armv7.conf +++ b/mkspecs/common/ghs-integrity-armv7.conf @@ -14,4 +14,6 @@ QMAKE_CXX = cxintarm -bsp $$(INTEGRITY_BSP) -os_dir $$(INTEGRITY_D QMAKE_LINK = $$QMAKE_CXX QMAKE_AR = $$QMAKE_CXX -archive -o +QMAKE_LIBS_GUI = -lfbdev -lhiddev + load(qt_config) diff --git a/mkspecs/common/ios/clang.conf b/mkspecs/common/ios/clang.conf deleted file mode 100644 index f45b89665f..0000000000 --- a/mkspecs/common/ios/clang.conf +++ /dev/null @@ -1,29 +0,0 @@ -# -# compiler settings for iOS clang compilers -# - -# iOS build flags -QMAKE_IOS_CFLAGS += -fvisibility=hidden -fpascal-strings -fmessage-length=0 -QMAKE_IOS_CFLAGS += -Wno-trigraphs -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -Wno-sign-conversion -QMAKE_IOS_CXXFLAGS += -fvisibility-inlines-hidden - -# Based on the following information, http://clang.llvm.org/doxygen/ObjCRuntime_8h_source.html, -# we can conclude that it's safe to always pass the following flags -QMAKE_IOS_OBJ_CFLAGS += -fobjc-nonfragile-abi -fobjc-legacy-dispatch - -# But these only apply to non-ARM targets -!contains(QT_ARCH, arm): QMAKE_IOS_CFLAGS += -fexceptions -fasm-blocks - -# Clang 3.1 (and above) flags -QMAKE_IOS_CFLAGS += -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-implicit-atomic-properties -Wformat -Wno-missing-braces -Wno-unused-function -Wno-unused-label -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-sign-compare -Wpointer-sign -Wno-newline-eof -Wdeprecated-declarations -Winvalid-offsetof -Wno-conversion -QMAKE_IOS_CXXFLAGS += -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -QMAKE_IOS_OBJ_CFLAGS += -Wno-deprecated-implementations -Wprotocol -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector - -# Set build flags -QMAKE_CFLAGS += $$QMAKE_IOS_CFLAGS -QMAKE_CXXFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS -QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_OBJ_CFLAGS - -QMAKE_IOS_CFLAGS = -QMAKE_IOS_CXXFLAGS = -QMAKE_IOS_OBJ_CFLAGS = diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 69d731b48a..4be0eb3c39 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -5,4 +5,10 @@ QMAKE_PLATFORM += macos osx macx QMAKE_MAC_SDK = macosx +device.sdk = macosx +device.target = device +device.dir_affix = $${device.sdk} +device.CONFIG = $${device.sdk} +device.deployment_identifier = $${device.sdk} + include(mac.conf) diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index 52d9408c1c..02b8441547 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -8,8 +8,6 @@ # Version-specific settings go in msvc-version.conf (loaded by default_pre) # -include(angle.conf) - MAKEFILE_GENERATOR = MSVC.NET QMAKE_PLATFORM = win32 QMAKE_COMPILER = msvc @@ -91,8 +89,8 @@ QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib QMAKE_LIBS_GUI = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib ws2_32.lib ole32.lib user32.lib advapi32.lib QMAKE_LIBS_NETWORK = ws2_32.lib QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib -QMAKE_LIBS_OPENGL_ES2 = $${LIBEGL_NAME}.lib $${LIBGLESV2_NAME}.lib gdi32.lib user32.lib -QMAKE_LIBS_OPENGL_ES2_DEBUG = $${LIBEGL_NAME}d.lib $${LIBGLESV2_NAME}d.lib gdi32.lib user32.lib +QMAKE_LIBS_OPENGL_ES2 = gdi32.lib user32.lib +QMAKE_LIBS_OPENGL_ES2_DEBUG = gdi32.lib user32.lib QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib QMAKE_LIBS_QT_ENTRY = -lqtmain @@ -104,3 +102,5 @@ QMAKE_RC = rc VCPROJ_EXTENSION = .vcproj VCSOLUTION_EXTENSION = .sln VCPROJ_KEYWORD = Qt4VSv1.0 + +include(windows-gles.conf) diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index 2347ca4866..a69ea98a2d 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -1,7 +1,7 @@ # # qmake configuration for Microsoft Visual Studio C/C++ Compiler # This file is used by win32-msvc, win32-clang-msvc, and all -# winphone-XXX-msvcXXXX specs +# winrt-XXX-msvcXXX specs # # diff --git a/mkspecs/common/uikit.conf b/mkspecs/common/uikit.conf index bfbab36db6..0388b8e616 100644 --- a/mkspecs/common/uikit.conf +++ b/mkspecs/common/uikit.conf @@ -3,9 +3,8 @@ # QMAKE_PLATFORM += uikit -CONFIG += bitcode reduce_exports +CONFIG += bitcode reduce_exports shallow_bundle no_qt_rpath INCLUDEPATH += $$PWD/uikit -DEFINES += DARWIN_NO_CARBON include(mac.conf) diff --git a/mkspecs/common/uikit/clang.conf b/mkspecs/common/uikit/clang.conf new file mode 100644 index 0000000000..6b9b7eea8e --- /dev/null +++ b/mkspecs/common/uikit/clang.conf @@ -0,0 +1,7 @@ +# +# compiler settings for iOS/tvOS/watchOS clang compilers +# + +# Based on the following information, http://clang.llvm.org/doxygen/ObjCRuntime_8h_source.html, +# we can conclude that it's safe to always pass the following flags +QMAKE_OBJECTIVE_CFLAGS += -fobjc-nonfragile-abi -fobjc-legacy-dispatch diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/uikit/qmake.conf index b579562236..45a4f0c806 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/uikit/qmake.conf @@ -1,5 +1,5 @@ # -# Common build settings for all iOS configurations +# Common build settings for all iOS/tvOS/watchOS configurations # QMAKE_XCODE_CODE_SIGN_IDENTITY = "iPhone Developer" diff --git a/mkspecs/common/windows-gles.conf b/mkspecs/common/windows-gles.conf new file mode 100644 index 0000000000..78b96c42d4 --- /dev/null +++ b/mkspecs/common/windows-gles.conf @@ -0,0 +1,7 @@ +# Output name of Qt's ANGLE GLES library. (Note that this is different from upstream ANGLE) +LIBQTANGLE_NAME = QtANGLE + +# Set up .lib files used for linking +QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 +QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in deleted file mode 100644 index b02b691f48..0000000000 --- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version=\"1.0\" encoding=\"utf-8\"?> -<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m2=\"http://schemas.microsoft.com/appx/2013/manifest\"> - <Identity - Name=\"$${WINRT_MANIFEST.identity}\" - ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\" - Publisher=\"$${WINRT_MANIFEST.publisherid}\" - Version=\"$${WINRT_MANIFEST.version}\" /> - <Properties> - <DisplayName>$${WINRT_MANIFEST.name}</DisplayName> - <PublisherDisplayName>$${WINRT_MANIFEST.publisher}</PublisherDisplayName> - <Logo>$${WINRT_MANIFEST.logo_store}</Logo> - </Properties> - <Prerequisites> - <OSMinVersion>6.3.0</OSMinVersion> - <OSMaxVersionTested>6.3.0</OSMaxVersionTested> - </Prerequisites> - <Resources> - <Resource Language=\"en\" /> - </Resources> - <Applications> - <Application - Id=\"App\" - Executable=\"$${WINRT_MANIFEST.target}.exe\" - EntryPoint=\"$${WINRT_MANIFEST.target}.App\"> - <m2:VisualElements - DisplayName=\"$${WINRT_MANIFEST.name}\" - Description=\"$${WINRT_MANIFEST.description}\" - BackgroundColor=\"$${WINRT_MANIFEST.background}\" - ForegroundText=\"$${WINRT_MANIFEST.foreground}\" - Square150x150Logo=\"$${WINRT_MANIFEST.logo_150x150}\" - Square30x30Logo=\"$${WINRT_MANIFEST.logo_30x30}\"> - <m2:DefaultTile Square310x310Logo=\"$${WINRT_MANIFEST.logo_310x310}\" - Wide310x150Logo=\"$${WINRT_MANIFEST.logo_310x150}\" - Square70x70Logo=\"$${WINRT_MANIFEST.logo_70x70}\"> - <m2:ShowNameOnTiles> - <m2:ShowOn Tile=\"square150x150Logo\" /> - <m2:ShowOn Tile=\"wide310x150Logo\" /> - <m2:ShowOn Tile=\"square310x310Logo\" /> - </m2:ShowNameOnTiles> - </m2:DefaultTile> - <m2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_620x300}\" />$${WINRT_MANIFEST.rotation_preference} - </m2:VisualElements> - </Application> - </Applications>$${WINRT_MANIFEST.capabilities} - $${WINRT_MANIFEST.dependencies} -</Package> -<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. --> diff --git a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in deleted file mode 100644 index b989f41efe..0000000000 --- a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version=\"1.0\" encoding=\"utf-8\"?> -<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m2=\"http://schemas.microsoft.com/appx/2013/manifest\" xmlns:m3=\"http://schemas.microsoft.com/appx/2014/manifest\" xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"> - <Identity - Name=\"$${WINRT_MANIFEST.identity}\" - ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\" - Publisher=\"$${WINRT_MANIFEST.publisherid}\" - Version=\"$${WINRT_MANIFEST.version}\" /> - <mp:PhoneIdentity - PhoneProductId=\"$${WINRT_MANIFEST.phone_product_id}\" - PhonePublisherId=\"$${WINRT_MANIFEST.phone_publisher_id}\" /> - <Properties> - <DisplayName>$${WINRT_MANIFEST.name}</DisplayName> - <PublisherDisplayName>$${WINRT_MANIFEST.publisher}</PublisherDisplayName> - <Logo>$${WINRT_MANIFEST.logo_store}</Logo> - </Properties> - <Prerequisites> - <OSMinVersion>6.3.1</OSMinVersion> - <OSMaxVersionTested>6.3.1</OSMaxVersionTested> - </Prerequisites> - <Resources> - <Resource Language=\"en\" /> - </Resources> - <Applications> - <Application - Id=\"App\" - Executable=\"$${WINRT_MANIFEST.target}.exe\" - EntryPoint=\"$${WINRT_MANIFEST.target}.App\"> - <m3:VisualElements - DisplayName=\"$${WINRT_MANIFEST.name}\" - Description=\"$${WINRT_MANIFEST.description}\" - BackgroundColor=\"$${WINRT_MANIFEST.background}\" - ForegroundText=\"$${WINRT_MANIFEST.foreground}\" - Square150x150Logo=\"$${WINRT_MANIFEST.logo_150x150}\" - Square44x44Logo=\"$${WINRT_MANIFEST.logo_44x44}\"> - <m3:DefaultTile Square71x71Logo=\"$${WINRT_MANIFEST.logo_71x71}\" - Wide310x150Logo=\"$${WINRT_MANIFEST.logo_310x150}\"> - <m3:ShowNameOnTiles> - <m3:ShowOn Tile=\"square150x150Logo\" /> - <m3:ShowOn Tile=\"wide310x150Logo\" /> - </m3:ShowNameOnTiles> - </m3:DefaultTile> - <m3:SplashScreen Image=\"$${WINRT_MANIFEST.logo_480x800}\" />$${WINRT_MANIFEST.rotation_preference} - </m3:VisualElements> - </Application> - </Applications>$${WINRT_MANIFEST.capabilities} - $${WINRT_MANIFEST.dependencies} -</Package> -<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. --> diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index 5f87dc0be1..818264c46b 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -4,8 +4,6 @@ # Written for Microsoft Visual C++ # -include(../angle.conf) - MAKEFILE_GENERATOR = MSBUILD QMAKE_COMPILER = msvc QMAKE_PLATFORM = winrt win32 @@ -81,8 +79,6 @@ QMAKE_LIBS += runtimeobject.lib QMAKE_LIBS_CORE += ws2_32.lib QMAKE_LIBS_GUI = QMAKE_LIBS_NETWORK += ws2_32.lib -QMAKE_LIBS_OPENGL_ES2 = $${LIBEGL_NAME}.lib $${LIBGLESV2_NAME}.lib -QMAKE_LIBS_OPENGL_ES2_DEBUG = $${LIBEGL_NAME}d.lib $${LIBGLESV2_NAME}d.lib QMAKE_LIBS_QT_ENTRY = -lqtmain @@ -98,4 +94,6 @@ WINRT_ASSETS_PATH = $$PWD/assets WINRT_MANIFEST.capabilities = defaults WINRT_MANIFEST.capabilities_device = defaults +include(../windows-gles.conf) + load(qt_config) |