From ea0738678d7d729b6bbd1c9c37d3914fcc7df0d9 Mon Sep 17 00:00:00 2001 From: watcherhd Date: Tue, 29 Nov 2011 09:30:50 +0000 Subject: another part of small project fixes and x64 adaptation in some cases git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@228 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- .../Cryptors/Athena/How to build Athena.txt | 7 ++ FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj | 8 +- .../iconpacks/ClientIcons_AIM.vcxproj | 8 +- .../iconpacks/ClientIcons_Gadu.vcxproj | 8 +- .../iconpacks/ClientIcons_General.vcxproj | 8 +- .../iconpacks/ClientIcons_ICQ.vcxproj | 8 +- .../iconpacks/ClientIcons_IRC.vcxproj | 8 +- .../iconpacks/ClientIcons_Jabber.vcxproj | 8 +- .../iconpacks/ClientIcons_MRA.vcxproj | 8 +- .../iconpacks/ClientIcons_MSN.vcxproj | 8 +- .../iconpacks/ClientIcons_Multiprotocols.vcxproj | 8 +- .../iconpacks/ClientIcons_Packs.vcxproj | 8 +- .../iconpacks/ClientIcons_QQ.vcxproj | 8 +- .../iconpacks/ClientIcons_RSS.vcxproj | 8 +- .../iconpacks/ClientIcons_Skype.vcxproj | 8 +- .../iconpacks/ClientIcons_Tlen.vcxproj | 8 +- .../iconpacks/ClientIcons_VoIP.vcxproj | 8 +- .../iconpacks/ClientIcons_Weather.vcxproj | 8 +- .../iconpacks/ClientIcons_Yahoo.vcxproj | 8 +- FirstRun/FirstRun.sln | 8 +- FirstRun/FirstRun.vcxproj | 115 +++++++++++++++++++++ FlashAvatars/FlashAvatars_10.vcxproj | 12 +++ FloatingContacts/FltCont_10.sln | 4 +- FloatingContacts/FltCont_10.vcxproj | 10 ++ FortuneAwayMsg/fortuneawaymsg.sln | 2 +- FortuneAwayMsg/fortuneawaymsg.vcxproj | 4 + GTalkExt/GTalkExt.vcxproj | 63 ++++++++--- GTalkExt/res/settings.rc | 2 +- GTalkExt/stdafx.h | 2 +- Gender/gender_10.vcxproj | 51 ++++++--- GnuPG/gnupg.sln | 2 +- GnuPG/gnupg.vcxproj | 4 +- Gps+/GPS+.sln | 8 +- Gps+/GPS+.vcxproj | 72 +++++++++++++ Gps+/options.cpp | 2 +- Gps+/services.cpp | 2 +- HistorySweeperLight/historysweeperlight_10.sln | 2 +- HistorySweeperLight/historysweeperlight_10.vcxproj | 45 +------- 38 files changed, 404 insertions(+), 157 deletions(-) create mode 100644 Dbx_mmap_SA/Cryptors/Athena/How to build Athena.txt diff --git a/Dbx_mmap_SA/Cryptors/Athena/How to build Athena.txt b/Dbx_mmap_SA/Cryptors/Athena/How to build Athena.txt new file mode 100644 index 0000000..9f8a0ab --- /dev/null +++ b/Dbx_mmap_SA/Cryptors/Athena/How to build Athena.txt @@ -0,0 +1,7 @@ +1. Obtain sources from the http://delphi-miranda-plugins.googlecode.com/svn/trunk with your favorite SVN client. + +2. Copy Athena folder to the root directory of the abovementioned sources. + +3. Open Command prompt, navigate to Athena folder. + +4. Type "make" (without quotes) to build with Delphi, "make fpc" to build Free Pascal 32-bit version, "make fpc64" to build Free Pascal 64-bit version. \ No newline at end of file diff --git a/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj b/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj index a17cceb..7a82410 100644 --- a/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj +++ b/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj @@ -101,10 +101,10 @@ AllRules.ruleset - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)\Plugins\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Plugins\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj index 7136cf8..45fb43b 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj @@ -71,12 +71,12 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj index e3e291a..9d55767 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj index 62a7d3f..7c9fef3 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj index 5daa6e9..1dc65cd 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj index c820cc9..df2a2ff 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj index 178f203..6b476a5 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj @@ -77,13 +77,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj index 22ec122..f0c6a9b 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj index fe0e0d2..7efa113 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj index ed41533..30e4b0a 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj index f08d2b5..22bacd5 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj index 8010212..ca8e4c4 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj index 1c33dc2..79edab8 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj index 1fe1eec..e1152da 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj index 2045224..5c6c2ff 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj index ccafeda..dfb6b4e 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj index d8dcc32..32e9569 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj b/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj index a19b440..808e5e3 100644 --- a/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj +++ b/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj @@ -71,13 +71,13 @@ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Icons\Fp_ClientIcons\ - $(SolutionDir)$(Configuration)64\Icons\Fp_ClientIcons\ + $(SolutionDir)\$(Configuration) $(Platform)\Icons\Fp_ClientIcons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)\Obj\$(ProjectName)\ diff --git a/FirstRun/FirstRun.sln b/FirstRun/FirstRun.sln index 00c4dbe..7477f44 100644 --- a/FirstRun/FirstRun.sln +++ b/FirstRun/FirstRun.sln @@ -1,18 +1,24 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FirstRun", "FirstRun.vcxproj", "{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Debug|Win32.ActiveCfg = Debug|Win32 {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Debug|Win32.Build.0 = Debug|Win32 + {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Debug|x64.ActiveCfg = Debug|x64 + {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Debug|x64.Build.0 = Debug|x64 {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|Win32.ActiveCfg = Release|Win32 {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|Win32.Build.0 = Release|Win32 + {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.ActiveCfg = Release|x64 + {2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FirstRun/FirstRun.vcxproj b/FirstRun/FirstRun.vcxproj index a68a63c..6942381 100644 --- a/FirstRun/FirstRun.vcxproj +++ b/FirstRun/FirstRun.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {2CBA4321-8FA3-4385-BAB6-5387668FBBC4} @@ -19,11 +27,21 @@ false MultiByte + + DynamicLibrary + false + MultiByte + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + @@ -31,19 +49,33 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ false + false $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true + true @@ -66,6 +98,7 @@ Level3 true Size + true NDEBUG;%(PreprocessorDefinitions) @@ -79,6 +112,48 @@ MachineX86 true true + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib + + + true + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/FirstRun.tlb + + + + + Full + OnlyExplicitInline + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Size + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0419 + + + true + false + + + true + true + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib true @@ -116,6 +191,42 @@ MachineX86 + $(IntDir)$(TargetName).lib + + + true + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/FirstRun.tlb + + + + + Disabled + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0419 + + + true + true + false + + + $(IntDir)$(TargetName).lib true @@ -124,9 +235,13 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/FlashAvatars/FlashAvatars_10.vcxproj b/FlashAvatars/FlashAvatars_10.vcxproj index 47f4566..cf32db6 100644 --- a/FlashAvatars/FlashAvatars_10.vcxproj +++ b/FlashAvatars/FlashAvatars_10.vcxproj @@ -99,6 +99,7 @@ true ProgramDatabase Size + true NDEBUG;%(PreprocessorDefinitions) @@ -114,6 +115,10 @@ MachineX86 + $(IntDir)$(TargetName).lib + true + true + UseLinkTimeCodeGeneration true @@ -157,6 +162,7 @@ MachineX86 + $(IntDir)$(TargetName).lib true @@ -185,6 +191,7 @@ true ProgramDatabase Size + true NDEBUG;%(PreprocessorDefinitions) @@ -200,6 +207,10 @@ MachineX86 + $(IntDir)$(TargetName).lib + true + true + UseLinkTimeCodeGeneration true @@ -243,6 +254,7 @@ MachineX86 + $(IntDir)$(TargetName).lib true diff --git a/FloatingContacts/FltCont_10.sln b/FloatingContacts/FltCont_10.sln index 5cf66dc..823e987 100644 --- a/FloatingContacts/FltCont_10.sln +++ b/FloatingContacts/FltCont_10.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltCont_9", "FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}" +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltCont", "FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/FloatingContacts/FltCont_10.vcxproj b/FloatingContacts/FltCont_10.vcxproj index eec2f6b..a9b66c7 100644 --- a/FloatingContacts/FltCont_10.vcxproj +++ b/FloatingContacts/FltCont_10.vcxproj @@ -104,6 +104,7 @@ MachineX86 + $(IntDir)$(TargetName).lib @@ -122,6 +123,8 @@ stdhdr.h Level4 ProgramDatabase + OnlyExplicitInline + true NDEBUG;%(PreprocessorDefinitions) @@ -136,6 +139,8 @@ MachineX86 + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration @@ -164,6 +169,7 @@ MachineX86 + $(IntDir)$(TargetName).lib @@ -182,6 +188,8 @@ stdhdr.h Level4 ProgramDatabase + OnlyExplicitInline + true NDEBUG;%(PreprocessorDefinitions) @@ -196,6 +204,8 @@ MachineX86 + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration diff --git a/FortuneAwayMsg/fortuneawaymsg.sln b/FortuneAwayMsg/fortuneawaymsg.sln index 5354024..a1f868e 100644 --- a/FortuneAwayMsg/fortuneawaymsg.sln +++ b/FortuneAwayMsg/fortuneawaymsg.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fortuneawaymsg", "fortuneawaymsg.vcxproj", "{6BE8E586-391E-4F6C-A37C-C0826406469A}" EndProject Global diff --git a/FortuneAwayMsg/fortuneawaymsg.vcxproj b/FortuneAwayMsg/fortuneawaymsg.vcxproj index 576417f..c7a8df6 100644 --- a/FortuneAwayMsg/fortuneawaymsg.vcxproj +++ b/FortuneAwayMsg/fortuneawaymsg.vcxproj @@ -77,6 +77,7 @@ MachineX86 + $(IntDir)$(TargetName).lib true @@ -103,6 +104,7 @@ true ../include;../ExternalAPI;%(AdditionalIncludeDirectories) Size + true NDEBUG;%(PreprocessorDefinitions) @@ -118,6 +120,8 @@ MachineX86 true true + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration true diff --git a/GTalkExt/GTalkExt.vcxproj b/GTalkExt/GTalkExt.vcxproj index e2b305c..130fb15 100644 --- a/GTalkExt/GTalkExt.vcxproj +++ b/GTalkExt/GTalkExt.vcxproj @@ -107,25 +107,25 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true true true true $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ false false false @@ -172,15 +172,19 @@ true Windows MachineX86 + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + Disabled - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase @@ -190,7 +194,11 @@ %(AdditionalLibraryDirectories) true Windows + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + @@ -209,15 +217,19 @@ true Windows MachineX86 + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + Disabled - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase @@ -227,7 +239,11 @@ %(AdditionalLibraryDirectories) true Windows + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + @@ -248,11 +264,15 @@ true true MachineX86 + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + - MaxSpeed + Full true WIN32;NDEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -260,14 +280,19 @@ Use Level3 ProgramDatabase - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + Size true Windows true true + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + @@ -288,7 +313,11 @@ true true MachineX86 + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + @@ -299,7 +328,7 @@ Use Level3 ProgramDatabase - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) Size true @@ -308,7 +337,11 @@ Windows true true + $(IntDir)$(TargetName).lib + + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + diff --git a/GTalkExt/res/settings.rc b/GTalkExt/res/settings.rc index d1466cd..3e8eb0f 100644 --- a/GTalkExt/res/settings.rc +++ b/GTalkExt/res/settings.rc @@ -1,6 +1,6 @@ #include "resources.h" #include "winres.h" -#include "include\m_utils.h" +#include "m_utils.h" IDD_MAILSETTINGS DIALOGEX 0, 0, 304, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD diff --git a/GTalkExt/stdafx.h b/GTalkExt/stdafx.h index 185cda1..a5e11b9 100644 --- a/GTalkExt/stdafx.h +++ b/GTalkExt/stdafx.h @@ -72,4 +72,4 @@ #define _tcstoui64(A,B,C) _ttoi(A) #endif -#define WNDCLASS_COLOURPICKER "ColourPicker" \ No newline at end of file +#define WNDCLASS_COLOURPICKER _T("ColourPicker") \ No newline at end of file diff --git a/Gender/gender_10.vcxproj b/Gender/gender_10.vcxproj index 3e6e29d..d282b69 100644 --- a/Gender/gender_10.vcxproj +++ b/Gender/gender_10.vcxproj @@ -83,9 +83,9 @@ true true $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ false false false @@ -94,6 +94,10 @@ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ @@ -113,11 +117,12 @@ $(OutDir)gender2.pdb Windows MachineX86 + $(IntDir)$(TargetName).lib - MinSpace + Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;GENDER2_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -125,12 +130,14 @@ Level3 ProgramDatabase + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) true $(OutDir)gender2.pdb Windows - $(OutDir)gender2.lib + $(IntDir)$(TargetName).lib + $(OutDir)$(TargetName)$(TargetExt) @@ -144,6 +151,8 @@ Level3 ProgramDatabase Size + OnlyExplicitInline + true false @@ -151,6 +160,8 @@ true true MachineX86 + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration @@ -164,6 +175,8 @@ Level3 ProgramDatabase Size + OnlyExplicitInline + true false @@ -171,46 +184,56 @@ true true MachineX86 + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration - MinSpace + Full ../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GENDER2_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL + WIN32;NDEBUG;_WINDOWS;_USRDLL;GENDER2_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded Level3 ProgramDatabase + OnlyExplicitInline + Size + true - $(OutDir)gender.dll + $(OutDir)$(TargetName)$(TargetExt) false Windows true true - $(OutDir)gender.lib + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration - MinSpace + Full ../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;GENDER2_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL + WIN64;NDEBUG;_WINDOWS;_USRDLL;GENDER2_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded Level3 ProgramDatabase + OnlyExplicitInline + Size + true - $(OutDir)gender.dll + $(OutDir)$(TargetName)$(TargetExt) false Windows true true - $(OutDir)gender.lib + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration diff --git a/GnuPG/gnupg.sln b/GnuPG/gnupg.sln index 180b533..e232e9f 100644 --- a/GnuPG/gnupg.sln +++ b/GnuPG/gnupg.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gnupg", "gnupg.vcxproj", "{557E83A7-2B96-4088-9CD6-452D4FDC9290}" EndProject Global diff --git a/GnuPG/gnupg.vcxproj b/GnuPG/gnupg.vcxproj index 5567687..2edf99c 100644 --- a/GnuPG/gnupg.vcxproj +++ b/GnuPG/gnupg.vcxproj @@ -66,6 +66,7 @@ true Console MachineX86 + $(IntDir)$(TargetName).lib @@ -96,9 +97,8 @@ Console true true - - MachineX86 + $(IntDir)$(TargetName).lib diff --git a/Gps+/GPS+.sln b/Gps+/GPS+.sln index 6024cfc..d70d8c6 100644 --- a/Gps+/GPS+.sln +++ b/Gps+/GPS+.sln @@ -1,17 +1,23 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPS+", "GPS+.vcxproj", "{DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Debug|Win32.ActiveCfg = Debug|Win32 {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Debug|Win32.Build.0 = Debug|Win32 + {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Debug|x64.ActiveCfg = Debug|x64 + {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Debug|x64.Build.0 = Debug|x64 {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Release|Win32.ActiveCfg = Release|Win32 {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Release|Win32.Build.0 = Release|Win32 + {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Release|x64.ActiveCfg = Release|x64 + {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Gps+/GPS+.vcxproj b/Gps+/GPS+.vcxproj index 39ef8c3..6df7ab3 100644 --- a/Gps+/GPS+.vcxproj +++ b/Gps+/GPS+.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {DBE0F06C-207B-4F62-9A2B-6C32894ACC5A} @@ -21,28 +29,49 @@ MultiByte true + + DynamicLibrary + MultiByte + true + DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true + true $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ false + false @@ -61,6 +90,25 @@ true Windows MachineX86 + $(IntDir)$(TargetName).lib + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;GPS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + + + true + Windows + $(IntDir)$(TargetName).lib @@ -84,6 +132,30 @@ true true MachineX86 + $(IntDir)$(TargetName).lib + + + + + Full + true + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GPS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreaded + true + + + Level3 + ProgramDatabase + Size + + + true + Windows + true + true + $(IntDir)$(TargetName).lib diff --git a/Gps+/options.cpp b/Gps+/options.cpp index c152fdd..d0b35b0 100644 --- a/Gps+/options.cpp +++ b/Gps+/options.cpp @@ -25,7 +25,7 @@ extern HINSTANCE hInst; -BOOL CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch ( msg ) { case WM_INITDIALOG: diff --git a/Gps+/services.cpp b/Gps+/services.cpp index 26571cf..d2ee054 100644 --- a/Gps+/services.cpp +++ b/Gps+/services.cpp @@ -25,7 +25,7 @@ extern GPSWorker gps; -int GetLocationInfo(WPARAM wParam, LPARAM lParam) +INT_PTR GetLocationInfo(WPARAM wParam, LPARAM lParam) { gps.GetNavInfo((NavInfo*) wParam); return gps.IsConnected(); diff --git a/HistorySweeperLight/historysweeperlight_10.sln b/HistorySweeperLight/historysweeperlight_10.sln index 4944cc5..17ed71f 100644 --- a/HistorySweeperLight/historysweeperlight_10.sln +++ b/HistorySweeperLight/historysweeperlight_10.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "historysweeperlight", "historysweeperlight_10.vcxproj", "{9DE1F0B0-B9D1-4681-82E7-13CC3E047445}" EndProject Global diff --git a/HistorySweeperLight/historysweeperlight_10.vcxproj b/HistorySweeperLight/historysweeperlight_10.vcxproj index 54d7a1a..1734b35 100644 --- a/HistorySweeperLight/historysweeperlight_10.vcxproj +++ b/HistorySweeperLight/historysweeperlight_10.vcxproj @@ -5,10 +5,6 @@ Debug Unicode Win32 - - Release Unicode vc6 - Win32 - Release Unicode Win32 @@ -21,11 +17,6 @@ Win32Proj - - DynamicLibrary - Unicode - true - DynamicLibrary Unicode @@ -38,9 +29,6 @@ - - - @@ -76,6 +64,7 @@ true Windows MachineX86 + $(IntDir)$(TargetName).lib @@ -102,37 +91,7 @@ true true MachineX86 - - - - - Full - AnySuitable - true - Size - WIN32;NDEBUG;_WINDOWS;_USRDLL;HISTORYSWEEPERLIGHT_EXPORTS;VC6BUILD;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - true - NotSet - Fast - - - Level3 - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - comctl32.lib;..\vc6libs\msvcrt.lib;..\vc6libs\msvcrt_winxp.obj;%(AdditionalDependencies) - true - false - Windows - true - true - MachineX86 + $(IntDir)$(TargetName).lib -- cgit v1.2.3