diff options
| -rw-r--r-- | bin10/mir_full.sln | 67 | ||||
| -rw-r--r-- | plugins/AVS/CHANGELOG.AVS (renamed from plugins/Avs/CHANGELOG.AVS) | 0 | ||||
| -rw-r--r-- | plugins/AVS/README (renamed from plugins/Avs/README) | 0 | ||||
| -rw-r--r-- | plugins/AVS/README.SOURCE (renamed from plugins/Avs/README.SOURCE) | 0 | ||||
| -rw-r--r-- | plugins/AVS/acc.cpp (renamed from plugins/Avs/acc.cpp) | 0 | ||||
| -rw-r--r-- | plugins/AVS/acc.h (renamed from plugins/Avs/acc.h) | 0 | ||||
| -rw-r--r-- | plugins/AVS/avs.rc (renamed from plugins/Avs/avs.rc) | 0 | ||||
| -rw-r--r-- | plugins/AVS/avs_10.vcxproj (renamed from plugins/Avs/avs_10.vcxproj) | 0 | ||||
| -rw-r--r-- | plugins/AVS/avs_10.vcxproj.filters (renamed from plugins/Avs/avs_10.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | plugins/AVS/commonheaders.h (renamed from plugins/Avs/commonheaders.h) | 0 | ||||
| -rw-r--r-- | plugins/AVS/image_utils.cpp (renamed from plugins/Avs/image_utils.cpp) | 0 | ||||
| -rw-r--r-- | plugins/AVS/image_utils.h (renamed from plugins/Avs/image_utils.h) | 0 | ||||
| -rw-r--r-- | plugins/AVS/license.txt (renamed from plugins/Avs/license.txt) | 0 | ||||
| -rw-r--r-- | plugins/AVS/main.cpp (renamed from plugins/Avs/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/AVS/mir_thread.cpp (renamed from plugins/Avs/mir_thread.cpp) | 0 | ||||
| -rw-r--r-- | plugins/AVS/mir_thread.h (renamed from plugins/Avs/mir_thread.h) | 0 | ||||
| -rw-r--r-- | plugins/AVS/options.cpp (renamed from plugins/Avs/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/AVS/poll.cpp (renamed from plugins/Avs/poll.cpp) | 0 | ||||
| -rw-r--r-- | plugins/AVS/poll.h (renamed from plugins/Avs/poll.h) | 0 | ||||
| -rw-r--r-- | plugins/AVS/res/avatar.ico (renamed from plugins/Avs/res/avatar.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/AVS/resource.h (renamed from plugins/Avs/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/AVS/vc6.rc (renamed from plugins/Avs/vc6.rc) | 0 | ||||
| -rw-r--r-- | plugins/AVS/version.h (renamed from plugins/Avs/version.h) | 0 | ||||
| -rw-r--r-- | plugins/AVS/version.rc (renamed from plugins/Avs/version.rc) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Bass.h (renamed from plugins/Bass_interface/Bass.h) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Bass.rc (renamed from plugins/Bass_interface/Bass.rc) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Bass_interface.h (renamed from plugins/Bass_interface/Bass_interface.h) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Bass_interface.sln (renamed from plugins/Bass_interface/Bass_interface.sln) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Bass_interface.vcxproj (renamed from plugins/Bass_interface/Bass_interface.vcxproj) | 2 | ||||
| -rw-r--r-- | plugins/BASS_interface/Bass_interface.vcxproj.filters (renamed from plugins/Bass_interface/Bass_interface.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Main.cpp (renamed from plugins/Bass_interface/Main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Resource.h (renamed from plugins/Bass_interface/Resource.h) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Version.h (renamed from plugins/Bass_interface/Version.h) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/Version.rc (renamed from plugins/Bass_interface/Version.rc) | 0 | ||||
| -rw-r--r-- | plugins/BASS_interface/res/BASSSoundOnOffDown.ico (renamed from plugins/Bass_interface/res/BASSSoundOnOffDown.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | plugins/BASS_interface/res/BASSSoundOnOffUp.ico (renamed from plugins/Bass_interface/res/BASSSoundOnOffUp.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | plugins/BossKeyPlus/BossKey_10.vcxproj | 87 |
37 files changed, 84 insertions, 72 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index eb30930448..40566c492b 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\Avs\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chat", "..\plugins\Chat\chat_10.vcxproj", "{268BD296-8DD3-4715-A386-CF120398EC98}"
EndProject
@@ -248,6 +248,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_YAMN", "..\plugins\YA EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\protocols\Weather\proto_weather\proto_weather_10.vcxproj", "{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uinfoex_icons_default_Z1", "..\plugins\UserInfoEx\IconPacks\default\icons_default_10.vcxproj", "{AA542F66-FF66-498A-ADBE-0BB9103ECD0A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uinfoex_icons_default_Z2", "..\plugins\UserInfoEx\IconPacks\default\icons_default_10_z2.vcxproj", "{D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uinfoex_icons_ice_Z1", "..\plugins\UserInfoEx\IconPacks\ice\icons_ice_10.vcxproj", "{E04B8ECA-A066-41BA-AE8C-DB172424DD82}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uinfoex_icons_ice_Z2", "..\plugins\UserInfoEx\IconPacks\ice\icons_ice_10_z2.vcxproj", "{E787B42A-6489-4078-90CD-B78B751A1284}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "secureim_icons", "..\plugins\SecureIM\secureim_icons_10.vcxproj", "{3FAB6AC7-6B7F-4779-B519-34E8035074A4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_MRA", "..\protocols\MRA\xstatus_MRA\xstatus_MRA.vcxproj", "{5B84781D-F1C3-4535-99B7-B84B6C9BCF15}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bonsai", "..\plugins\Bonsai\Bonsai.vcxproj", "{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}"
EndProject
Global
@@ -526,7 +538,7 @@ Global {98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Debug|x64.ActiveCfg = Debug|Win32
{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release|Win32.ActiveCfg = Release|Win32
{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release|Win32.Build.0 = Release|Win32
- {98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release|x64.ActiveCfg = Release|Win32
+ {98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release|x64.ActiveCfg = Release|x64
{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug|Win32.ActiveCfg = Debug|Win32
{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug|Win32.Build.0 = Debug|Win32
{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug|x64.ActiveCfg = Debug|x64
@@ -1018,7 +1030,7 @@ Global {5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}.Debug|x64.ActiveCfg = Debug|Win32
{5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}.Release|Win32.ActiveCfg = Release|Win32
{5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}.Release|Win32.Build.0 = Release|Win32
- {5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}.Release|x64.ActiveCfg = Release|Win32
+ {5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}.Release|x64.ActiveCfg = Release|x64
{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|Win32.ActiveCfg = Debug|Win32
{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|Win32.Build.0 = Debug|Win32
{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1050,7 +1062,7 @@ Global {065889B7-478C-8E11-E93B-54A6D5A21564}.Debug|x64.ActiveCfg = Debug|Win32
{065889B7-478C-8E11-E93B-54A6D5A21564}.Release|Win32.ActiveCfg = Release|Win32
{065889B7-478C-8E11-E93B-54A6D5A21564}.Release|Win32.Build.0 = Release|Win32
- {065889B7-478C-8E11-E93B-54A6D5A21564}.Release|x64.ActiveCfg = Release|Win32
+ {065889B7-478C-8E11-E93B-54A6D5A21564}.Release|x64.ActiveCfg = Release|x64
{076543A3-41D6-6CD5-E1AE-14CAF9819D48}.Debug|Win32.ActiveCfg = Debug|Win32
{076543A3-41D6-6CD5-E1AE-14CAF9819D48}.Debug|Win32.Build.0 = Debug|Win32
{076543A3-41D6-6CD5-E1AE-14CAF9819D48}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1207,6 +1219,53 @@ Global {B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}.Release|Win32.Build.0 = Release|Win32
{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}.Release|x64.ActiveCfg = Release|x64
{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}.Release|x64.Build.0 = Release|x64
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Debug|Win32.Build.0 = Debug|Win32
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Debug|x64.ActiveCfg = Debug|x64
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Debug|x64.Build.0 = Debug|x64
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Release|Win32.ActiveCfg = Release|Win32
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Release|Win32.Build.0 = Release|Win32
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Release|x64.ActiveCfg = Release|x64
+ {AA542F66-FF66-498A-ADBE-0BB9103ECD0A}.Release|x64.Build.0 = Release|x64
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Debug|Win32.Build.0 = Debug|Win32
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Debug|x64.ActiveCfg = Debug|x64
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Debug|x64.Build.0 = Debug|x64
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Release|Win32.ActiveCfg = Release|Win32
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Release|Win32.Build.0 = Release|Win32
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Release|x64.ActiveCfg = Release|x64
+ {D90DD62F-6A75-4469-ABB5-A3E88BCA6A3C}.Release|x64.Build.0 = Release|x64
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Debug|Win32.Build.0 = Debug|Win32
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Debug|x64.ActiveCfg = Debug|x64
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Debug|x64.Build.0 = Debug|x64
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Release|Win32.ActiveCfg = Release|Win32
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Release|Win32.Build.0 = Release|Win32
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Release|x64.ActiveCfg = Release|x64
+ {E04B8ECA-A066-41BA-AE8C-DB172424DD82}.Release|x64.Build.0 = Release|x64
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Debug|Win32.Build.0 = Debug|Win32
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Debug|x64.ActiveCfg = Debug|x64
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Debug|x64.Build.0 = Debug|x64
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Release|Win32.ActiveCfg = Release|Win32
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Release|Win32.Build.0 = Release|Win32
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Release|x64.ActiveCfg = Release|x64
+ {E787B42A-6489-4078-90CD-B78B751A1284}.Release|x64.Build.0 = Release|x64
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Debug|Win32.Build.0 = Debug|Win32
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Debug|x64.ActiveCfg = Debug|x64
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Debug|x64.Build.0 = Debug|x64
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Release|Win32.ActiveCfg = Release|Win32
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Release|Win32.Build.0 = Release|Win32
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Release|x64.ActiveCfg = Release|x64
+ {3FAB6AC7-6B7F-4779-B519-34E8035074A4}.Release|x64.Build.0 = Release|x64
+ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Debug|Win32.Build.0 = Debug|Win32
+ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Debug|x64.ActiveCfg = Debug|x64
+ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Debug|x64.Build.0 = Debug|x64
+ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Release|Win32.ActiveCfg = Release|Win32
+ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Release|Win32.Build.0 = Release|Win32
+ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15}.Release|x64.ActiveCfg = Release|x64
{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|Win32.ActiveCfg = Debug|Win32
{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|Win32.Build.0 = Debug|Win32
{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/plugins/Avs/CHANGELOG.AVS b/plugins/AVS/CHANGELOG.AVS index a673bdff73..a673bdff73 100644 --- a/plugins/Avs/CHANGELOG.AVS +++ b/plugins/AVS/CHANGELOG.AVS diff --git a/plugins/Avs/README b/plugins/AVS/README index d82d1d7fec..d82d1d7fec 100644 --- a/plugins/Avs/README +++ b/plugins/AVS/README diff --git a/plugins/Avs/README.SOURCE b/plugins/AVS/README.SOURCE index 5f87280afe..5f87280afe 100644 --- a/plugins/Avs/README.SOURCE +++ b/plugins/AVS/README.SOURCE diff --git a/plugins/Avs/acc.cpp b/plugins/AVS/acc.cpp index f62009b43d..f62009b43d 100644 --- a/plugins/Avs/acc.cpp +++ b/plugins/AVS/acc.cpp diff --git a/plugins/Avs/acc.h b/plugins/AVS/acc.h index 11b235adc0..11b235adc0 100644 --- a/plugins/Avs/acc.h +++ b/plugins/AVS/acc.h diff --git a/plugins/Avs/avs.rc b/plugins/AVS/avs.rc index e1818ede8d..e1818ede8d 100644 --- a/plugins/Avs/avs.rc +++ b/plugins/AVS/avs.rc diff --git a/plugins/Avs/avs_10.vcxproj b/plugins/AVS/avs_10.vcxproj index c512086a8d..c512086a8d 100644 --- a/plugins/Avs/avs_10.vcxproj +++ b/plugins/AVS/avs_10.vcxproj diff --git a/plugins/Avs/avs_10.vcxproj.filters b/plugins/AVS/avs_10.vcxproj.filters index 6f6d39f743..6f6d39f743 100644 --- a/plugins/Avs/avs_10.vcxproj.filters +++ b/plugins/AVS/avs_10.vcxproj.filters diff --git a/plugins/Avs/commonheaders.h b/plugins/AVS/commonheaders.h index 70b0c88fae..70b0c88fae 100644 --- a/plugins/Avs/commonheaders.h +++ b/plugins/AVS/commonheaders.h diff --git a/plugins/Avs/image_utils.cpp b/plugins/AVS/image_utils.cpp index f6b6c7a98b..f6b6c7a98b 100644 --- a/plugins/Avs/image_utils.cpp +++ b/plugins/AVS/image_utils.cpp diff --git a/plugins/Avs/image_utils.h b/plugins/AVS/image_utils.h index 2dd75d8211..2dd75d8211 100644 --- a/plugins/Avs/image_utils.h +++ b/plugins/AVS/image_utils.h diff --git a/plugins/Avs/license.txt b/plugins/AVS/license.txt index 7f1161073d..7f1161073d 100644 --- a/plugins/Avs/license.txt +++ b/plugins/AVS/license.txt diff --git a/plugins/Avs/main.cpp b/plugins/AVS/main.cpp index bb4ebc236f..bb4ebc236f 100644 --- a/plugins/Avs/main.cpp +++ b/plugins/AVS/main.cpp diff --git a/plugins/Avs/mir_thread.cpp b/plugins/AVS/mir_thread.cpp index d12a0c9731..d12a0c9731 100644 --- a/plugins/Avs/mir_thread.cpp +++ b/plugins/AVS/mir_thread.cpp diff --git a/plugins/Avs/mir_thread.h b/plugins/AVS/mir_thread.h index 0f4f20fe8e..0f4f20fe8e 100644 --- a/plugins/Avs/mir_thread.h +++ b/plugins/AVS/mir_thread.h diff --git a/plugins/Avs/options.cpp b/plugins/AVS/options.cpp index 58502a9655..58502a9655 100644 --- a/plugins/Avs/options.cpp +++ b/plugins/AVS/options.cpp diff --git a/plugins/Avs/poll.cpp b/plugins/AVS/poll.cpp index 32553a9c33..32553a9c33 100644 --- a/plugins/Avs/poll.cpp +++ b/plugins/AVS/poll.cpp diff --git a/plugins/Avs/poll.h b/plugins/AVS/poll.h index 9761e7360a..9761e7360a 100644 --- a/plugins/Avs/poll.h +++ b/plugins/AVS/poll.h diff --git a/plugins/Avs/res/avatar.ico b/plugins/AVS/res/avatar.ico Binary files differindex 3525625479..3525625479 100644 --- a/plugins/Avs/res/avatar.ico +++ b/plugins/AVS/res/avatar.ico diff --git a/plugins/Avs/resource.h b/plugins/AVS/resource.h index 2d8ba9add0..2d8ba9add0 100644 --- a/plugins/Avs/resource.h +++ b/plugins/AVS/resource.h diff --git a/plugins/Avs/vc6.rc b/plugins/AVS/vc6.rc index 99a8f9da1d..99a8f9da1d 100644 --- a/plugins/Avs/vc6.rc +++ b/plugins/AVS/vc6.rc diff --git a/plugins/Avs/version.h b/plugins/AVS/version.h index 826d9fdefb..826d9fdefb 100644 --- a/plugins/Avs/version.h +++ b/plugins/AVS/version.h diff --git a/plugins/Avs/version.rc b/plugins/AVS/version.rc index 43d374df60..43d374df60 100644 --- a/plugins/Avs/version.rc +++ b/plugins/AVS/version.rc diff --git a/plugins/Bass_interface/Bass.h b/plugins/BASS_interface/Bass.h index cf0a66cf2b..cf0a66cf2b 100644 --- a/plugins/Bass_interface/Bass.h +++ b/plugins/BASS_interface/Bass.h diff --git a/plugins/Bass_interface/Bass.rc b/plugins/BASS_interface/Bass.rc index 31ca4098d3..31ca4098d3 100644 --- a/plugins/Bass_interface/Bass.rc +++ b/plugins/BASS_interface/Bass.rc diff --git a/plugins/Bass_interface/Bass_interface.h b/plugins/BASS_interface/Bass_interface.h index e42e85127b..e42e85127b 100644 --- a/plugins/Bass_interface/Bass_interface.h +++ b/plugins/BASS_interface/Bass_interface.h diff --git a/plugins/Bass_interface/Bass_interface.sln b/plugins/BASS_interface/Bass_interface.sln index 5be096af29..5be096af29 100644 --- a/plugins/Bass_interface/Bass_interface.sln +++ b/plugins/BASS_interface/Bass_interface.sln diff --git a/plugins/Bass_interface/Bass_interface.vcxproj b/plugins/BASS_interface/Bass_interface.vcxproj index 587bdb09c3..d793eb6d65 100644 --- a/plugins/Bass_interface/Bass_interface.vcxproj +++ b/plugins/BASS_interface/Bass_interface.vcxproj @@ -22,7 +22,7 @@ <ProjectGuid>{3933E789-D185-41DC-8169-9FF4365B6015}</ProjectGuid>
<RootNamespace>bass_interface</RootNamespace>
<Keyword>Win32Proj</Keyword>
- <ProjectName>Bass_interface</ProjectName>
+ <ProjectName>BASS_interface</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/plugins/Bass_interface/Bass_interface.vcxproj.filters b/plugins/BASS_interface/Bass_interface.vcxproj.filters index 025a1f421b..025a1f421b 100644 --- a/plugins/Bass_interface/Bass_interface.vcxproj.filters +++ b/plugins/BASS_interface/Bass_interface.vcxproj.filters diff --git a/plugins/Bass_interface/Main.cpp b/plugins/BASS_interface/Main.cpp index 3c9d5108a5..3c9d5108a5 100644 --- a/plugins/Bass_interface/Main.cpp +++ b/plugins/BASS_interface/Main.cpp diff --git a/plugins/Bass_interface/Resource.h b/plugins/BASS_interface/Resource.h index fb35fa7855..fb35fa7855 100644 --- a/plugins/Bass_interface/Resource.h +++ b/plugins/BASS_interface/Resource.h diff --git a/plugins/Bass_interface/Version.h b/plugins/BASS_interface/Version.h index 814a8951dd..814a8951dd 100644 --- a/plugins/Bass_interface/Version.h +++ b/plugins/BASS_interface/Version.h diff --git a/plugins/Bass_interface/Version.rc b/plugins/BASS_interface/Version.rc index e637f0cb33..e637f0cb33 100644 --- a/plugins/Bass_interface/Version.rc +++ b/plugins/BASS_interface/Version.rc diff --git a/plugins/Bass_interface/res/BASSSoundOnOffDown.ico b/plugins/BASS_interface/res/BASSSoundOnOffDown.ico Binary files differindex a10bfce204..a10bfce204 100644 --- a/plugins/Bass_interface/res/BASSSoundOnOffDown.ico +++ b/plugins/BASS_interface/res/BASSSoundOnOffDown.ico diff --git a/plugins/Bass_interface/res/BASSSoundOnOffUp.ico b/plugins/BASS_interface/res/BASSSoundOnOffUp.ico Binary files differindex bee9f065a0..bee9f065a0 100644 --- a/plugins/Bass_interface/res/BASSSoundOnOffUp.ico +++ b/plugins/BASS_interface/res/BASSSoundOnOffUp.ico diff --git a/plugins/BossKeyPlus/BossKey_10.vcxproj b/plugins/BossKeyPlus/BossKey_10.vcxproj index 4a151c5848..d0be9fe273 100644 --- a/plugins/BossKeyPlus/BossKey_10.vcxproj +++ b/plugins/BossKeyPlus/BossKey_10.vcxproj @@ -26,23 +26,21 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -72,7 +70,6 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -87,6 +84,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -100,37 +101,27 @@ </Midl>
<ClCompile>
<Optimization>Full</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BossKey_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
- <BrowseInformationFile>
- </BrowseInformationFile>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<BaseAddress>0x32270000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -148,28 +139,21 @@ <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BossKey_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>
- </AssemblerListingLocation>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <BrowseInformationFile>
- </BrowseInformationFile>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <BaseAddress>0x32270000</BaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -184,47 +168,29 @@ </Midl>
<ClCompile>
<Optimization>Full</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;BossKey_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)vc70.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0000</Culture>
+ <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
- <GenerateMapFile>false</GenerateMapFile>
<MapFileName>
</MapFileName>
<BaseAddress>0x32270000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -240,35 +206,22 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BossKey_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;BossKey_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>
- </AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)vc70.pdb</ProgramDataBaseFileName>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
+ <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
+ <BaseAddress>0x32270000</BaseAddress>
+ <SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
|