From eb812cf3ceb49084bbde73f014a75eee7feaccb3 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Thu, 3 Dec 2015 12:43:09 +0100 Subject: Updating the Toradex Colibri mkspec Change-Id: I7d7256689e2b6ce4fa8930b62397b2d48d8984d6 Reviewed-by: Friedemann Kleint --- mkspecs/wince80colibri-armv7-msvc2012/qmake.conf | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mkspecs/wince80colibri-armv7-msvc2012/qmake.conf b/mkspecs/wince80colibri-armv7-msvc2012/qmake.conf index ea86bc0071..3712c94778 100644 --- a/mkspecs/wince80colibri-armv7-msvc2012/qmake.conf +++ b/mkspecs/wince80colibri-armv7-msvc2012/qmake.conf @@ -5,11 +5,11 @@ include(../common/wince/qmake.conf) -CE_SDK = Toradex_CE8_SDK # replace with actual SDK name +CE_SDK = Toradex_CE800 # replace with actual SDK name CE_ARCH = ARMV7 QT_CONFIG -= accessibility -DEFINES += QT_NO_CLIPBOARD QT_NO_ACCESSIBILITY QT_NO_NATIVE_GESTURES QT_NOSTANDARDSHELL_UI_MODEL _CRT_SECURE_NO_DEPRECATE _WIN32_WCE=0x800 $$CE_ARCH _AMRV7_ armv7 _ARM_ UNDER_CE WINCE ARM +DEFINES += QT_NO_CLIPBOARD QT_NO_ACCESSIBILITY QT_NO_NATIVE_GESTURES QT_NOSTANDARDSHELL_UI_MODEL _CRT_SECURE_NO_DEPRECATE _WIN32_WCE=0x800 $$CE_ARCH _AMRV7_ armv7 _ARM_ UNDER_CE WINCE ARM QT_NO_WINCE_SHELLSDK QT_NO_WINCE_NUIOUSER #QMAKE_CXXFLAGS += /P QMAKE_CFLAGS_RELEASE += -O2 -MT @@ -25,7 +25,7 @@ QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -MD QMAKE_CXXFLAGS_DEBUG -= -MDd QMAKE_CXXFLAGS_DEBUG += -MTd QMAKE_INCDIR_OPENGL_ES2 += $$(NV_WINCE_T2_PLAT)/include -QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:WINDOWSCE,8.00 /MACHINE:ARM /ENTRY:mainCRTStartup +QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:WINDOWSCE,8.00 /MACHINE:ARM QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWSCE,8.00 /MACHINE:ARM QMAKE_LFLAGS_DLL = /SUBSYSTEM:WINDOWSCE,8.00 /MACHINE:ARM /DLL /SAFESEH:NO QMAKE_LIBFLAGS_RELEASE = /LTCG @@ -33,13 +33,10 @@ QMAKE_LIBS = coredll.lib QMAKE_LIBS_CORE = ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib QMAKE_LIBS_GUI = ole32.lib $$QMAKE_LIBS_CORE QMAKE_LIBS_NETWORK = ws2.lib $$QMAKE_LIBS_GUI -QMAKE_LIBS_OPENGL = -QMAKE_LIBS_COMPAT = -QMAKE_LIBS_OPENVG = QMAKE_LIBS_OPENGL_ES2 = $${LIBEGL_NAME}.lib $${LIBGLESV2_NAME}.lib -QMAKE_LIBDIR_OPENGL_ES2 = $$(NV_WINCE_T2_PLAT)/lib/Test -QMAKE_INCDIR_EGL = $$(NV_WINCE_T2_PLAT)/include -QMAKE_LIBDIR_EGL = $$(NV_WINCE_T2_PLAT)/lib/Test + +MAKEFILE_GENERATOR = MSBUILD +VCPROJ_EXTENSION = .vcxproj QMAKE_RC = rc -- cgit v1.2.3