From 8229aa763d4a7dd0b45032624f4afb4113c45f54 Mon Sep 17 00:00:00 2001 From: Alexandre Gauthier Date: Tue, 25 Aug 2015 17:49:20 +0200 Subject: [PATCH] Fix Natron.rc on MINGW --- .gitignore | 1 + App/App.pro | 1 + Global/Macros.h | 2 ++ Natron.rc | 28 +++++++++++++++++++++++++++- Renderer/Renderer.pro | 4 ++++ global.pri | 1 - 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index edb2368591..1d9eb37ab4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.com *.DS_Store *_moc.cpp +*_resource.rc moc*.cpp *moc build diff --git a/App/App.pro b/App/App.pro index baaafa1138..55da744a4a 100644 --- a/App/App.pro +++ b/App/App.pro @@ -8,6 +8,7 @@ VERSION = 2.0.0 TEMPLATE = app win32 { CONFIG += console + RC_FILE += ../Natron.rc } else { CONFIG += app } diff --git a/Global/Macros.h b/Global/Macros.h index eaca965954..b14e1179f4 100644 --- a/Global/Macros.h +++ b/Global/Macros.h @@ -20,6 +20,8 @@ #define __NATRON_LINUX__ #endif +#define NATRON_APPLICATION_DESCRIPTION "Open-source, cross-platform, nodal compositing software." +#define NATRON_COPYRIGHT "Copyright (C) 2015 the Natron developers." #define NATRON_ORGANIZATION_NAME "INRIA" #define NATRON_ORGANIZATION_DOMAIN_TOPLEVEL "fr" #define NATRON_ORGANIZATION_DOMAIN_SUB "inria" diff --git a/Natron.rc b/Natron.rc index 4075f44eab..7bce9955eb 100644 --- a/Natron.rc +++ b/Natron.rc @@ -1 +1,27 @@ -IDI_ICON1 ICON DISCARDABLE "Gui/Resources/Images/natronIcon256_windows.ico" \ No newline at end of file +#include +#include "Global/Macros.h" + +IDI_ICON1 ICON DISCARDABLE "Gui/Resources/Images/natronIcon256_windows.ico" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NATRON_VERSION_MAJOR,NATRON_VERSION_MINOR,NATRON_VERSION_REVISION,0 +PRODUCTVERSION NATRON_VERSION_MAJOR,NATRON_VERSION_MINOR,NATRON_VERSION_REVISION,0 + +//See https://msdn.microsoft.com/en-us/library/windows/desktop/aa381049%28v=vs.85%29.aspx +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", NATRON_ORGANIZATION_NAME + VALUE "FileDescription", NATRON_APPLICATION_DESCRIPTION + VALUE "FileVersion", NATRON_VERSION_STRING + VALUE "InternalName", NATRON_APPLICATION_NAME + VALUE "LegalCopyright", NATRON_COPYRIGHT + VALUE "LegalTrademarks1", "All rights reserved." + VALUE "OriginalFilename", NATRON_APPLICATION_NAME ".exe" + VALUE "ProductName", NATRON_APPLICATION_NAME + VALUE "ProductVersion", NATRON_VERSION_STRING + END + END +END \ No newline at end of file diff --git a/Renderer/Renderer.pro b/Renderer/Renderer.pro index 768f57ac17..168fc0f835 100644 --- a/Renderer/Renderer.pro +++ b/Renderer/Renderer.pro @@ -11,6 +11,10 @@ CONFIG += boost qt expat cairo python shiboken pyside TEMPLATE = app +win32 { + RC_FILE += ../Natron.rc +} + #OpenFX C api includes and OpenFX c++ layer includes that are located in the submodule under /libs/OpenFX INCLUDEPATH += $$PWD/../libs/OpenFX/include INCLUDEPATH += $$PWD/../libs/OpenFX_extensions diff --git a/global.pri b/global.pri index a8899ccc32..cbbeeebe8b 100644 --- a/global.pri +++ b/global.pri @@ -114,7 +114,6 @@ win32 { #microsoft compiler needs _MBCS to compile with the multi-byte character set. DEFINES += WINDOWS _MBCS COMPILED_FROM_DSP XML_STATIC NOMINMAX DEFINES -= _UNICODE UNICODE - *-msvc*: RC_FILE += ../Natron.rc } win32-msvc* {