From 235226758eb1272fc818ce496dece858c8ecb0e0 Mon Sep 17 00:00:00 2001 From: Arnavion Date: Tue, 21 Jul 2015 21:51:20 -0700 Subject: [PATCH] 2015 --- plugins/checksum/checksum.vcxproj | 2 +- plugins/doat/doat.vcxproj | 2 +- plugins/exec/exec.vcxproj | 2 +- plugins/fishlim/fishlim.vcxproj | 2 +- plugins/mpcinfo/mpcinfo.vcxproj | 2 +- plugins/perl/perl.vcxproj | 2 +- plugins/python/python2.vcxproj | 2 +- plugins/python/python3.vcxproj | 2 +- plugins/sysinfo/sysinfo.vcxproj | 2 +- plugins/upd/upd.vcxproj | 6 +++--- plugins/winamp/winamp.vcxproj | 4 ++-- src/common/common.vcxproj | 2 +- src/common/make-te.vcxproj | 2 +- src/fe-gtk/fe-gtk.vcxproj | 5 +++-- src/fe-gtk/notifications/notifications-winrt.vcxproj | 2 +- src/fe-gtk/pixmaps.c | 3 +++ src/fe-text/fe-text.vcxproj | 2 +- src/htm/Properties/Resources.Designer.cs | 2 +- src/htm/Properties/Settings.Designer.cs | 4 ++-- src/htm/app.config | 6 +++--- src/htm/htm.csproj | 9 ++++++--- src/libenchant_win8/libenchant_win8.vcxproj | 2 +- win32/copy/copy.vcxproj | 2 +- win32/installer/installer.vcxproj | 2 +- win32/nls/nls.vcxproj | 2 +- 25 files changed, 40 insertions(+), 33 deletions(-) diff --git a/plugins/checksum/checksum.vcxproj b/plugins/checksum/checksum.vcxproj index 948295a0..7924be88 100644 --- a/plugins/checksum/checksum.vcxproj +++ b/plugins/checksum/checksum.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/doat/doat.vcxproj b/plugins/doat/doat.vcxproj index ae44d7f8..f11dac64 100644 --- a/plugins/doat/doat.vcxproj +++ b/plugins/doat/doat.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj index d691bb11..e34f10e6 100644 --- a/plugins/exec/exec.vcxproj +++ b/plugins/exec/exec.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj index 25492a82..50eec873 100644 --- a/plugins/fishlim/fishlim.vcxproj +++ b/plugins/fishlim/fishlim.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/mpcinfo/mpcinfo.vcxproj b/plugins/mpcinfo/mpcinfo.vcxproj index 3c4b3e7d..236cb572 100644 --- a/plugins/mpcinfo/mpcinfo.vcxproj +++ b/plugins/mpcinfo/mpcinfo.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/perl/perl.vcxproj b/plugins/perl/perl.vcxproj index e9b380ee..bd4a89b1 100644 --- a/plugins/perl/perl.vcxproj +++ b/plugins/perl/perl.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/python/python2.vcxproj b/plugins/python/python2.vcxproj index ecf0df75..f914a865 100644 --- a/plugins/python/python2.vcxproj +++ b/plugins/python/python2.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/python/python3.vcxproj b/plugins/python/python3.vcxproj index 511421e6..815dc8b1 100644 --- a/plugins/python/python3.vcxproj +++ b/plugins/python/python3.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary diff --git a/plugins/sysinfo/sysinfo.vcxproj b/plugins/sysinfo/sysinfo.vcxproj index 3d429295..d130bc0c 100644 --- a/plugins/sysinfo/sysinfo.vcxproj +++ b/plugins/sysinfo/sysinfo.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary Unicode diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj index e39a2887..16f96e45 100644 --- a/plugins/upd/upd.vcxproj +++ b/plugins/upd/upd.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary @@ -29,8 +29,8 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) - ..\..\src\common;$(WinSparklePath);%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) + ..\..\src\common;$(WinSparklePath);%(AdditionalIncludeDirectories) upd.def diff --git a/plugins/winamp/winamp.vcxproj b/plugins/winamp/winamp.vcxproj index cf839cfa..ccc04e72 100644 --- a/plugins/winamp/winamp.vcxproj +++ b/plugins/winamp/winamp.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 DynamicLibrary @@ -54,4 +54,4 @@ - \ No newline at end of file + diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 28a4da11..5c7f2715 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 StaticLibrary diff --git a/src/common/make-te.vcxproj b/src/common/make-te.vcxproj index 24d8f9b6..b7bc2829 100644 --- a/src/common/make-te.vcxproj +++ b/src/common/make-te.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 Application diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index 401518b4..8ca41f32 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 Application @@ -62,7 +62,8 @@ SET SOLUTIONDIR=$(SolutionDir)..\ powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.tt" "$(HexChatLib)hexchat.rc.utf8" REM hexchat.rc needs to be in UCS-2 or Resource Compiler will complain powershell "Get-Content -Encoding UTF8 '$(HexChatLib)hexchat.rc.utf8' | Out-File '$(HexChatLib)hexchat.rc'; Remove-Item '$(HexChatLib)hexchat.rc.utf8'" -"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.c" "$(DataDir)hexchat.gresource.xml" +"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-header --manual-register --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.h" "$(DataDir)hexchat.gresource.xml" +"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --manual-register --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.c" "$(DataDir)hexchat.gresource.xml" ]]> Build hexchat.rc and gresource file diff --git a/src/fe-gtk/notifications/notifications-winrt.vcxproj b/src/fe-gtk/notifications/notifications-winrt.vcxproj index dcd2a2b7..1f392b6b 100644 --- a/src/fe-gtk/notifications/notifications-winrt.vcxproj +++ b/src/fe-gtk/notifications/notifications-winrt.vcxproj @@ -23,7 +23,7 @@ - v120 + v140 DynamicLibrary Unicode diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c index 053afaaf..b19c207d 100644 --- a/src/fe-gtk/pixmaps.c +++ b/src/fe-gtk/pixmaps.c @@ -24,6 +24,7 @@ #include "../common/cfgfiles.h" #include "../common/hexchat.h" #include "../common/fe.h" +#include "resources.h" #include #include @@ -108,6 +109,8 @@ load_pixmap (const char *filename) void pixmaps_init (void) { + hexchat_register_resource(); + pix_ulist_voice = load_pixmap ("ulist_voice"); pix_ulist_halfop = load_pixmap ("ulist_halfop"); pix_ulist_op = load_pixmap ("ulist_op"); diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj index 1da7e733..39286417 100644 --- a/src/fe-text/fe-text.vcxproj +++ b/src/fe-text/fe-text.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 Application diff --git a/src/htm/Properties/Resources.Designer.cs b/src/htm/Properties/Resources.Designer.cs index 829857ee..7627ee06 100644 --- a/src/htm/Properties/Resources.Designer.cs +++ b/src/htm/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/htm/Properties/Settings.Designer.cs b/src/htm/Properties/Settings.Designer.cs index 35939b71..cf679280 100644 --- a/src/htm/Properties/Settings.Designer.cs +++ b/src/htm/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace thememan.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/htm/app.config b/src/htm/app.config index 2f7cce78..ad1957f6 100644 --- a/src/htm/app.config +++ b/src/htm/app.config @@ -1,3 +1,3 @@ - - - + + + diff --git a/src/htm/htm.csproj b/src/htm/htm.csproj index d56f2188..eaf57a0f 100644 --- a/src/htm/htm.csproj +++ b/src/htm/htm.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -12,8 +12,9 @@ thememan 512 false - v4.0 - Client + v4.5.2 + + publish\ true Disk @@ -40,6 +41,7 @@ prompt 4 false + false Resources\htm.ico @@ -68,6 +70,7 @@ TRACE prompt false + false diff --git a/src/libenchant_win8/libenchant_win8.vcxproj b/src/libenchant_win8/libenchant_win8.vcxproj index aab7acc8..3496f978 100644 --- a/src/libenchant_win8/libenchant_win8.vcxproj +++ b/src/libenchant_win8/libenchant_win8.vcxproj @@ -19,7 +19,7 @@ DynamicLibrary true - v120 + v140 diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index 557ca702..39f5aab9 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 Application diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index 713411a5..3458b658 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 Application diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj index 36977f3c..58e4baf3 100644 --- a/win32/nls/nls.vcxproj +++ b/win32/nls/nls.vcxproj @@ -1,7 +1,7 @@  - v120 + v140 Application