Skip to content

Commit 8229aa7

Browse files
committed
Fix Natron.rc on MINGW
1 parent 7b2e57c commit 8229aa7

File tree

6 files changed

+35
-2
lines changed

6 files changed

+35
-2
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.com
33
*.DS_Store
44
*_moc.cpp
5+
*_resource.rc
56
moc*.cpp
67
*moc
78
build

App/App.pro

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ VERSION = 2.0.0
88
TEMPLATE = app
99
win32 {
1010
CONFIG += console
11+
RC_FILE += ../Natron.rc
1112
} else {
1213
CONFIG += app
1314
}

Global/Macros.h

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#define __NATRON_LINUX__
2121
#endif
2222

23+
#define NATRON_APPLICATION_DESCRIPTION "Open-source, cross-platform, nodal compositing software."
24+
#define NATRON_COPYRIGHT "Copyright (C) 2015 the Natron developers."
2325
#define NATRON_ORGANIZATION_NAME "INRIA"
2426
#define NATRON_ORGANIZATION_DOMAIN_TOPLEVEL "fr"
2527
#define NATRON_ORGANIZATION_DOMAIN_SUB "inria"

Natron.rc

+27-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,27 @@
1-
IDI_ICON1 ICON DISCARDABLE "Gui/Resources/Images/natronIcon256_windows.ico"
1+
#include <windows.h>
2+
#include "Global/Macros.h"
3+
4+
IDI_ICON1 ICON DISCARDABLE "Gui/Resources/Images/natronIcon256_windows.ico"
5+
6+
VS_VERSION_INFO VERSIONINFO
7+
FILEVERSION NATRON_VERSION_MAJOR,NATRON_VERSION_MINOR,NATRON_VERSION_REVISION,0
8+
PRODUCTVERSION NATRON_VERSION_MAJOR,NATRON_VERSION_MINOR,NATRON_VERSION_REVISION,0
9+
10+
//See https://msdn.microsoft.com/en-us/library/windows/desktop/aa381049%28v=vs.85%29.aspx
11+
BEGIN
12+
BLOCK "StringFileInfo"
13+
BEGIN
14+
BLOCK "040904E4"
15+
BEGIN
16+
VALUE "CompanyName", NATRON_ORGANIZATION_NAME
17+
VALUE "FileDescription", NATRON_APPLICATION_DESCRIPTION
18+
VALUE "FileVersion", NATRON_VERSION_STRING
19+
VALUE "InternalName", NATRON_APPLICATION_NAME
20+
VALUE "LegalCopyright", NATRON_COPYRIGHT
21+
VALUE "LegalTrademarks1", "All rights reserved."
22+
VALUE "OriginalFilename", NATRON_APPLICATION_NAME ".exe"
23+
VALUE "ProductName", NATRON_APPLICATION_NAME
24+
VALUE "ProductVersion", NATRON_VERSION_STRING
25+
END
26+
END
27+
END

Renderer/Renderer.pro

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ CONFIG += boost qt expat cairo python shiboken pyside
1111

1212
TEMPLATE = app
1313

14+
win32 {
15+
RC_FILE += ../Natron.rc
16+
}
17+
1418
#OpenFX C api includes and OpenFX c++ layer includes that are located in the submodule under /libs/OpenFX
1519
INCLUDEPATH += $$PWD/../libs/OpenFX/include
1620
INCLUDEPATH += $$PWD/../libs/OpenFX_extensions

global.pri

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ win32 {
114114
#microsoft compiler needs _MBCS to compile with the multi-byte character set.
115115
DEFINES += WINDOWS _MBCS COMPILED_FROM_DSP XML_STATIC NOMINMAX
116116
DEFINES -= _UNICODE UNICODE
117-
*-msvc*: RC_FILE += ../Natron.rc
118117
}
119118

120119
win32-msvc* {

0 commit comments

Comments
 (0)