Merge pull request #1 from XhmikosR/master

Minor changes, merge as a whole for convenience, update it slightly later

14 files changed, 3 insertions, 39 deletions

diff --git a/win32/copy/copy.vcxproj.user b/win32/copy/copy.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/copy/copy.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/install.vcxproj.user b/win32/ext/zlib-wdk/install.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/install.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/miniunz.vcxproj.user b/win32/ext/zlib-wdk/miniunz.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/miniunz.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/minizip.vcxproj.user b/win32/ext/zlib-wdk/minizip.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/minizip.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/testzlib.vcxproj.user b/win32/ext/zlib-wdk/testzlib.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/testzlib.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/testzlibdll.vcxproj.user b/win32/ext/zlib-wdk/testzlibdll.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/testzlibdll.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/zlibstat.vcxproj.user b/win32/ext/zlib-wdk/zlibstat.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/zlibstat.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/zlibvc.vcxproj.user b/win32/ext/zlib-wdk/zlibvc.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/zlibvc.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 0f2a0df7..0f6d625e 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?> 

+<?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ImportGroup Label="PropertySheets" />

   <PropertyGroup Label="UserMacros">

diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 799f224f..61486190 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -10,6 +10,7 @@ UninstallDisplayName=HexChat (x64)
 DefaultDirName={pf}\HexChat

 DefaultGroupName=HexChat

 DisableProgramGroupPage=yes

+Compression=lzma2/ultra

 SolidCompression=yes

 SourceDir=..\rel

 OutputDir=..

diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 21b5efda..83a45bc7 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -10,6 +10,7 @@ UninstallDisplayName=HexChat (x86)
 DefaultDirName={pf}\HexChat

 DefaultGroupName=HexChat

 DisableProgramGroupPage=yes

+Compression=lzma2/ultra

 SolidCompression=yes

 SourceDir=..\rel

 OutputDir=..

diff --git a/win32/installer/installer.vcxproj.user b/win32/installer/installer.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/installer/installer.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index 94bef1c6..baff5a63 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -61,10 +61,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

     </Link>

-    <PostBuildEvent>

-      <Command>

-      </Command>

-    </PostBuildEvent>

     <PreBuildEvent>

       <Command>cd ..\..\po

 rmdir /q /s "$(OutDir)\locale"

@@ -87,10 +83,6 @@ mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES"
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

     </Link>

-    <PostBuildEvent>

-      <Command>

-      </Command>

-    </PostBuildEvent>

     <PreBuildEvent>

       <Command>cd ..\..\po

 rmdir /q /s "$(OutDir)\locale"

diff --git a/win32/nls/nls.vcxproj.user b/win32/nls/nls.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/nls/nls.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file