From 82694d2d29f6fbe5d72dbfec1bf79fc51e109f57 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sun, 11 Nov 2012 18:23:27 +0100
Subject: [PATCH] Hide 4996 warnings in all projects and fix license copy

---
 src/common/common.vcxproj |  3 +--
 src/fe-gtk/fe-gtk.vcxproj |  4 ++--
 win32/hexchat.props       | 22 ++++------------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 60267b2d..1e46c95c 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -124,7 +124,6 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-	  <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -143,7 +142,7 @@
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-	  <DisableSpecificWarnings>4244;4267;4996</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4244;4267</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj
index 45abf752..98a61fff 100644
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@@ -62,7 +62,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-	  <DisableSpecificWarnings>4244;4996</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4244</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -84,7 +84,7 @@
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-	  <DisableSpecificWarnings>4244;4267;4996</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4244;4267</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/win32/hexchat.props b/win32/hexchat.props
index e9807ec5..b0411ceb 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -72,27 +72,12 @@ copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\pangoft2-1.0.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\pangowin32-1.0.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\pixman-1.dll" "$(HexChatRel)"
-::xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines"
+xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines"
 ::xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatRel)\lib\gtk-2.0\modules\"
 xcopy /q /s /i etc "$(HexChatRel)\etc"
 xcopy /q /s /i share "$(HexChatRel)\share"
-copy "..\..\share\doc\COPYING" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.ATK" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.CAIRO" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.FONTCONFIG" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.FREETYPE" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.GDKPIXBUF" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.GETTEXT" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.GLIB" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.GTK" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.LIBFFI" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.LIBPNG" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.LIBXML2" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.PANGO" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.PIXMAN" "$(HexChatRel)\share"
-copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatRel)\share"
+xcopy /q /s /i "..\..\share\doc\COPYING" "$(HexChatRel)\share\doc\hexchat\"
+xcopy /q /s /i "$(DepsRoot)\share\doc" "$(HexChatRel)\share\doc"
 copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)"
@@ -126,6 +111,7 @@ copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)"
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>