From a7961b6943a50604767823942056c8ed75ff1484 Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Fri, 19 Jan 2018 17:42:59 +0100 Subject: Gadu-Gadu: unified project --- protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj | 305 ----------------------- protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj.filters | 197 --------------- protocols/Gadu-Gadu/gadugadu.vcxproj | 47 ++++ protocols/Gadu-Gadu/gadugadu.vcxproj.filters | 200 +++++++++++++++ protocols/Gadu-Gadu/src/libgadu/obsolete.cpp | 8 + protocols/Gadu-Gadu/src/stdafx.cpp | 18 -- protocols/Gadu-Gadu/src/stdafx.cxx | 18 ++ 7 files changed, 273 insertions(+), 520 deletions(-) delete mode 100644 protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj delete mode 100644 protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj.filters create mode 100644 protocols/Gadu-Gadu/gadugadu.vcxproj create mode 100644 protocols/Gadu-Gadu/gadugadu.vcxproj.filters delete mode 100644 protocols/Gadu-Gadu/src/stdafx.cpp create mode 100644 protocols/Gadu-Gadu/src/stdafx.cxx (limited to 'protocols') diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj b/protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj deleted file mode 100644 index b7fb0b5d28..0000000000 --- a/protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj +++ /dev/null @@ -1,305 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - GG - {6DA1396F-2A44-4D5C-8442-012F71006217} - - - - DynamicLibrary - Unicode - true - v141_xp - - - DynamicLibrary - Unicode - v141_xp - - - DynamicLibrary - Unicode - true - v141_xp - - - DynamicLibrary - Unicode - v141_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - $(SolutionDir)..\libs\zlib\src;..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Use - gg.h - Level4 - EditAndContinue - 4996;%(DisableSpecificWarnings) - /Zc:threadSafeInit- %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - ws2_32.lib;Zlib.lib;%(AdditionalDependencies) - true - 0x32500000 - false - $(IntDir)$(TargetName).lib - Windows - $(IntDir)..\Zlib;$(ProfileDir)..\..\libs\win$(PlatformArchitecture) - false - - - - - Disabled - $(SolutionDir)..\libs\zlib\src;..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Use - gg.h - Level4 - 4996;%(DisableSpecificWarnings) - /Zc:threadSafeInit- %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - ws2_32.lib;Zlib.lib;%(AdditionalDependencies) - true - 0x32500000 - false - $(IntDir)$(TargetName).lib - Windows - $(IntDir)..\Zlib;$(ProfileDir)..\..\libs\win$(PlatformArchitecture) - - - - - Full - AnySuitable - Size - NoExtensions - $(SolutionDir)..\libs\zlib\src;..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions) - true - false - true - Fast - Use - gg.h - Level4 - 4996;%(DisableSpecificWarnings) - /Zc:threadSafeInit- %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - ws2_32.lib;Zlib.lib;%(AdditionalDependencies) - true - true - true - 0x32500000 - false - $(IntDir)$(TargetName).lib - Windows - $(IntDir)..\Zlib;$(ProfileDir)..\..\libs\win$(PlatformArchitecture) - - - - - Full - AnySuitable - Size - $(SolutionDir)..\libs\zlib\src;..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions) - true - false - true - Fast - Use - gg.h - Level4 - 4996;%(DisableSpecificWarnings) - /Zc:threadSafeInit- %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - ws2_32.lib;Zlib.lib;%(AdditionalDependencies) - true - true - true - 0x32500000 - false - $(IntDir)$(TargetName).lib - Windows - $(IntDir)..\Zlib;$(ProfileDir)..\..\libs\win$(PlatformArchitecture) - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj.filters b/protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj.filters deleted file mode 100644 index 14256ca608..0000000000 --- a/protocols/Gadu-Gadu/Gadu-Gadu_15.vcxproj.filters +++ /dev/null @@ -1,197 +0,0 @@ - - - - - {3653ac07-1494-483a-8db4-4d335a086e79} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {f35667b1-a47c-4c87-b4aa-edb42e11629e} - - - {9d7b4bf9-8289-4ead-a2ad-294b4c5f1e13} - h;hpp;hxx;hm;inl - - - {8a0835f2-408c-40e6-bd62-75d4e24cae16} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - Source Files\libgadu - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/protocols/Gadu-Gadu/gadugadu.vcxproj b/protocols/Gadu-Gadu/gadugadu.vcxproj new file mode 100644 index 0000000000..b4587e0991 --- /dev/null +++ b/protocols/Gadu-Gadu/gadugadu.vcxproj @@ -0,0 +1,47 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + GG + {6DA1396F-2A44-4D5C-8442-012F71006217} + + + + + + + Sync + src\libgadu;%(AdditionalIncludeDirectories);$(SolutionDir)..\libs\zlib\src + gg.h + + + + + NotUsing + + + + + + {e2a369cd-eda3-414f-8ad0-e732cd7ee68c} + false + + + \ No newline at end of file diff --git a/protocols/Gadu-Gadu/gadugadu.vcxproj.filters b/protocols/Gadu-Gadu/gadugadu.vcxproj.filters new file mode 100644 index 0000000000..e8dad6977f --- /dev/null +++ b/protocols/Gadu-Gadu/gadugadu.vcxproj.filters @@ -0,0 +1,200 @@ + + + + + {3653ac07-1494-483a-8db4-4d335a086e79} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {f35667b1-a47c-4c87-b4aa-edb42e11629e} + + + {9d7b4bf9-8289-4ead-a2ad-294b4c5f1e13} + h;hpp;hxx;hm;inl + + + {8a0835f2-408c-40e6-bd62-75d4e24cae16} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Source Files\libgadu + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/protocols/Gadu-Gadu/src/libgadu/obsolete.cpp b/protocols/Gadu-Gadu/src/libgadu/obsolete.cpp index 3fb2d917fb..f3f2651450 100644 --- a/protocols/Gadu-Gadu/src/libgadu/obsolete.cpp +++ b/protocols/Gadu-Gadu/src/libgadu/obsolete.cpp @@ -31,6 +31,14 @@ /** \cond obsolete */ +#ifdef _MSC_VER +#pragma warning( disable : 4100 ) +#endif // _MSC_VER + +#ifdef _WIN32 +#include "win32.h" +#endif /* _WIN32 */ + #include #include "libgadu.h" diff --git a/protocols/Gadu-Gadu/src/stdafx.cpp b/protocols/Gadu-Gadu/src/stdafx.cpp deleted file mode 100644 index d67a00cb7e..0000000000 --- a/protocols/Gadu-Gadu/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-18 Miranda NG team (https://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "gg.h" diff --git a/protocols/Gadu-Gadu/src/stdafx.cxx b/protocols/Gadu-Gadu/src/stdafx.cxx new file mode 100644 index 0000000000..d67a00cb7e --- /dev/null +++ b/protocols/Gadu-Gadu/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-18 Miranda NG team (https://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "gg.h" -- cgit v1.2.3