From 2fcd7f1d99db065b9de4b0f75428fdec48f89d95 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 10 Feb 2009 14:01:22 +0000
Subject: [PATCH] From Roger James, fixes for VS build handling of new VS
 versioning support

---
 .../Windows/OpenSceneGraphVersionInfo.rc.in   | 88 +------------------
 .../Windows/OpenThreadsVersionInfo.rc.in      | 88 +------------------
 2 files changed, 2 insertions(+), 174 deletions(-)

diff --git a/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in b/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in
index 82dcd02bf..8e96c7180 100644
--- a/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in
+++ b/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
@@ -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
-
diff --git a/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in b/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in
index 1e63344ff..b5b95c74e 100644
--- a/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in
+++ b/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
@@ -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
-