Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autogenerated versioned windows resource files

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-18 23:40:19 +01:00
parent 3b8fbbc827
commit 7183797e05
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -26,3 +26,5 @@ qtcreator-build/
/.pc /.pc
/build-* /build-*
/viewer-* /viewer-*
/indra/newview/res/viewerRes.rc
/indra/newview/res/viewerRes_bc.rc

12
indra/cmake/BuildVersion.cmake
View File

@@ -33,6 +33,18 @@ configure_file(
${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h
) )
if (WINDOWS)
configure_file(
${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc
)
configure_file(
${CMAKE_SOURCE_DIR}/newview/res/viewerRes_bc.rc.in
${CMAKE_SOURCE_DIR}/newview/res/viewerRes_bc.rc
)
endif (WINDOWS)
# Compose the version. # Compose the version.
set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}") set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$") if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")

8
indra/newview/res/viewerRes.rc → indra/newview/res/viewerRes.rc.in
View File

@@ -138,8 +138,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,8,4,5433 FILEVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
PRODUCTVERSION 1,8,4,5433 PRODUCTVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Siana Gearz" VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer" VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.8.4.5433" VALUE "FileVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
VALUE "InternalName", "Second Life" VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz" VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
VALUE "OriginalFilename", "SingularityViewer.exe" VALUE "OriginalFilename", "SingularityViewer.exe"
VALUE "ProductName", "Singularity Viewer" VALUE "ProductName", "Singularity Viewer"
VALUE "ProductVersion", "1.8.4.5433" VALUE "ProductVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
indra/newview/res/viewerRes_bc.rc → indra/newview/res/viewerRes_bc.rc.in
View File

@@ -138,8 +138,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,8,4,5433 FILEVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
PRODUCTVERSION 1,8,4,5433 PRODUCTVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Siana Gearz" VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer" VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.8.4.5433" VALUE "FileVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
VALUE "InternalName", "Second Life" VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz" VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
VALUE "OriginalFilename", "SingularityViewer.exe" VALUE "OriginalFilename", "SingularityViewer.exe"
VALUE "ProductName", "Singularity Viewer" VALUE "ProductName", "Singularity Viewer"
VALUE "ProductVersion", "1.8.4.5433" VALUE "ProductVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"