From 7c9b9d5dcd08833486554ed4e88ed8e86ab30ac0 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" <Philipp.Lohmann@oracle.com>
Date: Thu, 24 Mar 2011 11:58:22 +0100
Subject: [PATCH] vcl2gnumake: updated windows makefiles

---
 solenv/gbuild/platform/windows.mk  |   8 ++-
 solenv/gbuild/platform/winmingw.mk |   8 ++-
 solenv/gbuild/shlinfo.rc           | 107 -----------------------------
 3 files changed, 14 insertions(+), 109 deletions(-)
 delete mode 100644 solenv/gbuild/shlinfo.rc

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 4a2922164286..3b34fc522f0c 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -539,7 +539,13 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/gbuild/shlinfo)
+$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+        $$(DEFS) \
+        -DADDITIONAL_VERINFO1 \
+        -DADDITIONAL_VERINFO2 \
+        -DADDITIONAL_VERINFO3 \
+)
 $(call gb_Library_add_nativeres,$(1),$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
 
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 62167b4b1b9f..49c36c14bc1b 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -543,7 +543,13 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/gbuild/shlinfo)
+$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+        $$(DEFS) \
+        -DADDITIONAL_VERINFO1 \
+        -DADDITIONAL_VERINFO2 \
+        -DADDITIONAL_VERINFO3 \
+)
 $(call gb_Library_add_nativeres,$(1),$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
 
diff --git a/solenv/gbuild/shlinfo.rc b/solenv/gbuild/shlinfo.rc
deleted file mode 100644
index 8453e9826170..000000000000
--- a/solenv/gbuild/shlinfo.rc
+++ /dev/null
@@ -1,107 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#if !defined(ENGLISH)
-#define LG_D 					// generate always german version
-#endif
-
-#define VER_FIRSTYEAR	2010
-
-
-#if defined(OS2)
-
-#define OS2_VERSION "hello world"
-
-#else
-
-#include <windows.h>
-#include "version.hrc"
-
-// -----------------------------------------------------------------------
-// 				version information
-// -----------------------------------------------------------------------
-
-VS_VERSION_INFO versioninfo
-#ifndef SUBVERSION
-	fileversion    VERSION, 0, VERVARIANT, VER_COUNT
-	productversion VERSION, 0, VERVARIANT, VER_COUNT
-#else
-	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-#endif
-	fileflagsmask 0x3F
-	fileflags
-#if defined(DEBUG)
-	VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-	VS_FF_PRERELEASE |
-#endif
-	0
-#ifndef WIN32
-	fileos VOS_DOS_WINDOWS16
-#else
-	fileos VOS_NT_WINDOWS32
-#endif
-	filetype VFT_APP
-	{
-		block "StringFileInfo"
-		{
-#ifdef LG_D
-			block "040704E4"
-			{
-				// German StringTable
-				value "CompanyName",		"OpenOffice.org\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	PPS(ORG_NAME) "\0"
-				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
-			}
-#else
-			block "040904E4"
-			{
-				// International StringTable
-				value "CompanyName",		"OpenOffice.org\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	PPS(ORG_NAME) "\0"
-				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
-			}
-#endif
-		}
-
-		block "VarFileInfo"
-		{
-#ifdef LG_D
-			value "Translation", 0x0407, 1252
-#else
-			value "Translation", 0x0409, 1252
-#endif
-		}
-	}
-
-#endif // OS2