Workaround for serious bug in ICL: Binary built with /arch:ia32 does not work on the CPU without SSE2 support. Thus, switched to MSVC for the 'i686' build.

This commit is contained in:
LoRd_MuldeR 2020-04-05 19:38:59 +02:00
parent bca17c6474
commit 53c5c9faee
4 changed files with 9 additions and 8 deletions

View File

@ -23,8 +23,8 @@ IDI_ICON1 ICON "MediaInfoXP.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,6,0
PRODUCTVERSION 2,3,6,0
FILEVERSION 2,3,6,1
PRODUCTVERSION 2,3,6,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x3L
@ -43,13 +43,13 @@ BEGIN
VALUE "Comments", "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY"
VALUE "CompanyName", "Free Software Foundation"
VALUE "FileDescription", "MediaInfoXP - GUI for MediaInfo"
VALUE "FileVersion", "2.36"
VALUE "FileVersion", "2.36.1"
VALUE "InternalName", "MediaInfoXP_Qt"
VALUE "LegalCopyright", "Copyright (C) 2004-2020 LoRd_MuldeR <MuldeR2@GMX.de>"
VALUE "LegalTrademarks", "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License <http://www.gnu.org/>"
VALUE "OriginalFilename", "MediaInfoXP.exe"
VALUE "ProductName", "MediaInfoXP - GUI for MediaInfo"
VALUE "ProductVersion", "2.36"
VALUE "ProductVersion", "2.36.1"
VALUE "Website" "http://muldersoft.com/"
END
END

Binary file not shown.

View File

@ -28,6 +28,7 @@
//Version
MIXP_DEFINE_CONF(unsigned int, mixp_versionMajor, 2)
MIXP_DEFINE_CONF(unsigned int, mixp_versionMinor, 36)
MIXP_DEFINE_CONF(unsigned int, mixp_versionPatch, 1)
//MediaInfo Version
MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerMajor, 20)
@ -35,7 +36,7 @@ MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerMinor, 3)
MIXP_DEFINE_CONF(unsigned int, mixp_mediaInfoVerPatch, 0)
//MediaInfo Checksum
MIXP_DEFINE_CONF(char*, mixp_checksum_gen, "806542218cfe87d5bdbb21a7b6139b2f2d3753fe2f14d44c2335f03370f47d9ce3855ecd170f28c0d6dac9a930a5adfa5648872049b67c6801ebc406bb399ee9")
MIXP_DEFINE_CONF(char*, mixp_checksum_gen, "8fe747beff85e47edaf88ddb10e89988a724e5d982a15884521358668f6cb8ef4bbba74b83fdd6f4734ab5153db4b036d1c7403ee077ccc5cee904a7c35068ef")
MIXP_DEFINE_CONF(char*, mixp_checksum_sse, "aa5800a0eecf09a2ee9914ba76ecff46c4616d60b173999f404e4037bf529a142434bfdb9a0241a577b93b8e76ce996379ff962472a970ef01049f283e28b2f7")
MIXP_DEFINE_CONF(char*, mixp_checksum_x64, "d8b63339c194df5f63ccd5320a13dc70b9cc470175efd1f2a8eb2c5d2e0cef1de9cc99e2fc16de1090d8f5b10702d826919814e33f898839be8e91b060f8b598")

View File

@ -57,7 +57,7 @@
#include "IPC.h"
//Macros
#define MIXP_VERSION_STR (QString().sprintf("%u.%02u", g_mixp_versionMajor, g_mixp_versionMinor, g_mixp_versionMinor))
#define MIXP_VERSION_STR (QString().sprintf((g_mixp_versionPatch > 0) ? "%u.%02u.%u" : "%u.%02u", g_mixp_versionMajor, g_mixp_versionMinor, g_mixp_versionPatch))
#define MI_VERSION_STR (QString().sprintf((g_mixp_mediaInfoVerPatch > 0) ? "%u.%02u.%u" : "%u.%02u", g_mixp_mediaInfoVerMajor, g_mixp_mediaInfoVerMinor, g_mixp_mediaInfoVerPatch))
#define UTIL_VERSION_STR (QString().sprintf("%u.%02u", MUtils::Version::lib_version_major(), MUtils::Version::lib_version_minor()))
#define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); }