diff --git a/rpcs3.sln b/rpcs3.sln index 3d5647a6ea..4194495473 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -17,45 +17,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wxWidgets", "wxWidgets", "{5812E712-6213-4372-B095-9EB9BAA1F2DF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wxWidgets\build\msw\wx_adv.vcxproj", "{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wxWidgets\build\msw\wx_vc10_adv.vcxproj", "{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wxWidgets\build\msw\wx_aui.vcxproj", "{7047EE97-7F80-A70D-6147-BC11102DB6F4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wxWidgets\build\msw\wx_vc10_aui.vcxproj", "{7047EE97-7F80-A70D-6147-BC11102DB6F4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wxWidgets\build\msw\wx_base.vcxproj", "{3111D679-7796-23C4-BA0C-271F1145DA24}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wxWidgets\build\msw\wx_vc10_base.vcxproj", "{3111D679-7796-23C4-BA0C-271F1145DA24}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wxWidgets\build\msw\wx_core.vcxproj", "{067D9406-2A93-DACA-9449-93A2D356357D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wxWidgets\build\msw\wx_vc10_core.vcxproj", "{067D9406-2A93-DACA-9449-93A2D356357D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbgrid", "wxWidgets\build\msw\wx_dbgrid.vcxproj", "{9ED1866B-D4AE-3440-24E4-7A9475B163B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wxWidgets\build\msw\wx_vc10_propgrid.vcxproj", "{9ED1866B-D4AE-3440-24E4-7A9475B163B2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wxWidgets\build\msw\wx_gl.vcxproj", "{99C9EB95-DB4C-1996-490E-5212EFBF07C3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wxWidgets\build\msw\wx_vc10_gl.vcxproj", "{99C9EB95-DB4C-1996-490E-5212EFBF07C3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wxWidgets\build\msw\wx_html.vcxproj", "{6EDC3B79-D217-F11A-406F-F11D856493F9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wxWidgets\build\msw\wx_vc10_html.vcxproj", "{6EDC3B79-D217-F11A-406F-F11D856493F9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wxWidgets\build\msw\wx_media.vcxproj", "{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wxWidgets\build\msw\wx_vc10_media.vcxproj", "{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wxWidgets\build\msw\wx_net.vcxproj", "{CD478F02-7550-58A5-E085-CE4BC0C0AD23}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wxWidgets\build\msw\wx_vc10_net.vcxproj", "{CD478F02-7550-58A5-E085-CE4BC0C0AD23}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "wxWidgets\build\msw\wx_odbc.vcxproj", "{C051C502-820F-2983-EF97-144C0CD92905}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wxWidgets\build\msw\wx_vc10_qa.vcxproj", "{22B14659-C5B6-B775-868D-A49198FEAD4A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wxWidgets\build\msw\wx_qa.vcxproj", "{22B14659-C5B6-B775-868D-A49198FEAD4A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wxWidgets\build\msw\wx_vc10_richtext.vcxproj", "{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wxWidgets\build\msw\wx_richtext.vcxproj", "{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wxWidgets\build\msw\wx_vc10_wxexpat.vcxproj", "{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wxWidgets\build\msw\wx_wxexpat.vcxproj", "{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wxWidgets\build\msw\wx_vc10_wxjpeg.vcxproj", "{5C363C34-4741-7036-861C-2E2279CF552E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wxWidgets\build\msw\wx_wxjpeg.vcxproj", "{5C363C34-4741-7036-861C-2E2279CF552E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wxWidgets\build\msw\wx_vc10_wxpng.vcxproj", "{76169FE8-0814-4F36-6409-699EF1A23001}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wxWidgets\build\msw\wx_wxpng.vcxproj", "{76169FE8-0814-4F36-6409-699EF1A23001}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wxWidgets\build\msw\wx_vc10_wxregex.vcxproj", "{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wxWidgets\build\msw\wx_wxregex.vcxproj", "{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wxWidgets\build\msw\wx_vc10_wxtiff.vcxproj", "{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wxWidgets\build\msw\wx_wxtiff.vcxproj", "{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wxWidgets\build\msw\wx_vc10_wxzlib.vcxproj", "{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wxWidgets\build\msw\wx_wxzlib.vcxproj", "{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wxWidgets\build\msw\wx_vc10_xml.vcxproj", "{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wxWidgets\build\msw\wx_xml.vcxproj", "{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wxWidgets\build\msw\wx_xrc.vcxproj", "{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wxWidgets\build\msw\wx_vc10_xrc.vcxproj", "{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stblib", "stblib", "{9D839DFB-76E6-4F10-8EED-BA2AC7CC3FB6}" ProjectSection(SolutionItems) = preProject @@ -103,10 +101,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unpkg", "unpkg", "{9F2D2094 unpkg\unpkg.h = unpkg\unpkg.h EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wxWidgets\build\msw\wx_vc10_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wxWidgets\build\msw\wx_vc10_stc.vcxproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wxWidgets\build\msw\wx_vc10_webview.vcxproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wxWidgets\build\msw\wx_vc10_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 + DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -115,6 +125,14 @@ Global {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|Win32.Build.0 = Debug|Win32 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.Build.0 = Debug|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|Win32.ActiveCfg = Debug|Win32 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|Win32.Build.0 = Debug|Win32 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|x64.ActiveCfg = Debug|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|x64.Build.0 = Debug|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|Win32.ActiveCfg = Release|Win32 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|Win32.Build.0 = Release|Win32 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|x64.ActiveCfg = Release|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|x64.Build.0 = Release|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|Win32.ActiveCfg = Release|Win32 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|Win32.Build.0 = Release|Win32 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64 @@ -123,6 +141,14 @@ Global {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|Win32.Build.0 = Debug|Win32 {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|x64.ActiveCfg = Debug|x64 {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|x64.Build.0 = Debug|x64 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|x64.Build.0 = DLL Release|x64 {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|Win32.ActiveCfg = Release|Win32 {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|Win32.Build.0 = Release|Win32 {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|x64.ActiveCfg = Release|x64 @@ -131,6 +157,14 @@ Global {7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|Win32.Build.0 = Debug|Win32 {7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|x64.ActiveCfg = Debug|x64 {7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|x64.Build.0 = Debug|x64 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|x64.Build.0 = DLL Release|x64 {7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|Win32.ActiveCfg = Release|Win32 {7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|Win32.Build.0 = Release|Win32 {7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|x64.ActiveCfg = Release|x64 @@ -139,6 +173,14 @@ Global {3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|Win32.Build.0 = Debug|Win32 {3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|x64.ActiveCfg = Debug|x64 {3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|x64.Build.0 = Debug|x64 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|x64.Build.0 = DLL Release|x64 {3111D679-7796-23C4-BA0C-271F1145DA24}.Release|Win32.ActiveCfg = Release|Win32 {3111D679-7796-23C4-BA0C-271F1145DA24}.Release|Win32.Build.0 = Release|Win32 {3111D679-7796-23C4-BA0C-271F1145DA24}.Release|x64.ActiveCfg = Release|x64 @@ -147,6 +189,14 @@ Global {067D9406-2A93-DACA-9449-93A2D356357D}.Debug|Win32.Build.0 = Debug|Win32 {067D9406-2A93-DACA-9449-93A2D356357D}.Debug|x64.ActiveCfg = Debug|x64 {067D9406-2A93-DACA-9449-93A2D356357D}.Debug|x64.Build.0 = Debug|x64 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|x64.Build.0 = DLL Release|x64 {067D9406-2A93-DACA-9449-93A2D356357D}.Release|Win32.ActiveCfg = Release|Win32 {067D9406-2A93-DACA-9449-93A2D356357D}.Release|Win32.Build.0 = Release|Win32 {067D9406-2A93-DACA-9449-93A2D356357D}.Release|x64.ActiveCfg = Release|x64 @@ -155,6 +205,14 @@ Global {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|Win32.Build.0 = Debug|Win32 {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|x64.ActiveCfg = Debug|x64 {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|x64.Build.0 = Debug|x64 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|x64.Build.0 = DLL Release|x64 {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|Win32.ActiveCfg = Release|Win32 {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|Win32.Build.0 = Release|Win32 {9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|x64.ActiveCfg = Release|x64 @@ -163,6 +221,14 @@ Global {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|Win32.Build.0 = Debug|Win32 {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|x64.ActiveCfg = Debug|x64 {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|x64.Build.0 = Debug|x64 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|x64.Build.0 = DLL Release|x64 {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|Win32.ActiveCfg = Release|Win32 {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|Win32.Build.0 = Release|Win32 {99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|x64.ActiveCfg = Release|x64 @@ -171,6 +237,14 @@ Global {6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|Win32.Build.0 = Debug|Win32 {6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|x64.ActiveCfg = Debug|x64 {6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|x64.Build.0 = Debug|x64 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|x64.Build.0 = DLL Release|x64 {6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|Win32.ActiveCfg = Release|Win32 {6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|Win32.Build.0 = Release|Win32 {6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|x64.ActiveCfg = Release|x64 @@ -179,6 +253,14 @@ Global {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|Win32.Build.0 = Debug|Win32 {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|x64.ActiveCfg = Debug|x64 {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|x64.Build.0 = Debug|x64 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|x64.Build.0 = DLL Release|x64 {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|Win32.ActiveCfg = Release|Win32 {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|Win32.Build.0 = Release|Win32 {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|x64.ActiveCfg = Release|x64 @@ -187,22 +269,30 @@ Global {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|Win32.Build.0 = Debug|Win32 {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|x64.ActiveCfg = Debug|x64 {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|x64.Build.0 = Debug|x64 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|x64.Build.0 = DLL Release|x64 {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|Win32.ActiveCfg = Release|Win32 {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|Win32.Build.0 = Release|Win32 {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.ActiveCfg = Release|x64 {CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.Build.0 = Release|x64 - {C051C502-820F-2983-EF97-144C0CD92905}.Debug|Win32.ActiveCfg = Debug|Win32 - {C051C502-820F-2983-EF97-144C0CD92905}.Debug|Win32.Build.0 = Debug|Win32 - {C051C502-820F-2983-EF97-144C0CD92905}.Debug|x64.ActiveCfg = Debug|x64 - {C051C502-820F-2983-EF97-144C0CD92905}.Debug|x64.Build.0 = Debug|x64 - {C051C502-820F-2983-EF97-144C0CD92905}.Release|Win32.ActiveCfg = Release|Win32 - {C051C502-820F-2983-EF97-144C0CD92905}.Release|Win32.Build.0 = Release|Win32 - {C051C502-820F-2983-EF97-144C0CD92905}.Release|x64.ActiveCfg = Release|x64 - {C051C502-820F-2983-EF97-144C0CD92905}.Release|x64.Build.0 = Release|x64 {22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.ActiveCfg = Debug|Win32 {22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.Build.0 = Debug|Win32 {22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|x64.ActiveCfg = Debug|x64 {22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|x64.Build.0 = Debug|x64 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|x64.Build.0 = DLL Release|x64 {22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|Win32.ActiveCfg = Release|Win32 {22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|Win32.Build.0 = Release|Win32 {22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|x64.ActiveCfg = Release|x64 @@ -211,6 +301,14 @@ Global {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|Win32.Build.0 = Debug|Win32 {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|x64.ActiveCfg = Debug|x64 {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|x64.Build.0 = Debug|x64 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|x64.Build.0 = DLL Release|x64 {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|Win32.ActiveCfg = Release|Win32 {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|Win32.Build.0 = Release|Win32 {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|x64.ActiveCfg = Release|x64 @@ -219,6 +317,14 @@ Global {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|Win32.Build.0 = Debug|Win32 {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|x64.ActiveCfg = Debug|x64 {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|x64.Build.0 = Debug|x64 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|x64.Build.0 = DLL Release|x64 {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|Win32.ActiveCfg = Release|Win32 {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|Win32.Build.0 = Release|Win32 {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|x64.ActiveCfg = Release|x64 @@ -227,6 +333,14 @@ Global {5C363C34-4741-7036-861C-2E2279CF552E}.Debug|Win32.Build.0 = Debug|Win32 {5C363C34-4741-7036-861C-2E2279CF552E}.Debug|x64.ActiveCfg = Debug|x64 {5C363C34-4741-7036-861C-2E2279CF552E}.Debug|x64.Build.0 = Debug|x64 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|x64.Build.0 = DLL Release|x64 {5C363C34-4741-7036-861C-2E2279CF552E}.Release|Win32.ActiveCfg = Release|Win32 {5C363C34-4741-7036-861C-2E2279CF552E}.Release|Win32.Build.0 = Release|Win32 {5C363C34-4741-7036-861C-2E2279CF552E}.Release|x64.ActiveCfg = Release|x64 @@ -235,6 +349,14 @@ Global {76169FE8-0814-4F36-6409-699EF1A23001}.Debug|Win32.Build.0 = Debug|Win32 {76169FE8-0814-4F36-6409-699EF1A23001}.Debug|x64.ActiveCfg = Debug|x64 {76169FE8-0814-4F36-6409-699EF1A23001}.Debug|x64.Build.0 = Debug|x64 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|x64.Build.0 = DLL Release|x64 {76169FE8-0814-4F36-6409-699EF1A23001}.Release|Win32.ActiveCfg = Release|Win32 {76169FE8-0814-4F36-6409-699EF1A23001}.Release|Win32.Build.0 = Release|Win32 {76169FE8-0814-4F36-6409-699EF1A23001}.Release|x64.ActiveCfg = Release|x64 @@ -243,6 +365,14 @@ Global {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|Win32.Build.0 = Debug|Win32 {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|x64.ActiveCfg = Debug|x64 {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|x64.Build.0 = Debug|x64 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|x64.Build.0 = DLL Release|x64 {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|Win32.ActiveCfg = Release|Win32 {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|Win32.Build.0 = Release|Win32 {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|x64.ActiveCfg = Release|x64 @@ -251,6 +381,14 @@ Global {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|Win32.Build.0 = Debug|Win32 {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|x64.ActiveCfg = Debug|x64 {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|x64.Build.0 = Debug|x64 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|x64.Build.0 = DLL Release|x64 {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|Win32.ActiveCfg = Release|Win32 {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|Win32.Build.0 = Release|Win32 {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|x64.ActiveCfg = Release|x64 @@ -259,6 +397,14 @@ Global {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|Win32.Build.0 = Debug|Win32 {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|x64.ActiveCfg = Debug|x64 {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|x64.Build.0 = Debug|x64 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|x64.Build.0 = DLL Release|x64 {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|Win32.ActiveCfg = Release|Win32 {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|Win32.Build.0 = Release|Win32 {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|x64.ActiveCfg = Release|x64 @@ -267,6 +413,14 @@ Global {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|Win32.Build.0 = Debug|Win32 {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|x64.ActiveCfg = Debug|x64 {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|x64.Build.0 = Debug|x64 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|x64.Build.0 = DLL Release|x64 {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|Win32.ActiveCfg = Release|Win32 {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|Win32.Build.0 = Release|Win32 {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|x64.ActiveCfg = Release|x64 @@ -275,10 +429,82 @@ Global {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|Win32.Build.0 = Debug|Win32 {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|x64.ActiveCfg = Debug|x64 {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|x64.Build.0 = Debug|x64 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|x64.Build.0 = DLL Release|x64 {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|Win32.ActiveCfg = Release|Win32 {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|Win32.Build.0 = Release|Win32 {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.ActiveCfg = Release|x64 {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.Build.0 = Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -293,7 +519,6 @@ Global {6EDC3B79-D217-F11A-406F-F11D856493F9} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {CD478F02-7550-58A5-E085-CE4BC0C0AD23} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} - {C051C502-820F-2983-EF97-144C0CD92905} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {22B14659-C5B6-B775-868D-A49198FEAD4A} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} @@ -304,5 +529,9 @@ Global {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} + {23E1C437-A951-5943-8639-A17F3CF2E606} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} + {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} EndGlobalSection EndGlobal diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h index 4010adc7c5..adc7f793d7 100644 --- a/rpcs3/Emu/CPU/CPUThread.h +++ b/rpcs3/Emu/CPU/CPUThread.h @@ -114,7 +114,8 @@ public: virtual std::string GetThreadName() const { - return (GetFName() + wxString::Format("[0x%08llx]", PC)).mb_str(); + wxString temp = (GetFName() + wxString::Format("[0x%08llx]", PC)); + return std::string(temp.mb_str()); } public: diff --git a/rpcs3/Emu/CPU/CPUThreadManager.cpp b/rpcs3/Emu/CPU/CPUThreadManager.cpp index 46bdce578b..0a2ad13f33 100644 --- a/rpcs3/Emu/CPU/CPUThreadManager.cpp +++ b/rpcs3/Emu/CPU/CPUThreadManager.cpp @@ -36,7 +36,7 @@ CPUThread& CPUThreadManager::AddThread(CPUThreadType type) default: assert(0); } - new_thread->SetId(Emu.GetIdManager().GetNewID(wxString::Format("%s Thread", new_thread->GetTypeString().mb_str()).mb_str(), new_thread)); + new_thread->SetId(Emu.GetIdManager().GetNewID((const char*)wxString::Format("%s Thread", (const char*)new_thread->GetTypeString().mb_str()).mb_str(), new_thread)); m_threads.Add(new_thread); #ifndef QT_UI diff --git a/rpcs3/Emu/Cell/PPCDisAsm.h b/rpcs3/Emu/Cell/PPCDisAsm.h index e2610d6d07..006feb738a 100644 --- a/rpcs3/Emu/Cell/PPCDisAsm.h +++ b/rpcs3/Emu/Cell/PPCDisAsm.h @@ -15,39 +15,39 @@ protected: void DisAsm_V4(const wxString& op, u32 v0, u32 v1, u32 v2, u32 v3) { - Write(wxString::Format("%s v%d,v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2, v3)); + Write(wxString::Format("%s v%d,v%d,v%d,v%d", (const char*)FixOp(op).mb_str(), v0, v1, v2, v3)); } void DisAsm_V3_UIMM(const wxString& op, u32 v0, u32 v1, u32 v2, u32 uimm) { - Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, v2, uimm, uimm)); + Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", (const char*)FixOp(op).mb_str(), v0, v1, v2, uimm, uimm)); } void DisAsm_V3(const wxString& op, u32 v0, u32 v1, u32 v2) { - Write(wxString::Format("%s v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2)); + Write(wxString::Format("%s v%d,v%d,v%d", (const char*)FixOp(op).mb_str(), v0, v1, v2)); } void DisAsm_V2_UIMM(const wxString& op, u32 v0, u32 v1, u32 uimm) { - Write(wxString::Format("%s v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, uimm, uimm)); + Write(wxString::Format("%s v%d,v%d,%u #%x", (const char*)FixOp(op).mb_str(), v0, v1, uimm, uimm)); } void DisAsm_V2(const wxString& op, u32 v0, u32 v1) { - Write(wxString::Format("%s v%d,v%d", FixOp(op).mb_str(), v0, v1)); + Write(wxString::Format("%s v%d,v%d", (const char*)FixOp(op).mb_str(), v0, v1)); } void DisAsm_V1_SIMM(const wxString& op, u32 v0, s32 simm) { - Write(wxString::Format("%s v%d,%d #%x", FixOp(op).mb_str(), v0, simm, simm)); + Write(wxString::Format("%s v%d,%d #%x", (const char*)FixOp(op).mb_str(), v0, simm, simm)); } void DisAsm_V1(const wxString& op, u32 v0) { - Write(wxString::Format("%s v%d", FixOp(op).mb_str(), v0)); + Write(wxString::Format("%s v%d", (const char*)FixOp(op).mb_str(), v0)); } void DisAsm_V1_R2(const wxString& op, u32 v0, u32 r1, u32 r2) { - Write(wxString::Format("%s v%d,r%d,r%d", FixOp(op).mb_str(), v0, r1, r2)); + Write(wxString::Format("%s v%d,r%d,r%d", (const char*)FixOp(op).mb_str(), v0, r1, r2)); } void DisAsm_CR1_F2_RC(const wxString& op, u32 cr0, u32 f0, u32 f1, bool rc) { - Write(wxString::Format("%s%s cr%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", cr0, f0, f1)); + Write(wxString::Format("%s%s cr%d,f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", cr0, f0, f1)); } void DisAsm_CR1_F2(const wxString& op, u32 cr0, u32 f0, u32 f1) { @@ -55,15 +55,15 @@ protected: } void DisAsm_INT1_R2(const wxString& op, u32 i0, u32 r0, u32 r1) { - Write(wxString::Format("%s %d,r%d,r%d", FixOp(op).mb_str(), i0, r0, r1)); + Write(wxString::Format("%s %d,r%d,r%d", (const char*)FixOp(op).mb_str(), i0, r0, r1)); } void DisAsm_INT1_R1_IMM(const wxString& op, u32 i0, u32 r0, s32 imm0) { - Write(wxString::Format("%s %d,r%d,%d #%x", FixOp(op).mb_str(), i0, r0, imm0, imm0)); + Write(wxString::Format("%s %d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), i0, r0, imm0, imm0)); } void DisAsm_INT1_R1_RC(const wxString& op, u32 i0, u32 r0, bool rc) { - Write(wxString::Format("%s%s %d,r%d", FixOp(op).mb_str(), rc ? "." : "", i0, r0)); + Write(wxString::Format("%s%s %d,r%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", i0, r0)); } void DisAsm_INT1_R1(const wxString& op, u32 i0, u32 r0) { @@ -71,11 +71,11 @@ protected: } void DisAsm_F4_RC(const wxString& op, u32 f0, u32 f1, u32 f2, u32 f3, bool rc) { - Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2, f3)); + Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2, f3)); } void DisAsm_F3_RC(const wxString& op, u32 f0, u32 f1, u32 f2, bool rc) { - Write(wxString::Format("%s%s f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2)); + Write(wxString::Format("%s%s f%d,f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2)); } void DisAsm_F3(const wxString& op, u32 f0, u32 f1, u32 f2) { @@ -83,7 +83,7 @@ protected: } void DisAsm_F2_RC(const wxString& op, u32 f0, u32 f1, bool rc) { - Write(wxString::Format("%s%s f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1)); + Write(wxString::Format("%s%s f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, f1)); } void DisAsm_F2(const wxString& op, u32 f0, u32 f1) { @@ -93,21 +93,21 @@ protected: { if(m_mode == CPUDisAsm_CompilerElfMode) { - Write(wxString::Format("%s f%d,r%d,r%d", FixOp(op).mb_str(), f0, r0, r1)); + Write(wxString::Format("%s f%d,r%d,r%d", (const char*)FixOp(op).mb_str(), f0, r0, r1)); return; } - Write(wxString::Format("%s f%d,r%d(r%d)", FixOp(op).mb_str(), f0, r0, r1)); + Write(wxString::Format("%s f%d,r%d(r%d)", (const char*)FixOp(op).mb_str(), f0, r0, r1)); } void DisAsm_F1_IMM_R1_RC(const wxString& op, u32 f0, s32 imm0, u32 r0, bool rc) { if(m_mode == CPUDisAsm_CompilerElfMode) { - Write(wxString::Format("%s%s f%d,r%d,%d #%x", FixOp(op).mb_str(), rc ? "." : "", f0, r0, imm0, imm0)); + Write(wxString::Format("%s%s f%d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, r0, imm0, imm0)); return; } - Write(wxString::Format("%s%s f%d,%d(r%d) #%x", FixOp(op).mb_str(), rc ? "." : "", f0, imm0, r0, imm0)); + Write(wxString::Format("%s%s f%d,%d(r%d) #%x", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, imm0, r0, imm0)); } void DisAsm_F1_IMM_R1(const wxString& op, u32 f0, s32 imm0, u32 r0) { @@ -115,11 +115,11 @@ protected: } void DisAsm_F1_RC(const wxString& op, u32 f0, bool rc) { - Write(wxString::Format("%s%s f%d", FixOp(op).mb_str(), rc ? "." : "", f0)); + Write(wxString::Format("%s%s f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0)); } void DisAsm_R1_RC(const wxString& op, u32 r0, bool rc) { - Write(wxString::Format("%s%s r%d", FixOp(op).mb_str(), rc ? "." : "", r0)); + Write(wxString::Format("%s%s r%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0)); } void DisAsm_R1(const wxString& op, u32 r0) { @@ -127,7 +127,7 @@ protected: } void DisAsm_R2_OE_RC(const wxString& op, u32 r0, u32 r1, u32 oe, bool rc) { - Write(wxString::Format("%s%s%s r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1)); + Write(wxString::Format("%s%s%s r%d,r%d", (const char*)FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1)); } void DisAsm_R2_RC(const wxString& op, u32 r0, u32 r1, bool rc) { @@ -139,11 +139,11 @@ protected: } void DisAsm_R3_OE_RC(const wxString& op, u32 r0, u32 r1, u32 r2, u32 oe, bool rc) { - Write(wxString::Format("%s%s%s r%d,r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2)); + Write(wxString::Format("%s%s%s r%d,r%d,r%d", (const char*)FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2)); } void DisAsm_R3_INT2_RC(const wxString& op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, r2, i0, i1)); + Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, r2, i0, i1)); } void DisAsm_R3_RC(const wxString& op, u32 r0, u32 r1, u32 r2, bool rc) { @@ -155,7 +155,7 @@ protected: } void DisAsm_R2_INT3_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1, i2)); + Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1, i2)); } void DisAsm_R2_INT3(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2) { @@ -163,7 +163,7 @@ protected: } void DisAsm_R2_INT2_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1)); + Write(wxString::Format("%s%s r%d,r%d,%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1)); } void DisAsm_R2_INT2(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1) { @@ -171,7 +171,7 @@ protected: } void DisAsm_R2_INT1_RC(const wxString& op, u32 r0, u32 r1, s32 i0, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0)); + Write(wxString::Format("%s%s r%d,r%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0)); } void DisAsm_R2_INT1(const wxString& op, u32 r0, u32 r1, s32 i0) { @@ -181,27 +181,27 @@ protected: { if(m_mode == CPUDisAsm_CompilerElfMode) { - Write(wxString::Format("%s r%d,r%d,%d #%x", FixOp(op).mb_str(), r0, r1, imm0, imm0)); + Write(wxString::Format("%s r%d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), r0, r1, imm0, imm0)); return; } - Write(wxString::Format("%s r%d,%d(r%d) #%x", FixOp(op).mb_str(), r0, imm0, r1, imm0)); + Write(wxString::Format("%s r%d,%d(r%d) #%x", (const char*)FixOp(op).mb_str(), r0, imm0, r1, imm0)); } void DisAsm_R1_IMM(const wxString& op, u32 r0, s32 imm0) { - Write(wxString::Format("%s r%d,%d #%x", FixOp(op).mb_str(), r0, imm0, imm0)); + Write(wxString::Format("%s r%d,%d #%x", (const char*)FixOp(op).mb_str(), r0, imm0, imm0)); } void DisAsm_IMM_R1(const wxString& op, s32 imm0, u32 r0) { - Write(wxString::Format("%s %d,r%d #%x", FixOp(op).mb_str(), imm0, r0, imm0)); + Write(wxString::Format("%s %d,r%d #%x", (const char*)FixOp(op).mb_str(), imm0, r0, imm0)); } void DisAsm_CR1_R1_IMM(const wxString& op, u32 cr0, u32 r0, s32 imm0) { - Write(wxString::Format("%s cr%d,r%d,%d #%x", FixOp(op).mb_str(), cr0, r0, imm0, imm0)); + Write(wxString::Format("%s cr%d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), cr0, r0, imm0, imm0)); } void DisAsm_CR1_R2_RC(const wxString& op, u32 cr0, u32 r0, u32 r1, bool rc) { - Write(wxString::Format("%s%s cr%d,r%d,r%d", FixOp(op).mb_str(), rc ? "." : "", cr0, r0, r1)); + Write(wxString::Format("%s%s cr%d,r%d,r%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", cr0, r0, r1)); } void DisAsm_CR1_R2(const wxString& op, u32 cr0, u32 r0, u32 r1) { @@ -209,30 +209,30 @@ protected: } void DisAsm_CR2(const wxString& op, u32 cr0, u32 cr1) { - Write(wxString::Format("%s cr%d,cr%d", FixOp(op).mb_str(), cr0, cr1)); + Write(wxString::Format("%s cr%d,cr%d", (const char*)FixOp(op).mb_str(), cr0, cr1)); } void DisAsm_INT3(const wxString& op, const int i0, const int i1, const int i2) { - Write(wxString::Format("%s %d,%d,%d", FixOp(op).mb_str(), i0, i1, i2)); + Write(wxString::Format("%s %d,%d,%d", (const char*)FixOp(op).mb_str(), i0, i1, i2)); } void DisAsm_INT1(const wxString& op, const int i0) { - Write(wxString::Format("%s %d", FixOp(op).mb_str(), i0)); + Write(wxString::Format("%s %d", (const char*)FixOp(op).mb_str(), i0)); } void DisAsm_BRANCH(const wxString& op, const int pc) { - Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), DisAsmBranchTarget(pc))); + Write(wxString::Format("%s 0x%x", (const char*)FixOp(op).mb_str(), DisAsmBranchTarget(pc))); } void DisAsm_BRANCH_A(const wxString& op, const int pc) { - Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), pc)); + Write(wxString::Format("%s 0x%x", (const char*)FixOp(op).mb_str(), pc)); } void DisAsm_B2_BRANCH(const wxString& op, u32 b0, u32 b1, const int pc) { - Write(wxString::Format("%s %d,%d,0x%x ", FixOp(op).mb_str(), b0, b1, DisAsmBranchTarget(pc))); + Write(wxString::Format("%s %d,%d,0x%x ", (const char*)FixOp(op).mb_str(), b0, b1, DisAsmBranchTarget(pc))); } void DisAsm_CR_BRANCH(const wxString& op, u32 cr, const int pc) { - Write(wxString::Format("%s cr%d,0x%x ", FixOp(op).mb_str(), cr, DisAsmBranchTarget(pc))); + Write(wxString::Format("%s cr%d,0x%x ", (const char*)FixOp(op).mb_str(), cr, DisAsmBranchTarget(pc))); } }; diff --git a/rpcs3/Emu/Cell/PPCThread.h b/rpcs3/Emu/Cell/PPCThread.h index a6e35ed8d5..cb8ec7da41 100644 --- a/rpcs3/Emu/Cell/PPCThread.h +++ b/rpcs3/Emu/Cell/PPCThread.h @@ -17,7 +17,7 @@ public: virtual std::string GetThreadName() const { - return (GetFName() + wxString::Format("[0x%08llx]", PC)).mb_str(); + return std::string((GetFName() + wxString::Format("[0x%08llx]", PC)).mb_str()); } protected: diff --git a/rpcs3/Emu/Cell/PPUDisAsm.h b/rpcs3/Emu/Cell/PPUDisAsm.h index 2011dcff32..16b29d474d 100644 --- a/rpcs3/Emu/Cell/PPUDisAsm.h +++ b/rpcs3/Emu/Cell/PPUDisAsm.h @@ -24,39 +24,39 @@ private: private: void DisAsm_V4(const wxString& op, u32 v0, u32 v1, u32 v2, u32 v3) { - Write(wxString::Format("%s v%d,v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2, v3)); + Write(wxString::Format("%s v%d,v%d,v%d,v%d", (const char*)FixOp(op).mb_str(), v0, v1, v2, v3)); } void DisAsm_V3_UIMM(const wxString& op, u32 v0, u32 v1, u32 v2, u32 uimm) { - Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, v2, uimm, uimm)); + Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", (const char*)FixOp(op).mb_str(), v0, v1, v2, uimm, uimm)); } void DisAsm_V3(const wxString& op, u32 v0, u32 v1, u32 v2) { - Write(wxString::Format("%s v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2)); + Write(wxString::Format("%s v%d,v%d,v%d", (const char*)FixOp(op).mb_str(), v0, v1, v2)); } void DisAsm_V2_UIMM(const wxString& op, u32 v0, u32 v1, u32 uimm) { - Write(wxString::Format("%s v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, uimm, uimm)); + Write(wxString::Format("%s v%d,v%d,%u #%x", (const char*)FixOp(op).mb_str(), v0, v1, uimm, uimm)); } void DisAsm_V2(const wxString& op, u32 v0, u32 v1) { - Write(wxString::Format("%s v%d,v%d", FixOp(op).mb_str(), v0, v1)); + Write(wxString::Format("%s v%d,v%d", (const char*)FixOp(op).mb_str(), v0, v1)); } void DisAsm_V1_SIMM(const wxString& op, u32 v0, s32 simm) { - Write(wxString::Format("%s v%d,%d #%x", FixOp(op).mb_str(), v0, simm, simm)); + Write(wxString::Format("%s v%d,%d #%x", (const char*)FixOp(op).mb_str(), v0, simm, simm)); } void DisAsm_V1(const wxString& op, u32 v0) { - Write(wxString::Format("%s v%d", FixOp(op).mb_str(), v0)); + Write(wxString::Format("%s v%d", (const char*)FixOp(op).mb_str(), v0)); } void DisAsm_V1_R2(const wxString& op, u32 v0, u32 r1, u32 r2) { - Write(wxString::Format("%s v%d,r%d,r%d", FixOp(op).mb_str(), v0, r1, r2)); + Write(wxString::Format("%s v%d,r%d,r%d", (const char*)FixOp(op).mb_str(), v0, r1, r2)); } void DisAsm_CR1_F2_RC(const wxString& op, u32 cr0, u32 f0, u32 f1, bool rc) { - Write(wxString::Format("%s%s cr%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", cr0, f0, f1)); + Write(wxString::Format("%s%s cr%d,f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", cr0, f0, f1)); } void DisAsm_CR1_F2(const wxString& op, u32 cr0, u32 f0, u32 f1) { @@ -64,15 +64,15 @@ private: } void DisAsm_INT1_R2(const wxString& op, u32 i0, u32 r0, u32 r1) { - Write(wxString::Format("%s %d,r%d,r%d", FixOp(op).mb_str(), i0, r0, r1)); + Write(wxString::Format("%s %d,r%d,r%d", (const char*)FixOp(op).mb_str(), i0, r0, r1)); } void DisAsm_INT1_R1_IMM(const wxString& op, u32 i0, u32 r0, s32 imm0) { - Write(wxString::Format("%s %d,r%d,%d #%x", FixOp(op).mb_str(), i0, r0, imm0, imm0)); + Write(wxString::Format("%s %d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), i0, r0, imm0, imm0)); } void DisAsm_INT1_R1_RC(const wxString& op, u32 i0, u32 r0, bool rc) { - Write(wxString::Format("%s%s %d,r%d", FixOp(op).mb_str(), rc ? "." : "", i0, r0)); + Write(wxString::Format("%s%s %d,r%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", i0, r0)); } void DisAsm_INT1_R1(const wxString& op, u32 i0, u32 r0) { @@ -80,11 +80,11 @@ private: } void DisAsm_F4_RC(const wxString& op, u32 f0, u32 f1, u32 f2, u32 f3, bool rc) { - Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2, f3)); + Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2, f3)); } void DisAsm_F3_RC(const wxString& op, u32 f0, u32 f1, u32 f2, bool rc) { - Write(wxString::Format("%s%s f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2)); + Write(wxString::Format("%s%s f%d,f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2)); } void DisAsm_F3(const wxString& op, u32 f0, u32 f1, u32 f2) { @@ -92,7 +92,7 @@ private: } void DisAsm_F2_RC(const wxString& op, u32 f0, u32 f1, bool rc) { - Write(wxString::Format("%s%s f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1)); + Write(wxString::Format("%s%s f%d,f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, f1)); } void DisAsm_F2(const wxString& op, u32 f0, u32 f1) { @@ -102,21 +102,21 @@ private: { if(m_mode == CPUDisAsm_CompilerElfMode) { - Write(wxString::Format("%s f%d,r%d,r%d", FixOp(op).mb_str(), f0, r0, r1)); + Write(wxString::Format("%s f%d,r%d,r%d", (const char*)FixOp(op).mb_str(), f0, r0, r1)); return; } - Write(wxString::Format("%s f%d,r%d(r%d)", FixOp(op).mb_str(), f0, r0, r1)); + Write(wxString::Format("%s f%d,r%d(r%d)", (const char*)FixOp(op).mb_str(), f0, r0, r1)); } void DisAsm_F1_IMM_R1_RC(const wxString& op, u32 f0, s32 imm0, u32 r0, bool rc) { if(m_mode == CPUDisAsm_CompilerElfMode) { - Write(wxString::Format("%s%s f%d,r%d,%d #%x", FixOp(op).mb_str(), rc ? "." : "", f0, r0, imm0, imm0)); + Write(wxString::Format("%s%s f%d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, r0, imm0, imm0)); return; } - Write(wxString::Format("%s%s f%d,%d(r%d) #%x", FixOp(op).mb_str(), rc ? "." : "", f0, imm0, r0, imm0)); + Write(wxString::Format("%s%s f%d,%d(r%d) #%x", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0, imm0, r0, imm0)); } void DisAsm_F1_IMM_R1(const wxString& op, u32 f0, s32 imm0, u32 r0) { @@ -124,11 +124,11 @@ private: } void DisAsm_F1_RC(const wxString& op, u32 f0, bool rc) { - Write(wxString::Format("%s%s f%d", FixOp(op).mb_str(), rc ? "." : "", f0)); + Write(wxString::Format("%s%s f%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", f0)); } void DisAsm_R1_RC(const wxString& op, u32 r0, bool rc) { - Write(wxString::Format("%s%s r%d", FixOp(op).mb_str(), rc ? "." : "", r0)); + Write(wxString::Format("%s%s r%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0)); } void DisAsm_R1(const wxString& op, u32 r0) { @@ -136,7 +136,7 @@ private: } void DisAsm_R2_OE_RC(const wxString& op, u32 r0, u32 r1, u32 oe, bool rc) { - Write(wxString::Format("%s%s%s r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1)); + Write(wxString::Format("%s%s%s r%d,r%d", (const char*)FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1)); } void DisAsm_R2_RC(const wxString& op, u32 r0, u32 r1, bool rc) { @@ -148,11 +148,11 @@ private: } void DisAsm_R3_OE_RC(const wxString& op, u32 r0, u32 r1, u32 r2, u32 oe, bool rc) { - Write(wxString::Format("%s%s%s r%d,r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2)); + Write(wxString::Format("%s%s%s r%d,r%d,r%d", (const char*)FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2)); } void DisAsm_R3_INT2_RC(const wxString& op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, r2, i0, i1)); + Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, r2, i0, i1)); } void DisAsm_R3_RC(const wxString& op, u32 r0, u32 r1, u32 r2, bool rc) { @@ -164,7 +164,7 @@ private: } void DisAsm_R2_INT3_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1, i2)); + Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1, i2)); } void DisAsm_R2_INT3(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2) { @@ -172,7 +172,7 @@ private: } void DisAsm_R2_INT2_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1)); + Write(wxString::Format("%s%s r%d,r%d,%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1)); } void DisAsm_R2_INT2(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1) { @@ -180,7 +180,7 @@ private: } void DisAsm_R2_INT1_RC(const wxString& op, u32 r0, u32 r1, s32 i0, bool rc) { - Write(wxString::Format("%s%s r%d,r%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0)); + Write(wxString::Format("%s%s r%d,r%d,%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0)); } void DisAsm_R2_INT1(const wxString& op, u32 r0, u32 r1, s32 i0) { @@ -190,27 +190,27 @@ private: { if(m_mode == CPUDisAsm_CompilerElfMode) { - Write(wxString::Format("%s r%d,r%d,%d #%x", FixOp(op).mb_str(), r0, r1, imm0, imm0)); + Write(wxString::Format("%s r%d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), r0, r1, imm0, imm0)); return; } - Write(wxString::Format("%s r%d,%d(r%d) #%x", FixOp(op).mb_str(), r0, imm0, r1, imm0)); + Write(wxString::Format("%s r%d,%d(r%d) #%x", (const char*)FixOp(op).mb_str(), r0, imm0, r1, imm0)); } void DisAsm_R1_IMM(const wxString& op, u32 r0, s32 imm0) { - Write(wxString::Format("%s r%d,%d #%x", FixOp(op).mb_str(), r0, imm0, imm0)); + Write(wxString::Format("%s r%d,%d #%x", (const char*)FixOp(op).mb_str(), r0, imm0, imm0)); } void DisAsm_IMM_R1(const wxString& op, s32 imm0, u32 r0) { - Write(wxString::Format("%s %d,r%d #%x", FixOp(op).mb_str(), imm0, r0, imm0)); + Write(wxString::Format("%s %d,r%d #%x", (const char*)FixOp(op).mb_str(), imm0, r0, imm0)); } void DisAsm_CR1_R1_IMM(const wxString& op, u32 cr0, u32 r0, s32 imm0) { - Write(wxString::Format("%s cr%d,r%d,%d #%x", FixOp(op).mb_str(), cr0, r0, imm0, imm0)); + Write(wxString::Format("%s cr%d,r%d,%d #%x", (const char*)FixOp(op).mb_str(), cr0, r0, imm0, imm0)); } void DisAsm_CR1_R2_RC(const wxString& op, u32 cr0, u32 r0, u32 r1, bool rc) { - Write(wxString::Format("%s%s cr%d,r%d,r%d", FixOp(op).mb_str(), rc ? "." : "", cr0, r0, r1)); + Write(wxString::Format("%s%s cr%d,r%d,r%d", (const char*)FixOp(op).mb_str(), rc ? "." : "", cr0, r0, r1)); } void DisAsm_CR1_R2(const wxString& op, u32 cr0, u32 r0, u32 r1) { @@ -218,31 +218,31 @@ private: } void DisAsm_CR2(const wxString& op, u32 cr0, u32 cr1) { - Write(wxString::Format("%s cr%d,cr%d", FixOp(op).mb_str(), cr0, cr1)); + Write(wxString::Format("%s cr%d,cr%d", (const char*)FixOp(op).mb_str(), cr0, cr1)); } void DisAsm_INT3(const wxString& op, const int i0, const int i1, const int i2) { - Write(wxString::Format("%s %d,%d,%d", FixOp(op).mb_str(), i0, i1, i2)); + Write(wxString::Format("%s %d,%d,%d", (const char*)FixOp(op).mb_str(), i0, i1, i2)); } void DisAsm_INT1(const wxString& op, const int i0) { - Write(wxString::Format("%s %d", FixOp(op).mb_str(), i0)); + Write(wxString::Format("%s %d", (const char*)FixOp(op).mb_str(), i0)); } void DisAsm_BRANCH(const wxString& op, const int pc) { - Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), DisAsmBranchTarget(pc))); + Write(wxString::Format("%s 0x%x", (const char*)FixOp(op).mb_str(), DisAsmBranchTarget(pc))); } void DisAsm_BRANCH_A(const wxString& op, const int pc) { - Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), pc)); + Write(wxString::Format("%s 0x%x", (const char*)FixOp(op).mb_str(), pc)); } void DisAsm_B2_BRANCH(const wxString& op, u32 b0, u32 b1, const int pc) { - Write(wxString::Format("%s %d,%d,0x%x ", FixOp(op).mb_str(), b0, b1, DisAsmBranchTarget(pc))); + Write(wxString::Format("%s %d,%d,0x%x ", (const char*)FixOp(op).mb_str(), b0, b1, DisAsmBranchTarget(pc))); } void DisAsm_CR_BRANCH(const wxString& op, u32 cr, const int pc) { - Write(wxString::Format("%s cr%d,0x%x ", FixOp(op).mb_str(), cr, DisAsmBranchTarget(pc))); + Write(wxString::Format("%s cr%d,0x%x ", (const char*)FixOp(op).mb_str(), cr, DisAsmBranchTarget(pc))); } private: diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp index 508fba34bb..bd0ed1982d 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp @@ -46,13 +46,13 @@ s64 FindOp(const wxString& text, const wxString& op, s64 from) for(s64 i=from; i= text.Len() || text[i + op.Len()] == '\n' || - CompilePPUProgram::IsSkip(text[i + op.Len()])) return i; + if(i + op.Len() >= text.Len() || text[(size_t)i + op.Len()] == '\n' || + CompilePPUProgram::IsSkip(text[(size_t)i + op.Len()])) return i; } } @@ -149,7 +149,7 @@ void CompilePPUProgram::WriteError(const wxString& error) { if(m_err_list) { - m_err_list->WriteText(wxString::Format("line %lld: %s\n", m_line, error.mb_str())); + m_err_list->WriteText(wxString::Format("line %lld: %s\n", m_line, (const char*)error.mb_str())); } } @@ -158,7 +158,7 @@ bool CompilePPUProgram::IsCommit(const char c) { return c == '#'; } bool CompilePPUProgram::IsEnd() const { return p >= m_asm.Len(); } bool CompilePPUProgram::IsEndLn(const char c) const { return c == '\n' || p - 1 >= m_asm.Len(); } -char CompilePPUProgram::NextChar() { return *m_asm(p++, 1); } +char CompilePPUProgram::NextChar() { return *(const char*)m_asm(p++, 1); } void CompilePPUProgram::NextLn() { while( !IsEndLn(NextChar()) ); if(!IsEnd()) m_line++; } void CompilePPUProgram::EndLn() { @@ -176,9 +176,9 @@ void CompilePPUProgram::FirstChar() void CompilePPUProgram::PrevArg() { - while( --p >= 0 && (IsSkip(m_asm[p]) || m_asm[p] == ',')); - while( --p >= 0 && !IsSkip(m_asm[p]) && !IsEndLn(m_asm[p]) ); - if(IsEndLn(m_asm[p])) p++; + while( --p >= 0 && (IsSkip(m_asm[(size_t)p]) || m_asm[(size_t)p] == ',')); + while( --p >= 0 && !IsSkip(m_asm[(size_t)p]) && !IsEndLn(m_asm[(size_t)p]) ); + if(IsEndLn(m_asm[(size_t)p])) p++; } bool CompilePPUProgram::GetOp(wxString& result) @@ -234,12 +234,12 @@ int CompilePPUProgram::GetArg(wxString& result, bool func) continue; } - const bool text = m_asm[from] == '"'; + const bool text = m_asm[(size_t)from] == '"'; const bool end_text = cur_char == '"'; if((text ? end_text : (skip || commit || end)) || endln) { - if(text && p > 2 && m_asm[p - 2] == '\\' && (p <= 3 || m_asm[p - 3] != '\\')) + if(text && p > 2 && m_asm[(size_t)p - 2] == '\\' && (p <= 3 || m_asm[(size_t)p - 3] != '\\')) { continue; } @@ -382,7 +382,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg) } } - switch(str[0]) + switch((char)str[0]) { case 'r': case 'f': case 'v': @@ -417,7 +417,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg) return; } - switch(str[0]) + switch((char)str[0]) { case 'r': arg.type = ARG_REG_R; break; case 'f': arg.type = ARG_REG_F; break; @@ -701,20 +701,20 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) if(!GetArg(test) || test[0] != '[') { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("data not found. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("data not found. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; } - while(p > 0 && m_asm[p] != '[') p--; + while(p > 0 && m_asm[(size_t)p] != '[') p--; p++; wxString dst; if(!GetArg(dst)) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("dst not found. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("dst not found. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; @@ -745,7 +745,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) if(!dst_branch) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("bad dst type. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("bad dst type. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; @@ -763,7 +763,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) if(!GetArg(src1, true)) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("src not found. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("src not found. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; @@ -779,16 +779,16 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) : ~(ARG_IMM | ARG_BRANCH) & a_src1.type) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("bad src type. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("bad src type. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; } - if(m_asm[p - 1] != ']') + if(m_asm[(size_t)p - 1] != ']') { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("']' not found. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("']' not found. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; @@ -869,7 +869,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) if(!GetArg(src1)) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("src1 not found. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("src1 not found. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; @@ -881,7 +881,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) if(~(ARG_IMM | ARG_BRANCH) & a_src1.type) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("bad src1 type. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("bad src1 type. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; @@ -891,7 +891,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) if(!GetArg(src2, true)) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("src2 not found. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("src2 not found. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; return; } @@ -902,16 +902,16 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd) if(~(ARG_IMM | ARG_BRANCH) & a_src2.type) { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("bad src2 type. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("bad src2 type. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; } - if(m_asm[p - 1] != ']') + if(m_asm[(size_t)p - 1] != ']') { if(m_analyze) WriteHex("error\n"); - WriteError(wxString::Format("']' not found. style: %s", GetSpStyle(sp).mb_str())); + WriteError(wxString::Format("']' not found. style: %s", (const char*)GetSpStyle(sp).mb_str())); m_error = true; NextLn(); return; @@ -1046,7 +1046,7 @@ void CompilePPUProgram::Compile() continue; } - while(p > 0 && m_asm[p] != '[') p--; + while(p > 0 && m_asm[(size_t)p] != '[') p--; p++; wxString module, name, id; @@ -1108,7 +1108,7 @@ void CompilePPUProgram::Compile() continue; } - if(m_asm[p - 1] != ']') + if(m_asm[(size_t)p - 1] != ']') { WriteError("']' not found. style: [module, name, id]"); m_error = true; @@ -1340,7 +1340,7 @@ void CompilePPUProgram::Compile() for(u32 i=0; iConnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(GSFrame::OnLeftDclick), (wxObject*)0, this); } -void GLGSFrame::Flip() +void GLGSFrame::Flip(wxGLContext *context) { if(!canvas) return; - canvas->SetCurrent(); + canvas->SetCurrent(*context); static Timer fps_t; canvas->SwapBuffers(); @@ -1068,7 +1068,7 @@ void GLGSRender::Flip() m_post_draw_objs[i].Draw(); } - m_frame->Flip(); + m_frame->Flip(m_context); if(m_fbo.IsCreated()) m_fbo.Bind(); diff --git a/rpcs3/Emu/GS/GL/GLGSRender.h b/rpcs3/Emu/GS/GL/GLGSRender.h index 419f57aab3..82a2ee2f30 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.h +++ b/rpcs3/Emu/GS/GL/GLGSRender.h @@ -303,7 +303,7 @@ struct GLGSFrame : public GSFrame GLGSFrame(); ~GLGSFrame() {} - void Flip(); + void Flip(wxGLContext *context); wxGLCanvas* GetCanvas() const { return canvas; } diff --git a/rpcs3/Emu/GS/GL/GLProgram.cpp b/rpcs3/Emu/GS/GL/GLProgram.cpp index 9e6a4fe5eb..80b11d168e 100644 --- a/rpcs3/Emu/GS/GL/GLProgram.cpp +++ b/rpcs3/Emu/GS/GL/GLProgram.cpp @@ -20,7 +20,7 @@ int GLProgram::GetLocation(const wxString& name) m_locations[pos].name = name; m_locations[pos].loc = glGetUniformLocation(id, name); - checkForGlError(wxString::Format("glGetUniformLocation(0x%x, %s)", id, name.mb_str())); + checkForGlError(wxString::Format("glGetUniformLocation(0x%x, %s)", id, (const char*)name.mb_str())); return m_locations[pos].loc; } diff --git a/rpcs3/Emu/GS/GL/GLVertexProgram.cpp b/rpcs3/Emu/GS/GL/GLVertexProgram.cpp index 8060882778..315d30cdb6 100644 --- a/rpcs3/Emu/GS/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/GS/GL/GLVertexProgram.cpp @@ -314,16 +314,16 @@ wxString GLVertexDecompilerThread::BuildCode() for(int i=m_funcs.GetCount() - 1; i>0; --i) { - fp += wxString::Format("void %s();\n", m_funcs[i].name.mb_str()); + fp += wxString::Format("void %s();\n", (const char*)m_funcs[i].name.mb_str()); } wxString f = wxEmptyString; - f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n", m_funcs[0].name.mb_str(), BuildFuncBody(m_funcs[0]).mb_str()); + f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n", (const char*)m_funcs[0].name.mb_str(), (const char*)BuildFuncBody(m_funcs[0]).mb_str()); for(uint i=1; ilast_opcode); } } - fd.Write(wxString::Format("End of section header %s[%d]\n\n", name.mb_str(), sh)); + fd.Write(wxString::Format("End of section header %s[%d]\n\n", (const char*)name.mb_str(), sh)); } prog_dial.Close(); diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp index a040eb9f9a..6e8d46d6a4 100644 --- a/rpcs3/Gui/GameViewer.cpp +++ b/rpcs3/Gui/GameViewer.cpp @@ -91,7 +91,7 @@ void GameViewer::DClick(wxListEvent& event) const wxString& path = m_path + m_game_data[i].root; Emu.Stop(); - if(!Emu.BootGame(path.c_str())) + if(!Emu.BootGame(path.ToStdString())) { ConLog.Error("Boot error: elf not found! [%s]", path.mb_str()); return; diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 1f3d8f1d9c..a41aeed74d 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -192,7 +192,7 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event)) Emu.Stop(); - if(Emu.BootGame(ctrl.GetPath().c_str())) + if(Emu.BootGame(ctrl.GetPath().ToStdString())) { ConLog.Success("Game: boot done."); } @@ -242,7 +242,7 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event)) wxString mainDir = wxGetCwd(); wxString gamePath = "\\dev_hdd0\\game\\"; - wxString pkgDir = wxT(mainDir + gamePath + titleID); + wxString pkgDir = mainDir + gamePath + titleID; // Save the title ID. Emu.SetTitleID(titleID); @@ -250,7 +250,7 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event)) //Refresh game list m_game_viewer->Refresh(); - if(Emu.BootGame(pkgDir.c_str())) + if(Emu.BootGame(pkgDir.ToStdString())) { ConLog.Success("Game: boot done."); } @@ -770,13 +770,13 @@ void MainFrame::UpdateUI(wxCommandEvent& event) wxMenuItem& stop = *menubar.FindItem( id_sys_stop ); wxMenuItem& send_exit = *menubar.FindItem( id_sys_send_exit ); wxMenuItem& send_open_menu = *menubar.FindItem( id_sys_send_open_menu ); - pause.SetText(is_running ? "Pause\tCtrl + P" : is_ready ? "Start\tCtrl + C" : "Resume\tCtrl + C"); + pause.SetItemLabel(is_running ? "Pause\tCtrl + P" : is_ready ? "Start\tCtrl + C" : "Resume\tCtrl + C"); pause.Enable(!is_stopped); stop.Enable(!is_stopped); //send_exit.Enable(false); bool enable_commands = !is_stopped && Emu.GetCallbackManager().m_exit_callback.m_callbacks.GetCount(); - send_open_menu.SetText(wxString::Format("Send %s system menu cmd", m_sys_menu_opened ? "close" : "open")); + send_open_menu.SetItemLabel(wxString::Format("Send %s system menu cmd", m_sys_menu_opened ? "close" : "open")); send_open_menu.Enable(enable_commands); send_exit.Enable(enable_commands); diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index 8415bb19be..0a49325c1d 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -713,7 +713,7 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA switch(cmd & 0x3ffff) { case 0x3fead: - DISASM("Flip and change current buffer: %d", args[0]); + DISASM("Flip and change current buffer: %d", (u32)args[0]); break; case NV4097_NO_OPERATION: @@ -721,11 +721,11 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA break; case NV406E_SET_REFERENCE: - DISASM("Set reference: 0x%x", args[0]); + DISASM("Set reference: 0x%x", (u32)args[0]); break; case_16(NV4097_SET_TEXTURE_OFFSET, 0x20): - DISASM("Texture Offset[%d]: %08x", index, args[0]); + DISASM("Texture Offset[%d]: %08x", index, (u32)args[0]); switch ((args[1] & 0x3) - 1) { case CELL_GCM_LOCATION_LOCAL: DISASM("(Local memory);"); break; @@ -760,32 +760,32 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA break; case NV4097_SET_CONTEXT_DMA_COLOR_A: - DISASM("Context DMA Color A: 0x%x", args[0]); + DISASM("Context DMA Color A: 0x%x", (u32)args[0]); break; case NV4097_SET_CONTEXT_DMA_COLOR_B: - DISASM("Context DMA Color B: 0x%x", args[0]); + DISASM("Context DMA Color B: 0x%x", (u32)args[0]); break; case NV4097_SET_CONTEXT_DMA_COLOR_C: - DISASM("Context DMA Color C: 0x%x", args[0]); + DISASM("Context DMA Color C: 0x%x", (u32)args[0]); if(count > 1) - DISASM("0x%x", args[1]); + DISASM("0x%x", (u32)args[1]); break; case NV4097_SET_CONTEXT_DMA_ZETA: - DISASM("Context DMA Zeta: 0x%x", args[0]); + DISASM("Context DMA Zeta: 0x%x", (u32)args[0]); break; case NV4097_SET_SURFACE_PITCH_C: - DISASM("Surface Pitch C: 0x%x;", args[0]); - DISASM("Surface Pitch D: 0x%x;", args[1]); - DISASM("Surface Offset C: 0x%x;", args[2]); - DISASM("Surface Offset D: 0x%x", args[3]); + DISASM("Surface Pitch C: 0x%x;", (u32)args[0]); + DISASM("Surface Pitch D: 0x%x;", (u32)args[1]); + DISASM("Surface Offset C: 0x%x;", (u32)args[2]); + DISASM("Surface Offset D: 0x%x", (u32)args[3]); break; case NV4097_SET_SURFACE_PITCH_Z: - DISASM("Surface Pitch Z: 0x%x;", args[0]); + DISASM("Surface Pitch Z: 0x%x;", (u32)args[0]); break; default: @@ -802,7 +802,7 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA for(uint i=0; iOpen(path)) { - wxMessageBox(wxString::Format("EXPORT ERROR: file open error. (%s)", path.mb_str())); + wxMessageBox(wxString::Format("EXPORT ERROR: file open error. (%s)", (const char*)path.mb_str())); return; } diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp index e8180408ba..6af0b0db2a 100644 --- a/rpcs3/Loader/ELF64.cpp +++ b/rpcs3/Loader/ELF64.cpp @@ -336,7 +336,7 @@ bool ELF64Loader::LoadPhdrData(u64 offset) stub.s_text = re(stub.s_text); const wxString& module_name = Memory.ReadString(stub.s_modulename); - Module* module = GetModuleByName(module_name.mb_str()); + Module* module = GetModuleByName(module_name.ToStdString()); if(module) { //module->SetLoaded(); diff --git a/rpcs3/Loader/Loader.cpp b/rpcs3/Loader/Loader.cpp index 86f8ebd326..bb93b34a62 100644 --- a/rpcs3/Loader/Loader.cpp +++ b/rpcs3/Loader/Loader.cpp @@ -72,7 +72,7 @@ const wxString Phdr_FlagsToString(u32 flags) flags &= ~spu << 0x14; flags &= ~rsx << 0x18; - if(flags != 0) return wxString::Format("Unknown %s PPU[%x] SPU[%x] RSX[%x]", ret.mb_str(), ppu, spu, rsx); + if(flags != 0) return wxString::Format("Unknown %s PPU[%x] SPU[%x] RSX[%x]", (const char*)ret.mb_str(), ppu, spu, rsx); ret += "PPU[" + FLAGS_TO_STRING(ppu) + "] "; ret += "SPU[" + FLAGS_TO_STRING(spu) + "] "; diff --git a/rpcs3/Loader/PSF.h b/rpcs3/Loader/PSF.h index 1deb1e639a..b8eca706cc 100644 --- a/rpcs3/Loader/PSF.h +++ b/rpcs3/Loader/PSF.h @@ -37,7 +37,7 @@ struct PsfEntry return FormatString(); case 0x0404: - return wxString::Format("0x%x", FormatInteger()).c_str(); + return wxString::Format("0x%x", FormatInteger()).ToStdString(); } } diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 7fa98fa362..c94e517057 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -27,20 +27,20 @@ Application true - MultiByte + Unicode v110 Application true - MultiByte + Unicode v110 Application false true - MultiByte + Unicode v110 false @@ -48,7 +48,7 @@ Application false true - MultiByte + Unicode v110 false @@ -105,12 +105,14 @@ EditAndContinue Use true + C:\DEV\rpcs3\wxWidgets\include\msvc true - adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies) + wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies) %(IgnoreSpecificDefaultLibraries) false + C:\DEV\rpcs3\wxWidgets\lib\vc_lib @@ -123,12 +125,14 @@ Disabled ProgramDatabase Use + C:\DEV\rpcs3\wxWidgets\include\msvc true - adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies) + wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies) %(IgnoreSpecificDefaultLibraries) false + C:\DEV\rpcs3\wxWidgets\lib\vc_lib "$(SolutionDir)\Utilities\git-version-gen.cmd" @@ -140,8 +144,7 @@ Full true true - - + C:\DEV\rpcs3\wxWidgets\include\msvc MultiThreadedDLL WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false @@ -155,11 +158,12 @@ true true true - adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) + wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) %(IgnoreSpecificDefaultLibraries) false + C:\DEV\rpcs3\wxWidgets\lib\vc_lib @@ -172,8 +176,7 @@ Full true true - - + C:\DEV\rpcs3\wxWidgets\include\msvc MultiThreadedDLL WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false @@ -187,11 +190,12 @@ true true true - adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) + wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) %(IgnoreSpecificDefaultLibraries) false + C:\DEV\rpcs3\wxWidgets\lib\vc_lib diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 18a72ee8dc..3b0e28bdeb 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -3,19 +3,20 @@ #define NOMINMAX #ifndef QT_UI -#include - +#include #include +#include #include #include #include #include #include -#include +//#include #include #include #include +#include #include #endif diff --git a/unpkg/unpkg.c b/unpkg/unpkg.c index b5367e1e88..cf6136cd40 100644 --- a/unpkg/unpkg.c +++ b/unpkg/unpkg.c @@ -17,6 +17,8 @@ #include "ps3_common.h" #include "oddkeys.h" +#include //in a *.c file ? + static void hash_tostring(char *str, u8 *hash, u32 len) { u8 *p; diff --git a/wxWidgets b/wxWidgets index 8f97969383..00e8b466ce 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit 8f9796938374f6aa714fb96c11d8aecaaad727df +Subproject commit 00e8b466ce3a56735533dfd701d1d7ea7eaa2601