diff --git a/rpcs3/Emu/Cell/PPUInstrTable.h b/rpcs3/Emu/Cell/PPUInstrTable.h index 018532d751..67e6f80013 100644 --- a/rpcs3/Emu/Cell/PPUInstrTable.h +++ b/rpcs3/Emu/Cell/PPUInstrTable.h @@ -87,7 +87,7 @@ namespace PPU_instr static CodeField<6, 10> BO; //This field is used to specify a bit in the CR to be used as the condition of a branch conditional instruction - static CodeField<11, 13> BI; + static CodeField<11, 15> BI; //Immediate field specifying a 14-bit signed two's complement branch displacement that is concatenated on the //right with ‘00’ and sign-extended to 64 bits. diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index b54b8ec505..50c21ec9bf 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -28,18 +28,20 @@ Application true MultiByte + v110 Application true MultiByte + v110 Application false true MultiByte - v100 + v110 false @@ -47,7 +49,7 @@ false true MultiByte - v100 + v110 false diff --git a/wxWidgets/build/msw/wx_adv.vcxproj b/wxWidgets/build/msw/wx_adv.vcxproj index 17890dbfde..0117646921 100644 --- a/wxWidgets/build/msw/wx_adv.vcxproj +++ b/wxWidgets/build/msw/wx_adv.vcxproj @@ -142,157 +142,192 @@ adv + {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82} Application + v110 Application + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_aui.vcxproj b/wxWidgets/build/msw/wx_aui.vcxproj index 2694dbc8f1..0ecdce4880 100644 --- a/wxWidgets/build/msw/wx_aui.vcxproj +++ b/wxWidgets/build/msw/wx_aui.vcxproj @@ -142,157 +142,192 @@ aui + {7047EE97-7F80-A70D-6147-BC11102DB6F4} Application + v110 Application + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_base.vcxproj b/wxWidgets/build/msw/wx_base.vcxproj index 2d3a74b4eb..5ebfeb4d6b 100644 --- a/wxWidgets/build/msw/wx_base.vcxproj +++ b/wxWidgets/build/msw/wx_base.vcxproj @@ -142,157 +142,192 @@ base + {3111D679-7796-23C4-BA0C-271F1145DA24} Application + v110 Application + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_core.vcxproj b/wxWidgets/build/msw/wx_core.vcxproj index b354da3e12..746fa8bcfa 100644 --- a/wxWidgets/build/msw/wx_core.vcxproj +++ b/wxWidgets/build/msw/wx_core.vcxproj @@ -142,157 +142,192 @@ core + {067D9406-2A93-DACA-9449-93A2D356357D} Application + v110 Application + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_dbgrid.vcxproj b/wxWidgets/build/msw/wx_dbgrid.vcxproj index 8faa2045c6..b78be01a84 100644 --- a/wxWidgets/build/msw/wx_dbgrid.vcxproj +++ b/wxWidgets/build/msw/wx_dbgrid.vcxproj @@ -142,157 +142,192 @@ dbgrid + {9ED1866B-D4AE-3440-24E4-7A9475B163B2} Application + v110 Application + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_gl.vcxproj b/wxWidgets/build/msw/wx_gl.vcxproj index 02d74a69f1..45ef9447cf 100644 --- a/wxWidgets/build/msw/wx_gl.vcxproj +++ b/wxWidgets/build/msw/wx_gl.vcxproj @@ -142,157 +142,192 @@ gl + {99C9EB95-DB4C-1996-490E-5212EFBF07C3} Application + v110 Application + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_html.vcxproj b/wxWidgets/build/msw/wx_html.vcxproj index 1a0b336cee..6b7a250982 100644 --- a/wxWidgets/build/msw/wx_html.vcxproj +++ b/wxWidgets/build/msw/wx_html.vcxproj @@ -142,157 +142,192 @@ html + {6EDC3B79-D217-F11A-406F-F11D856493F9} Application + v110 Application + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_media.vcxproj b/wxWidgets/build/msw/wx_media.vcxproj index 5645179304..dbc2f63740 100644 --- a/wxWidgets/build/msw/wx_media.vcxproj +++ b/wxWidgets/build/msw/wx_media.vcxproj @@ -142,157 +142,192 @@ media + {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25} Application + v110 Application + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_net.vcxproj b/wxWidgets/build/msw/wx_net.vcxproj index 8dec758d2a..9c4bdbddff 100644 --- a/wxWidgets/build/msw/wx_net.vcxproj +++ b/wxWidgets/build/msw/wx_net.vcxproj @@ -142,157 +142,192 @@ net + {CD478F02-7550-58A5-E085-CE4BC0C0AD23} Application + v110 Application + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_odbc.vcxproj b/wxWidgets/build/msw/wx_odbc.vcxproj index 867097a3be..128504f7da 100644 --- a/wxWidgets/build/msw/wx_odbc.vcxproj +++ b/wxWidgets/build/msw/wx_odbc.vcxproj @@ -142,157 +142,192 @@ odbc + {C051C502-820F-2983-EF97-144C0CD92905} Application + v110 Application + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_qa.vcxproj b/wxWidgets/build/msw/wx_qa.vcxproj index 12a7438b53..81d201e4a8 100644 --- a/wxWidgets/build/msw/wx_qa.vcxproj +++ b/wxWidgets/build/msw/wx_qa.vcxproj @@ -142,157 +142,192 @@ qa + {22B14659-C5B6-B775-868D-A49198FEAD4A} Application + v110 Application + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_richtext.vcxproj b/wxWidgets/build/msw/wx_richtext.vcxproj index e75af926c8..e60408d367 100644 --- a/wxWidgets/build/msw/wx_richtext.vcxproj +++ b/wxWidgets/build/msw/wx_richtext.vcxproj @@ -142,157 +142,192 @@ richtext + {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774} Application + v110 Application + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 diff --git a/wxWidgets/build/msw/wx_wxexpat.vcxproj b/wxWidgets/build/msw/wx_wxexpat.vcxproj index c08bc45fcc..577746b8e4 100644 --- a/wxWidgets/build/msw/wx_wxexpat.vcxproj +++ b/wxWidgets/build/msw/wx_wxexpat.vcxproj @@ -142,141 +142,176 @@ wxexpat + {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2} Application + v110 Application + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_wxjpeg.vcxproj b/wxWidgets/build/msw/wx_wxjpeg.vcxproj index 5a88825a58..9d36152184 100644 --- a/wxWidgets/build/msw/wx_wxjpeg.vcxproj +++ b/wxWidgets/build/msw/wx_wxjpeg.vcxproj @@ -142,141 +142,176 @@ wxjpeg + {5C363C34-4741-7036-861C-2E2279CF552E} Application + v110 Application + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_wxpng.vcxproj b/wxWidgets/build/msw/wx_wxpng.vcxproj index 9db7676ec5..cde597214a 100644 --- a/wxWidgets/build/msw/wx_wxpng.vcxproj +++ b/wxWidgets/build/msw/wx_wxpng.vcxproj @@ -142,141 +142,176 @@ wxpng + {76169FE8-0814-4F36-6409-699EF1A23001} Application + v110 Application + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_wxregex.vcxproj b/wxWidgets/build/msw/wx_wxregex.vcxproj index 80997bd853..9e61d48ff8 100644 --- a/wxWidgets/build/msw/wx_wxregex.vcxproj +++ b/wxWidgets/build/msw/wx_wxregex.vcxproj @@ -134,151 +134,184 @@ wxregex + {949C6DB8-E638-6EC6-AB31-BCCFD1379E01} StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 diff --git a/wxWidgets/build/msw/wx_wxtiff.vcxproj b/wxWidgets/build/msw/wx_wxtiff.vcxproj index 14a77ab8b3..c971c37413 100644 --- a/wxWidgets/build/msw/wx_wxtiff.vcxproj +++ b/wxWidgets/build/msw/wx_wxtiff.vcxproj @@ -142,141 +142,176 @@ wxtiff + {B87216CD-6C64-1DB0-D900-BC6E745C1DF9} Application + v110 Application + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_wxzlib.vcxproj b/wxWidgets/build/msw/wx_wxzlib.vcxproj index 0b58f43be9..6ccf7871a4 100644 --- a/wxWidgets/build/msw/wx_wxzlib.vcxproj +++ b/wxWidgets/build/msw/wx_wxzlib.vcxproj @@ -142,141 +142,176 @@ wxzlib + {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA} Application + v110 Application + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 diff --git a/wxWidgets/build/msw/wx_xml.vcxproj b/wxWidgets/build/msw/wx_xml.vcxproj index fe725f6a06..0934d68028 100644 --- a/wxWidgets/build/msw/wx_xml.vcxproj +++ b/wxWidgets/build/msw/wx_xml.vcxproj @@ -142,157 +142,192 @@ xml + {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF} Application + v110 Application + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 diff --git a/wxWidgets/build/msw/wx_xrc.vcxproj b/wxWidgets/build/msw/wx_xrc.vcxproj index d636425c4c..4424dd3d90 100644 --- a/wxWidgets/build/msw/wx_xrc.vcxproj +++ b/wxWidgets/build/msw/wx_xrc.vcxproj @@ -142,157 +142,192 @@ xrc + {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6} Application + v110 Application + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 StaticLibrary false + v110 StaticLibrary false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 diff --git a/wxWidgets/src/msw/window.cpp b/wxWidgets/src/msw/window.cpp index 641427592d..720a8cdca1 100644 --- a/wxWidgets/src/msw/window.cpp +++ b/wxWidgets/src/msw/window.cpp @@ -106,7 +106,7 @@ #include #endif -#if !defined __WXWINCE__ && !defined NEED_PBT_H +#if !defined __WXWINCE__ && !defined NEED_PBT_H && _MSC_VER < 1600 #include #endif