Skip to content

Commit

Permalink
From Roger James, fixes for VS build handling of new VS versioning su…
Browse files Browse the repository at this point in the history
…pport
  • Loading branch information
robertosfield committed Feb 10, 2009
1 parent 560cdf4 commit 2fcd7f1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 174 deletions.
88 changes: 1 addition & 87 deletions PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in
@@ -1,74 +1,4 @@
// Microsoft Visual C++ generated resource script.
//

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 1 resource.
//
#include "afxres.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
//

//OLD - Visual C++ generated script
//1 TEXTINCLUDE
//BEGIN
// "resource.h\0"
//END
//
//2 TEXTINCLUDE
//BEGIN
// "#include ""afxres.h""\r\n"
// "\0"
//END
//
//3 TEXTINCLUDE
//BEGIN
// "\r\n"
// "\0"
//END
//
//NEW
1 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END

2 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END




#endif // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
1 VERSIONINFO
FILEVERSION ${OPENSCENEGRAPH_MAJOR_VERSION}, ${OPENSCENEGRAPH_MINOR_VERSION}, ${OPENSCENEGRAPH_PATCH_VERSION}, ${OPENSCENEGRAPH_SOVERSION}
PRODUCTVERSION ${OPENSCENEGRAPH_MAJOR_VERSION}, ${OPENSCENEGRAPH_MINOR_VERSION}, ${OPENSCENEGRAPH_PATCH_VERSION}, ${OPENSCENEGRAPH_SOVERSION}
FILEFLAGSMASK 0x17L
Expand Down Expand Up @@ -99,19 +29,3 @@ 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

88 changes: 1 addition & 87 deletions PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in
@@ -1,74 +1,4 @@
// Microsoft Visual C++ generated resource script.
//

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 1 resource.
//
#include "afxres.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
//

//OLD - Visual C++ generated script
//1 TEXTINCLUDE
//BEGIN
// "resource.h\0"
//END
//
//2 TEXTINCLUDE
//BEGIN
// "#include ""afxres.h""\r\n"
// "\0"
//END
//
//3 TEXTINCLUDE
//BEGIN
// "\r\n"
// "\0"
//END
//
//NEW
1 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END

2 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END




#endif // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
1 VERSIONINFO
FILEVERSION ${OPENTHREADS_MAJOR_VERSION}, ${OPENTHREADS_MINOR_VERSION}, ${OPENTHREADS_PATCH_VERSION}, ${OPENTHREADS_SOVERSION}
PRODUCTVERSION ${OPENTHREADS_MAJOR_VERSION}, ${OPENTHREADS_MINOR_VERSION}, ${OPENTHREADS_PATCH_VERSION}, ${OPENTHREADS_SOVERSION}
FILEFLAGSMASK 0x17L
Expand Down Expand Up @@ -99,19 +29,3 @@ 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

0 comments on commit 2fcd7f1

Please sign in to comment.