Skip to content

Commit

Permalink
Fix Natron.rc on MINGW
Browse files Browse the repository at this point in the history
  • Loading branch information
MrKepzie committed Aug 25, 2015
1 parent 7b2e57c commit 8229aa7
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.com
*.DS_Store
*_moc.cpp
*_resource.rc
moc*.cpp
*moc
build
Expand Down
1 change: 1 addition & 0 deletions App/App.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ VERSION = 2.0.0
TEMPLATE = app
win32 {
CONFIG += console
RC_FILE += ../Natron.rc
} else {
CONFIG += app
}
Expand Down
2 changes: 2 additions & 0 deletions Global/Macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 27 additions & 1 deletion Natron.rc
Original file line number Diff line number Diff line change
@@ -1 +1,27 @@
IDI_ICON1 ICON DISCARDABLE "Gui/Resources/Images/natronIcon256_windows.ico"
#include <windows.h>
#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
4 changes: 4 additions & 0 deletions Renderer/Renderer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion global.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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* {
Expand Down

0 comments on commit 8229aa7

Please sign in to comment.