From 9858784eb6369dc189836f8971791af5238145ea Mon Sep 17 00:00:00 2001 From: Arnavion Date: Wed, 11 Feb 2015 10:01:29 -0800 Subject: [PATCH] Better project files. - Output directly to rel\ instead of to bin\ and then copying files over. - Deduped Win32 vs x64 configs - Moved some common properties to hexchat.props - All build intermediates (except htm's intermediates) are no longer emitted in the source directory --- plugins/checksum/checksum.vcxproj | 64 ++-------- plugins/doat/doat.vcxproj | 64 ++-------- plugins/exec/exec.vcxproj | 60 +-------- plugins/fishlim/fishlim.vcxproj | 64 ++-------- plugins/mpcinfo/mpcinfo.vcxproj | 60 +-------- plugins/perl/perl.vcxproj | 72 ++--------- plugins/python/python2.vcxproj | 68 ++-------- plugins/python/python3.vcxproj | 68 ++-------- plugins/sysinfo/sysinfo.vcxproj | 65 ++-------- plugins/upd/upd.vcxproj | 60 +-------- plugins/winamp/winamp.vcxproj | 60 +-------- src/common/common.vcxproj | 80 +++--------- src/common/common.vcxproj.filters | 10 +- src/common/make-te.vcxproj | 63 +--------- src/fe-gtk/fe-gtk.vcxproj | 84 ++++--------- src/fe-gtk/fe-gtk.vcxproj.filters | 4 +- src/fe-gtk/hexchat.rc.tt | 4 +- .../notifications/notifications-winrt.vcxproj | 79 ++---------- src/fe-gtk/sexy-spell-entry.c | 5 + src/fe-gtk/xtext.c | 6 + src/fe-text/fe-text.vcxproj | 60 ++------- src/htm/htm.csproj | 15 +-- win32/copy/copy.vcxproj | 119 ++++++++---------- win32/copy/copy.vcxproj.filters | 49 -------- win32/hexchat.props | 98 +++++---------- win32/hexchat.sln | 15 +-- win32/installer/installer.vcxproj | 45 ++----- win32/nls/nls.vcxproj | 68 +--------- 28 files changed, 278 insertions(+), 1231 deletions(-) diff --git a/plugins/checksum/checksum.vcxproj b/plugins/checksum/checksum.vcxproj index 7838cb4a..948295a0 100644 --- a/plugins/checksum/checksum.vcxproj +++ b/plugins/checksum/checksum.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,57 +20,19 @@ checksum - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + hcchecksum - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcchecksum - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions) - $(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories) - true + $(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true checksum.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) @@ -77,19 +40,10 @@ - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions) - $(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories) - true + $(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true checksum.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) @@ -102,6 +56,4 @@ - - - \ No newline at end of file + diff --git a/plugins/doat/doat.vcxproj b/plugins/doat/doat.vcxproj index 86c80f09..ae44d7f8 100644 --- a/plugins/doat/doat.vcxproj +++ b/plugins/doat/doat.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,57 +20,19 @@ doat - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + hcdoat - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcdoat - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions) - ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - true + ..\..\src\common;$(HexChatLib);$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) doat.def @@ -77,19 +40,10 @@ - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions) - ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - true + ..\..\src\common;$(HexChatLib);$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) doat.def @@ -102,6 +56,4 @@ - - - \ No newline at end of file + diff --git a/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj index a04c0046..d691bb11 100644 --- a/plugins/exec/exec.vcxproj +++ b/plugins/exec/exec.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,75 +20,28 @@ exec - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + hcexec - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcexec - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;%(AdditionalIncludeDirectories) - Windows - true - true - true exec.def - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;%(AdditionalIncludeDirectories) - Windows - true - true - true exec.def @@ -98,6 +52,4 @@ - - - \ No newline at end of file + diff --git a/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj index ca3de578..25492a82 100644 --- a/plugins/fishlim/fishlim.vcxproj +++ b/plugins/fishlim/fishlim.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,57 +20,19 @@ fishlim - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + hcfishlim - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcfishlim - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions) - true - $(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories) + $(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true fishlim.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) @@ -77,19 +40,10 @@ - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions) - true - $(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories) + $(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true fishlim.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) @@ -112,6 +66,4 @@ - - - \ No newline at end of file + diff --git a/plugins/mpcinfo/mpcinfo.vcxproj b/plugins/mpcinfo/mpcinfo.vcxproj index 4eb901ab..3c4b3e7d 100644 --- a/plugins/mpcinfo/mpcinfo.vcxproj +++ b/plugins/mpcinfo/mpcinfo.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,57 +20,19 @@ mpcinfo - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + hcmpcinfo - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcmpcinfo - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) mpcinfo.def @@ -77,19 +40,10 @@ - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) mpcinfo.def @@ -102,6 +56,4 @@ - - - \ No newline at end of file + diff --git a/plugins/perl/perl.vcxproj b/plugins/perl/perl.vcxproj index 4fd803aa..e9b380ee 100644 --- a/plugins/perl/perl.vcxproj +++ b/plugins/perl/perl.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,58 +20,20 @@ perl520 - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false - $(PerlOutput) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - $(PerlOutput) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + + + + hcperl + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - true + $(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true - $(OutDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories) + $(IntDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(PerlLib).lib;$(DepLibs);%(AdditionalDependencies) perl.def $(PerlLib).dll;%(DelayLoadDLLs) @@ -78,7 +41,7 @@ "$(GendefPath)\gendef" "$(PerlPath)\bin\$(PerlLib).dll" move $(PerlLib).def "$(IntDir)" -lib /nologo /machine:x86 "/def:$(IntDir)$(PerlLib).def" "/out:$(OutDir)\$(PerlLib).lib" +lib /nologo /machine:x86 "/def:$(IntDir)$(PerlLib).def" "/out:$(IntDir)\$(PerlLib).lib" "$(PerlPath)\bin\perl.exe" generate_header move irc.pm.h "$(IntDir)" move hexchat.pm.h "$(IntDir)" @@ -86,20 +49,11 @@ move hexchat.pm.h "$(IntDir)" - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - true + $(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true - $(OutDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories) + $(IntDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(PerlLib).lib;$(DepLibs);%(AdditionalDependencies) perl.def $(PerlLib).dll;%(DelayLoadDLLs) @@ -107,7 +61,7 @@ move hexchat.pm.h "$(IntDir)" "$(GendefPath)\gendef" "$(PerlPath)\bin\$(PerlLib).dll" move $(PerlLib).def "$(IntDir)" -lib /nologo /machine:x64 "/def:$(IntDir)$(PerlLib).def" "/out:$(OutDir)\$(PerlLib).lib" +lib /nologo /machine:x64 "/def:$(IntDir)$(PerlLib).def" "/out:$(IntDir)\$(PerlLib).lib" "$(PerlPath)\bin\perl.exe" generate_header move irc.pm.h "$(IntDir)" move hexchat.pm.h "$(IntDir)" @@ -120,6 +74,4 @@ move hexchat.pm.h "$(IntDir)" - - diff --git a/plugins/python/python2.vcxproj b/plugins/python/python2.vcxproj index 58a9e45e..ecf0df75 100644 --- a/plugins/python/python2.vcxproj +++ b/plugins/python/python2.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,80 +20,33 @@ python2 - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + $(Python2Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - $(Python2Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Glib);$(Python2Path)\include;..\..\src\common;%(AdditionalIncludeDirectories) - true + $(Glib);$(Python2Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true python.def "$(Python2Lib).lib";$(DepLibs);%(AdditionalDependencies) - $(DepsRoot)\lib;$(OutDir);$(Python2Path)\libs;%(AdditionalLibraryDirectories) + $(DepsRoot)\lib;$(Python2Path)\libs;%(AdditionalLibraryDirectories) - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Glib);$(Python2Path)\include;..\..\src\common;%(AdditionalIncludeDirectories) - true + $(Glib);$(Python2Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true python.def "$(Python2Lib).lib";$(DepLibs);%(AdditionalDependencies) - $(DepsRoot)\lib;$(OutDir);$(Python2Path)\libs;%(AdditionalLibraryDirectories) + $(DepsRoot)\lib;$(Python2Path)\libs;%(AdditionalLibraryDirectories) @@ -102,6 +56,4 @@ - - - \ No newline at end of file + diff --git a/plugins/python/python3.vcxproj b/plugins/python/python3.vcxproj index 5f970975..511421e6 100644 --- a/plugins/python/python3.vcxproj +++ b/plugins/python/python3.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,80 +20,33 @@ python3 - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + $(Python3Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - $(Python3Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Glib);$(Python3Path)\include;..\..\src\common;%(AdditionalIncludeDirectories) - true + $(Glib);$(Python3Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true python.def "$(Python3Lib).lib";$(DepLibs);%(AdditionalDependencies) - $(DepsRoot)\lib;$(OutDir);$(Python3Path)\libs;%(AdditionalLibraryDirectories) + $(DepsRoot)\lib;$(Python3Path)\libs;%(AdditionalLibraryDirectories) - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Glib);$(Python3Path)\include;..\..\src\common;%(AdditionalIncludeDirectories) - true + $(Glib);$(Python3Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories) - Windows - true - true - true python.def "$(Python3Lib).lib";$(DepLibs);%(AdditionalDependencies) - $(DepsRoot)\lib;$(OutDir);$(Python3Path)\libs;%(AdditionalLibraryDirectories) + $(DepsRoot)\lib;$(Python3Path)\libs;%(AdditionalLibraryDirectories) @@ -102,6 +56,4 @@ - - - \ No newline at end of file + diff --git a/plugins/sysinfo/sysinfo.vcxproj b/plugins/sysinfo/sysinfo.vcxproj index 1657fbee..fe3530e7 100644 --- a/plugins/sysinfo/sysinfo.vcxproj +++ b/plugins/sysinfo/sysinfo.vcxproj @@ -2,6 +2,8 @@ v120 + DynamicLibrary + Unicode @@ -19,84 +21,37 @@ sysinfo - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - false + + + hcsysinfo - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcsysinfo - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions) ..\..\src\common;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) - true false - Windows - true - true - true - sysinfo.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) wbemuuid.lib;comsupp.lib;$(DepLibs);%(AdditionalDependencies) comsupp.lib + sysinfo.def - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions) ..\..\src\common;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) - true false - Windows - true - true - true - sysinfo.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) wbemuuid.lib;comsupp.lib;$(DepLibs);%(AdditionalDependencies) comsupp.lib + sysinfo.def @@ -106,6 +61,4 @@ - - - \ No newline at end of file + diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj index e7e7785a..0a9a980e 100644 --- a/plugins/upd/upd.vcxproj +++ b/plugins/upd/upd.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,57 +20,19 @@ upd - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + hcupd - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcupd - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true upd.def $(DepLibs);%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) @@ -77,19 +40,10 @@ - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) - Windows - true - true - true upd.def $(DepLibs);%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) @@ -102,6 +56,4 @@ - - - \ No newline at end of file + diff --git a/plugins/winamp/winamp.vcxproj b/plugins/winamp/winamp.vcxproj index 3c0cfb34..b325c40d 100644 --- a/plugins/winamp/winamp.vcxproj +++ b/plugins/winamp/winamp.vcxproj @@ -2,6 +2,7 @@ v120 + DynamicLibrary @@ -19,75 +20,28 @@ winamp - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - false + + + hcwinamp - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcwinamp - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel)plugins\ - - - true - true WIN32;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;%(AdditionalIncludeDirectories) - Windows - true - true - true winamp.def - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions) - true ..\..\src\common;%(AdditionalIncludeDirectories) - Windows - true - true - true winamp.def @@ -98,6 +52,4 @@ - - - \ No newline at end of file + diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index b52b06c7..28a4da11 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -2,6 +2,7 @@ v120 + StaticLibrary @@ -23,7 +24,7 @@ - + @@ -36,8 +37,8 @@ - - + + @@ -56,7 +57,7 @@ - + @@ -76,7 +77,7 @@ - + {87554B59-006C-4D94-9714-897B27067BA3} @@ -84,83 +85,34 @@ common - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + + + + $(HexChatLib) - - - true - true WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) - true + $(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) - - Windows - true - true - true - - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) - true + $(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) 4267;%(DisableSpecificWarnings) - - Windows - true - true - true - - - "$(ProjectDir)marshal.h" -"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.c" +"$(HexChatLib)make-te.exe" < "$(ProjectDir)textevents.in" > "$(HexChatLib)textevents.h" 2> "$(HexChatLib)textenums.h" +powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(HexChatLib)config.h" +"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" > "$(HexChatLib)marshal.h" +"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(HexChatLib)marshal.c" ]]> diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index e80d9a63..79e64cb4 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -71,10 +71,10 @@ Header Files - + Header Files - + Header Files @@ -98,13 +98,13 @@ Header Files - + Header Files Header Files - + Header Files @@ -181,7 +181,7 @@ Source Files - + Source Files diff --git a/src/common/make-te.vcxproj b/src/common/make-te.vcxproj index e9b4c533..24d8f9b6 100644 --- a/src/common/make-te.vcxproj +++ b/src/common/make-te.vcxproj @@ -2,6 +2,7 @@ v120 + Application @@ -19,82 +20,30 @@ makete - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - false - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + + + + $(HexChatLib) - - - true - true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true Console - true - true - true - - "$(HexChatBin)make-te.exe" < "$(ProjectDir)textevents.in" > "$(ProjectDir)textevents.h" 2> "$(ProjectDir)textenums.h" - - - - true - true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true Console - true - true - true - - "$(HexChatBin)make-te.exe" < "$(ProjectDir)textevents.in" > "$(ProjectDir)textevents.h" 2> "$(ProjectDir)textenums.h" - - - - \ No newline at end of file + diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index 62790283..401518b4 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -2,6 +2,7 @@ v120 + Application @@ -19,79 +20,38 @@ fegtk - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - false + + + hexchat - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hexchat - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel) - - - true - true + + false WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;..\common;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) - true + ..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) - Windows - true - true - true - $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - $(DepLibs);common.lib;%(AdditionalDependencies) + $(DepsRoot)\lib;%(AdditionalLibraryDirectories) + $(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies) mainCRTStartup - - - true - true + + false WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;..\common;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) - true + ..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) 4244;4267;%(DisableSpecificWarnings) - Windows - true - true - true - $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - $(DepLibs);common.lib;%(AdditionalDependencies) + $(DepsRoot)\lib;%(AdditionalLibraryDirectories) + $(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies) mainCRTStartup @@ -99,10 +59,10 @@ Build hexchat.rc and gresource file @@ -159,7 +119,7 @@ powershell "Get-Content -Encoding UTF8 '$(SolutionDir)..\src\fe-gtk\hexchat.rc.u - + @@ -174,7 +134,7 @@ powershell "Get-Content -Encoding UTF8 '$(SolutionDir)..\src\fe-gtk\hexchat.rc.u - + @@ -183,6 +143,4 @@ powershell "Get-Content -Encoding UTF8 '$(SolutionDir)..\src\fe-gtk\hexchat.rc.u - - - \ No newline at end of file + diff --git a/src/fe-gtk/fe-gtk.vcxproj.filters b/src/fe-gtk/fe-gtk.vcxproj.filters index a950d02f..fe211a2d 100644 --- a/src/fe-gtk/fe-gtk.vcxproj.filters +++ b/src/fe-gtk/fe-gtk.vcxproj.filters @@ -182,7 +182,7 @@ Source Files - + Source Files @@ -198,7 +198,7 @@ - + Resource Files diff --git a/src/fe-gtk/hexchat.rc.tt b/src/fe-gtk/hexchat.rc.tt index 684ddfdb..d4f554b2 100644 --- a/src/fe-gtk/hexchat.rc.tt +++ b/src/fe-gtk/hexchat.rc.tt @@ -1,9 +1,9 @@ #include -#include "../../config.h" +#include "config.h" #define COMMA_VERSION <#= [string]::Join(',', $versionParts) #>,0 -XC_ICON ICON "../../data/icons/hexchat.ico" +XC_ICON ICON "<#= $env:SOLUTIONDIR -replace '\\', '/' #>data/icons/hexchat.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION COMMA_VERSION diff --git a/src/fe-gtk/notifications/notifications-winrt.vcxproj b/src/fe-gtk/notifications/notifications-winrt.vcxproj index 7a4e9888..dcd2a2b7 100644 --- a/src/fe-gtk/notifications/notifications-winrt.vcxproj +++ b/src/fe-gtk/notifications/notifications-winrt.vcxproj @@ -12,8 +12,7 @@ - true - true + true @@ -23,71 +22,25 @@ notifications-winrt - - DynamicLibrary - false + v120 - true - Unicode - - DynamicLibrary - false - true Unicode - v120 - - - - - - - - - - - - - false + + + hcnotifications-winrt - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - $(IncludePath) - $(LibraryPath) - - - false - $(HexChatBin) - hcnotifications-winrt - $(HexChatObj)$(ProjectName)\ - $(IncludePath) - $(LibraryPath) + $(HexChatRel)plugins\ - Level3 - NotUsing - MaxSpeed - true - true WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions) true - true - $(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) - true - Windows - true - true - true - true - false - - $(DepLibs);mincore.lib;runtimeobject.lib;%(AdditionalDependencies) 6.03 $(DepsRoot)\lib;%(AdditionalLibraryDirectories) @@ -95,33 +48,15 @@ - Level3 - NotUsing - MaxSpeed - true - true WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions) true - true - $(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) - true - Windows - true - true - true - true - false - - $(DepLibs);mincore.lib;runtimeobject.lib;%(AdditionalDependencies) 6.03 $(DepsRoot)\lib;%(AdditionalLibraryDirectories) - - - \ No newline at end of file + diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c index 904746f4..0617d947 100644 --- a/src/fe-gtk/sexy-spell-entry.c +++ b/src/fe-gtk/sexy-spell-entry.c @@ -31,7 +31,12 @@ #include #include #include "sexy-iso-codes.h" + +#ifdef WIN32 +#include "marshal.h" +#else #include "../common/marshal.h" +#endif #ifdef WIN32 #include "../common/typedef.h" diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 495568f8..121f35a3 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -37,7 +37,13 @@ #include "../common/util.h" #include "../common/hexchatc.h" #include "../common/url.h" + +#ifdef WIN32 +#include "marshal.h" +#else #include "../common/marshal.h" +#endif + #include "fe-gtk.h" #include "xtext.h" #include "fkeys.h" diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj index c59c57bc..1da7e733 100644 --- a/src/fe-text/fe-text.vcxproj +++ b/src/fe-text/fe-text.vcxproj @@ -2,6 +2,7 @@ v120 + Application @@ -19,77 +20,38 @@ fetext - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - false + + + hexchat-text - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hexchat-text - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + $(HexChatRel) - - - true - true WIN32;NDEBUG;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) - true + $(HexChatLib);$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) Console true true true - $(DepLibs);"$(OutDir)\common.lib";%(AdditionalDependencies) + $(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) - - - true - true WIN32;_WIN64;_AMD64_;NDEBUG;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions) - $(SolutionDir)..;$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) - true + $(HexChatLib);$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) Console true true true - $(DepLibs);"$(OutDir)\common.lib";%(AdditionalDependencies) + $(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) @@ -100,6 +62,4 @@ - - - \ No newline at end of file + diff --git a/src/htm/htm.csproj b/src/htm/htm.csproj index eea953d2..d56f2188 100644 --- a/src/htm/htm.csproj +++ b/src/htm/htm.csproj @@ -61,22 +61,13 @@ + x64 + pdbonly + true ..\..\..\hexchat-build\x64\bin\ TRACE - true - pdbonly - x64 - bin\Release\thememan.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs prompt false - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - false diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index d0c1150b..a0c0a39d 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -2,6 +2,7 @@ v120 + Application @@ -18,73 +19,63 @@ copy - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - - true - true - - - true - true - true - - - $(HexChatCopy) - - - - - true - true - - - true - true - true - - - $(HexChatCopy) - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - - - \ No newline at end of file + + + + + + + + + + + + + diff --git a/win32/copy/copy.vcxproj.filters b/win32/copy/copy.vcxproj.filters index af2be024..695b5c78 100644 --- a/win32/copy/copy.vcxproj.filters +++ b/win32/copy/copy.vcxproj.filters @@ -1,52 +1,3 @@  - - - {e02a8c67-767c-4c6e-a854-81fae08cf4da} - - - {503881c0-011d-443b-a373-4bfe125dcfa6} - - - {4316433a-2a8e-48f7-9020-e1f4de0d23d1} - - - {832ebebc-ab71-4bf6-9f3a-02ec748f7c14} - - - {9a881586-aed2-4f80-ba84-e521e6785566} - - - {c825f724-0618-4160-97b7-12d6e0f2bc7b} - - - - - Resource Files\etc - - - Resource Files\etc - - - Resource Files\etc - - - Resource Files\etc - - - Resource Files\etc\gtk-2.0 - - - Resource Files\share\xml\iso-codes - - - Resource Files\share\xml\iso-codes - - - Resource Files - - - Resource Files - - \ No newline at end of file diff --git a/win32/hexchat.props b/win32/hexchat.props index 32588334..8d0a71c6 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -1,7 +1,5 @@ - - @@ -23,7 +21,6 @@ $(YourMsgfmtPath) $(YourPerlPath)\$(PlatformName) perl520 - hcperl $(YourPython2Path)\$(PlatformName) python27 hcpython2 @@ -37,83 +34,48 @@ $(SolutionDir)..\..\hexchat-build $(HexChatBuild)\$(PlatformName)\bin\ $(HexChatBuild)\$(PlatformName)\obj\ - $(HexChatBuild)\$(PlatformName)\rel - -rmdir /q /s "$(HexChatRel)" -mkdir "$(HexChatRel)" -echo 2> portable-mode -move portable-mode "$(HexChatRel)" -copy changelog.url "$(HexChatRel)" -copy readme.url "$(HexChatRel)" -copy "$(DepsRoot)\bin\cert.pem" "$(HexChatRel)" -copy "$(HexChatBin)hexchat.exe" "$(HexChatRel)" -copy "$(HexChatBin)hexchat-text.exe" "$(HexChatRel)" -copy "$(HexChatBin)thememan.exe" "$(HexChatRel)" -copy "$(DepsRoot)\bin\atk-1.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\cairo.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\fontconfig.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gdk-win32-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gio-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\glib-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gmodule-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gobject-2.0.dll" "$(HexChatRel) -copy "$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper.exe" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gthread-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gtk-win32-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\harfbuzz.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\iconv.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libintl.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libpng16.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatRel)" -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)" -copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)" -xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines" "$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines" -xcopy /q /s /i share "$(HexChatRel)\share" -xcopy /q /s /i "..\..\COPYING" "$(HexChatRel)\share\doc\hexchat\" -xcopy /q /s /i "$(DepsRoot)\share\doc" "$(HexChatRel)\share\doc" -xcopy /q /s /i "$(DepsRoot)\share\themes\MS-Windows" "$(HexChatRel)\share\themes\MS-Windows" -xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\" -xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\" -copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcperl.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcpython2.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcpython3.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcnotifications-winrt.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" -xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\share\locale" -xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale" - - "%PROGRAMFILES%\Inno Setup 5\iscc.exe" - "%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe" + $(HexChatBuild)\$(PlatformName)\lib\ + $(HexChatBuild)\$(PlatformName)\pdb\ + $(HexChatBuild)\$(PlatformName)\rel\ + "$(MSBuildExtensionsPath32)\..\Inno Setup 5\iscc.exe" + + + + false + $(HexChatObj)$(ProjectName)\ + false + true + MultiByte Level3 + NotUsing 4996 - /d2Zi+ %(AdditionalOptions) - false + /d2Zi+ %(AdditionalOptions) + true MaxSpeed - $(SolutionDir)..;%(AdditionalIncludeDirectories) + true + true + true + + true + + + $(HexChatLib)$(TargetName).lib + $(HexChatPdb)$(TargetName).pdb + Windows + true + true + true + UseLinkTimeCodeGeneration + diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 0321261d..3cc4d918 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -77,6 +77,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nls", "nls\nls.vcxproj", "{ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", "{C9B735E4-75BC-45AC-A5E3-39A6D076F912}" + ProjectSection(ProjectDependencies) = postProject + {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B} + {DE87FFCA-9606-4116-B747-062D88A56A28} = {DE87FFCA-9606-4116-B747-062D88A56A28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}" ProjectSection(ProjectDependencies) = postProject {C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {C2321A03-0BA7-45B3-8740-ABD82B36B0BF} {19C52A0A-A790-409E-A28A-9745FF990F5C} = {19C52A0A-A790-409E-A28A-9745FF990F5C} @@ -85,7 +91,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B} {461DC24A-A410-4171-8C02-CCDBF3702C2A} = {461DC24A-A410-4171-8C02-CCDBF3702C2A} {E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {E93E1255-95D1-4B08-8FDF-B53CC6A21280} - {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} + {A7D7CE59-2A31-48AE-BED2-A9828E241832} = {A7D7CE59-2A31-48AE-BED2-A9828E241832} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} = {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} @@ -94,13 +100,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", {DE87FFCA-9606-4116-B747-062D88A56A28} = {DE87FFCA-9606-4116-B747-062D88A56A28} {C53145CC-D021-40C9-B97C-0249AB9A43C9} = {C53145CC-D021-40C9-B97C-0249AB9A43C9} {D90BC3E3-1341-4849-9354-5F40489D39D1} = {D90BC3E3-1341-4849-9354-5F40489D39D1} - {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}" - ProjectSection(ProjectDependencies) = postProject - {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} {C9B735E4-75BC-45AC-A5E3-39A6D076F912} = {C9B735E4-75BC-45AC-A5E3-39A6D076F912} + {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "htm", "..\src\htm\htm.csproj", "{DE87FFCA-9606-4116-B747-062D88A56A28}" diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index a3d546c9..713411a5 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -2,6 +2,7 @@ v120 + Application @@ -18,42 +19,14 @@ installer - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ + + + + $(HexChatRel) - true - true true @@ -64,10 +37,8 @@ > "$(OutDir)hexchat.iss" -$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss" +powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\hexchat.iss.tt" "$(HexChatBin)hexchat.iss" +$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(HexChatBin)hexchat.iss" ]]> @@ -78,6 +49,4 @@ $(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexch - - diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj index 928fb225..36977f3c 100644 --- a/win32/nls/nls.vcxproj +++ b/win32/nls/nls.vcxproj @@ -2,6 +2,7 @@ v120 + Application @@ -18,68 +19,13 @@ nls - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - + + + $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - - true - true - - - true - true - true - - - cd ..\..\po -rmdir /q /s "$(OutDir)\locale" -mkdir "$(OutDir)\locale" -for %%A in (*.po) do ( -mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES" -"$(MsgfmtPath)\msgfmt" -co "$(OutDir)\locale\%%~nA\LC_MESSAGES\hexchat.mo" %%A -) - - - - - true - true - - - true - true - true - + cd ..\..\po rmdir /q /s "$(OutDir)\locale" @@ -93,6 +39,4 @@ mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES" - - - \ No newline at end of file +