Skip to content

A
angle
Commit a0ce7e61 by daniel@transgaming.com
Options

Added version info resources.

TRAC #15181 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@539 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent ddf8c5ec
Showing with 275 additions and 5 deletions
src/build_angle.gyp
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
'common/angleutils.h', 'common/angleutils.h',
'common/debug.cpp', 'common/debug.cpp',
'common/debug.h', 'common/debug.h',
'common/version.h',
'libGLESv2/geometry/IndexDataManager.cpp', 'libGLESv2/geometry/IndexDataManager.cpp',
'libGLESv2/geometry/IndexDataManager.h', 'libGLESv2/geometry/IndexDataManager.h',
'libGLESv2/geometry/vertexconversion.h', 'libGLESv2/geometry/vertexconversion.h',
...@@ -198,6 +199,7 @@ ...@@ -198,6 +199,7 @@
'common/angleutils.h', 'common/angleutils.h',
'common/debug.cpp', 'common/debug.cpp',
'common/debug.h', 'common/debug.h',
'common/version.h',
'libEGL/Config.cpp', 'libEGL/Config.cpp',
'libEGL/Config.h', 'libEGL/Config.h',
'libEGL/Display.cpp', 'libEGL/Display.cpp',
......
src/common/version.h 0 → 100644
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 539
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
#define REVISION_STRING MACRO_STRINGIFY(BUILD_REVISION)
#define VERSION_STRING MACRO_STRINGIFY(MAJOR_VERSION) "." MACRO_STRINGIFY(MINOR_VERSION) "." MACRO_STRINGIFY(BUILD_VERSION) "." MACRO_STRINGIFY(BUILD_REVISION)
src/libEGL/libEGL.cpp
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <exception> #include <exception>
#include "common/debug.h" #include "common/debug.h"
#include "common/version.h"
#include "libGLESv2/Context.h" #include "libGLESv2/Context.h"
#include "libEGL/main.h" #include "libEGL/main.h"
...@@ -195,9 +196,9 @@ const char *__stdcall eglQueryString(EGLDisplay dpy, EGLint name) ...@@ -195,9 +196,9 @@ const char *__stdcall eglQueryString(EGLDisplay dpy, EGLint name)
case EGL_EXTENSIONS: case EGL_EXTENSIONS:
return success(""); return success("");
case EGL_VENDOR: case EGL_VENDOR:
return success("TransGaming Inc."); return success("Google Inc.");
case EGL_VERSION: case EGL_VERSION:
return success("1.4 (git-devel "__DATE__" " __TIME__")"); return success("1.4 (ANGLE "VERSION_STRING")");
} }
return error(EGL_BAD_PARAMETER, (const char*)NULL); return error(EGL_BAD_PARAMETER, (const char*)NULL);
......
src/libEGL/libEGL.rc 0 → 100644
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "../common/version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"#include ""../common/version.h""\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "ANGLE libEGL Dynamic Link Library"
VALUE "FileVersion", VERSION_STRING
VALUE "InternalName", "libEGL"
VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc."
VALUE "OriginalFilename", "libEGL.dll"
VALUE "PrivateBuild", VERSION_STRING
VALUE "ProductName", "ANGLE libEGL Dynamic Link Library"
VALUE "ProductVersion", VERSION_STRING
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
src/libEGL/libEGL.vcproj
...@@ -238,14 +238,26 @@ ...@@ -238,14 +238,26 @@
> >
</File> </File>
<File <File
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\Surface.h" RelativePath=".\Surface.h"
> >
</File> </File>
<File
RelativePath="..\common\version.h"
>
</File>
</Filter> </Filter>
<File <File
RelativePath=".\libEGL.def" RelativePath=".\libEGL.def"
> >
</File> </File>
<File
RelativePath=".\libEGL.rc"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
......
src/libEGL/resource.h 0 → 100644
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by libEGL.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
src/libGLESv2/libGLESv2.cpp
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <limits> #include <limits>
#include "common/debug.h" #include "common/debug.h"
#include "common/version.h"
#include "libGLESv2/main.h" #include "libGLESv2/main.h"
#include "libGLESv2/mathutil.h" #include "libGLESv2/mathutil.h"
...@@ -3210,13 +3211,13 @@ const GLubyte* __stdcall glGetString(GLenum name) ...@@ -3210,13 +3211,13 @@ const GLubyte* __stdcall glGetString(GLenum name)
switch (name) switch (name)
{ {
case GL_VENDOR: case GL_VENDOR:
return (GLubyte*)"TransGaming Inc."; return (GLubyte*)"Google Inc.";
case GL_RENDERER: case GL_RENDERER:
return (GLubyte*)"ANGLE"; return (GLubyte*)"ANGLE";
case GL_VERSION: case GL_VERSION:
return (GLubyte*)"OpenGL ES 2.0 (git-devel "__DATE__ " " __TIME__")"; return (GLubyte*)"OpenGL ES 2.0 (ANGLE "VERSION_STRING")";
case GL_SHADING_LANGUAGE_VERSION: case GL_SHADING_LANGUAGE_VERSION:
return (GLubyte*)"OpenGL ES GLSL ES 1.00 (git-devel "__DATE__ " " __TIME__")"; return (GLubyte*)"OpenGL ES GLSL ES 1.00 (ANGLE "VERSION_STRING")";
case GL_EXTENSIONS: case GL_EXTENSIONS:
return (GLubyte*)((context != NULL) ? context->getExtensionString() : ""); return (GLubyte*)((context != NULL) ? context->getExtensionString() : "");
default: default:
......
src/libGLESv2/libGLESv2.rc 0 → 100644
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "../common/version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"#include ""../common/version.h""\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "ANGLE libGLESv2 Dynamic Link Library"
VALUE "FileVersion", VERSION_STRING
VALUE "InternalName", "libGLESv2"
VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc."
VALUE "OriginalFilename", "libGLESv2.dll"
VALUE "PrivateBuild", VERSION_STRING
VALUE "ProductName", "ANGLE libGLESv2 Dynamic Link Library"
VALUE "ProductVersion", VERSION_STRING
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
src/libGLESv2/libGLESv2.vcproj
...@@ -315,6 +315,10 @@ ...@@ -315,6 +315,10 @@
> >
</File> </File>
<File <File
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\ResourceManager.h" RelativePath=".\ResourceManager.h"
> >
</File> </File>
...@@ -330,6 +334,10 @@ ...@@ -330,6 +334,10 @@
RelativePath=".\utilities.h" RelativePath=".\utilities.h"
> >
</File> </File>
<File
RelativePath="..\common\version.h"
>
</File>
<Filter <Filter
Name="Geometry" Name="Geometry"
> >
...@@ -351,6 +359,10 @@ ...@@ -351,6 +359,10 @@
RelativePath=".\libGLESv2.def" RelativePath=".\libGLESv2.def"
> >
</File> </File>
<File
RelativePath=".\libGLESv2.rc"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
......
src/libGLESv2/resource.h 0 → 100644
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by libGLESv2.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment