From 057155a54749782f1456a5289c2983caa132371b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 24 Mar 2020 11:33:09 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@898 a8b55f48-bf90-11e4-a774-851b48703e85 --- make_libs.bat | 2 +- qad/cmake/QADDeploy.cmake | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/make_libs.bat b/make_libs.bat index 8aa1a41..d530e09 100644 --- a/make_libs.bat +++ b/make_libs.bat @@ -3,4 +3,4 @@ set ARCH=%~1 set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH% mkdir ..\libs_build_win%ARCH% -cd ../libs_build_win%ARCH% && cmake_mgw -Wno-dev -DQGLVIEW=1 -DQT4=0 ../libs && make install -j4 && cd ../libs && pause +cd ../libs_build_win%ARCH% && cmake_mgw -Wno-dev -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../libs && make install -j4 && cd ../libs && pause diff --git a/qad/cmake/QADDeploy.cmake b/qad/cmake/QADDeploy.cmake index a85686f..bee1196 100644 --- a/qad/cmake/QADDeploy.cmake +++ b/qad/cmake/QADDeploy.cmake @@ -100,11 +100,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,0 PRODUCTVERSION 1,0,0,0 FILEFLAGSMASK 0x3fL -#ifdef _DEBUG -FILEFLAGS 0x9L -#else -FILEFLAGS 0x8L -#endif +FILEFLAGS 0x0L FILEOS 0x40004L FILETYPE 0x2L FILESUBTYPE 0x0L @@ -121,10 +117,8 @@ VALUE \"InternalName\", \"${WINDOWS_RC_FULLNAME}\\0\" VALUE \"LegalTrademarks\", \"\\0\" VALUE \"LegalCopyright\", \"${WINDOWS_RC_COMPANY}\\0\" VALUE \"OriginalFilename\", \"${_T}.exe\\0\" -VALUE \"PrivateBuild\", \"1\\0\" VALUE \"ProductName\", \"${WINDOWS_RC_LABEL}\\0\" VALUE \"ProductVersion\", \"${WINDOWS_RC_VERSION}\\0\" -VALUE \"SpecialBuild\", \"\\0\" END END BLOCK \"VarFileInfo\"