etc/Patches/Qt-v4.8.7-mkspecs-MSVC12-FullyStaticBuild.V2.diff

   1 diff --git "a/D:\\Qt\\Source\\_4.8.7_\\Static\\mkspecs\\win32-msvc2013\\qmake.conf.org" "b/D:\\Qt\\Source\\_4.8.7_\\Static\\mkspecs\\win32-msvc2013\\qmake.conf"
   2 index 3ebb1da..79e7eac 100644
   3 --- "a/D:\\Qt\\Source\\_4.8.7_\\Static\\mkspecs\\win32-msvc2013\\qmake.conf.org"
   4 +++ "b/D:\\Qt\\Source\\_4.8.7_\\Static\\mkspecs\\win32-msvc2013\\qmake.conf"
   5 @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR      = MSBUILD
   6  TEMPLATE                = app
   7  CONFIG                  += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
   8  QT                      += core gui
   9 -DEFINES                 += UNICODE WIN32
  10 +DEFINES                 += UNICODE WIN32 _USING_V110_SDK71_
  11  QMAKE_COMPILER_DEFINES  += _MSC_VER=1800 WIN32
  12
  13  QMAKE_CC                = cl
  14 @@ -16,14 +16,14 @@ QMAKE_LEX               = flex
  15  QMAKE_LEXFLAGS          =
  16  QMAKE_YACC              = byacc
  17  QMAKE_YACCFLAGS         = -d
  18 -QMAKE_CFLAGS            = -nologo -Zm200 -Zc:wchar_t- -FS
  19 +QMAKE_CFLAGS            = -nologo -Zm200 -Zc:wchar_t-
  20  QMAKE_CFLAGS_WARN_ON    = -W3
  21  QMAKE_CFLAGS_WARN_OFF   = -W0
  22 -QMAKE_CFLAGS_RELEASE    = -O2 -MD
  23 -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
  24 +QMAKE_CFLAGS_RELEASE    = -Ox -Ob2 -Oi -Ot -Oy -MT -arch:IA32 -fp:fast -GS-
  25 +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -Ox -Ob2 -Oi -Ot -Oy -MT -arch:IA32 -fp:fast -GS- -Zi
  26  QMAKE_CFLAGS_DEBUG      = -Zi -MDd
  27  QMAKE_CFLAGS_YACC       =
  28 -QMAKE_CFLAGS_LTCG       = -GL
  29 +QMAKE_CFLAGS_LTCG       = -GL -Gy
  30  QMAKE_CFLAGS_MP         = -MP
  31
  32  QMAKE_CXX               = $$QMAKE_CC
  33 @@ -59,13 +59,13 @@ QMAKE_LFLAGS            = /NOLOGO /DYNAMICBASE /NXCOMPAT
  34  QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
  35  QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
  36  QMAKE_LFLAGS_DEBUG      = /DEBUG
  37 -QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
  38 -QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS
  39 +QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE,5.01
  40 +QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS,5.01
  41  QMAKE_LFLAGS_EXE        = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
  42  QMAKE_LFLAGS_DLL        = /DLL
  43  QMAKE_LFLAGS_LTCG       = /LTCG
  44
  45 -QMAKE_LIBS_CORE         = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
  46 +QMAKE_LIBS_CORE         = E:\DeLpHi\EncodePointerLib\Release\EncodePointer.lib kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
  47  QMAKE_LIBS_GUI          = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
  48  QMAKE_LIBS_NETWORK      = ws2_32.lib
  49  QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib