From 9858784eb6369dc189836f8971791af5238145ea Mon Sep 17 00:00:00 2001 From: Arnavion Date: Wed, 11 Feb 2015 10:01:29 -0800 Subject: 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 ++++---------------------------- 11 files changed, 89 insertions(+), 616 deletions(-) (limited to 'plugins') 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 + -- cgit 1.4.1