Fix 64-bit JIT flags mismatch.

diff --git a/jit/codegen_x86.cpp b/jit/codegen_x86.cpp
index 1e1786296c02d46b607762c50f90408a2e36e6ae..f50cdd4e69b5bd2ce839b962adbaf67daeb5fe02 100644 (file)
--- a/jit/codegen_x86.cpp
+++ b/jit/codegen_x86.cpp
@@ -1433,6 +1433,11 @@ static inline void raw_flags_set_zero_FLAGSTK(int s, int tmp)
 static inline void raw_flags_init_FLAGSTK(void) { }
 
 #if defined(CPU_x86_64)
+
+#ifndef SAHF_SETO_PROFITABLE
+#error x64 JIT requires SAHF_SETO_PROFITABLE
+#endif
+
 /* Try to use the LAHF/SETO method on x86_64 since it is faster.
    This can't be the default because some older CPUs don't support
    LAHF/SAHF in long mode.  */

diff --git a/od-win32/winuae_msvc15/winuae_msvc.sln b/od-win32/winuae_msvc15/winuae_msvc.sln
index 01f79f013bf322d0916adff66c210027d382c789..72b2d82f8fb52129bcc64f2764f64f162b0d092a 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.sln
+++ b/od-win32/winuae_msvc15/winuae_msvc.sln
@@ -49,9 +49,6 @@ Global
                Release|Mixed Platforms = Release|Mixed Platforms
                Release|Win32 = Release|Win32
                Release|x64 = Release|x64
-               ReleaseXP|Mixed Platforms = ReleaseXP|Mixed Platforms
-               ReleaseXP|Win32 = ReleaseXP|Win32
-               ReleaseXP|x64 = ReleaseXP|x64
                Test|Mixed Platforms = Test|Mixed Platforms
                Test|Win32 = Test|Win32
                Test|x64 = Test|x64
@@ -75,12 +72,6 @@ Global
                {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.Build.0 = Release|Win32
                {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.ActiveCfg = Release|x64
                {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.Build.0 = Release|x64
-               {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32
-               {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64
-               {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|x64.Build.0 = ReleaseXP|x64
                {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.Build.0 = Test|Win32
                {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.ActiveCfg = Test|Win32
@@ -101,10 +92,6 @@ Global
                {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Mixed Platforms.Build.0 = Release|Win32
                {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Win32.ActiveCfg = Release|Win32
                {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x64.ActiveCfg = Release|Win32
-               {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.Build.0 = Test|Win32
                {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Win32.ActiveCfg = Test|Win32
@@ -123,10 +110,6 @@ Global
                {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Mixed Platforms.Build.0 = Release|Win32
                {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Win32.ActiveCfg = Release|Win32
                {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x64.ActiveCfg = Release|Win32
-               {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.Build.0 = Test|Win32
                {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Win32.ActiveCfg = Test|Win32
@@ -145,10 +128,6 @@ Global
                {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Mixed Platforms.Build.0 = Release|Win32
                {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Win32.ActiveCfg = Release|Win32
                {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x64.ActiveCfg = Release|Win32
-               {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.Build.0 = Test|Win32
                {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Win32.ActiveCfg = Test|Win32
@@ -167,10 +146,6 @@ Global
                {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Mixed Platforms.Build.0 = Release|Win32
                {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Win32.ActiveCfg = Release|Win32
                {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x64.ActiveCfg = Release|Win32
-               {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.Build.0 = Test|Win32
                {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Win32.ActiveCfg = Test|Win32
@@ -189,10 +164,6 @@ Global
                {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|Mixed Platforms.Build.0 = Release|Win32
                {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|Win32.ActiveCfg = Release|Win32
                {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|x64.ActiveCfg = Release|Win32
-               {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Test|Mixed Platforms.Build.0 = Test|Win32
                {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Test|Win32.ActiveCfg = Test|Win32
@@ -211,10 +182,6 @@ Global
                {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Mixed Platforms.Build.0 = Release|Win32
                {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.ActiveCfg = Release|Win32
                {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x64.ActiveCfg = Release|Win32
-               {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.Build.0 = Test|Win32
                {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Win32.ActiveCfg = Test|Win32
@@ -233,10 +200,6 @@ Global
                {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|Mixed Platforms.Build.0 = Release|Win32
                {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|Win32.ActiveCfg = Release|Win32
                {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|x64.ActiveCfg = Release|Win32
-               {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Test|Mixed Platforms.Build.0 = Test|Win32
                {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Test|Win32.ActiveCfg = Test|Win32
@@ -254,10 +217,6 @@ Global
                {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|Mixed Platforms.Build.0 = Release|Win32
                {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|Win32.ActiveCfg = Release|Win32
                {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|x64.ActiveCfg = Release|Win32
-               {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Test|Mixed Platforms.Build.0 = Test|Win32
                {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Test|Win32.ActiveCfg = Test|Win32
@@ -276,10 +235,6 @@ Global
                {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Mixed Platforms.Build.0 = Release|Win32
                {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Win32.ActiveCfg = Release|Win32
                {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x64.ActiveCfg = Release|Win32
-               {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.Build.0 = Test|Win32
                {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Win32.ActiveCfg = Test|Win32
@@ -298,10 +253,6 @@ Global
                {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|Mixed Platforms.Build.0 = Release|Win32
                {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|Win32.ActiveCfg = Release|Win32
                {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|x64.ActiveCfg = Release|Win32
-               {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Test|Mixed Platforms.Build.0 = Test|Win32
                {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Test|Win32.ActiveCfg = Test|Win32
@@ -320,10 +271,6 @@ Global
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Mixed Platforms.Build.0 = Release|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.ActiveCfg = Release|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|x64.ActiveCfg = Release|Win32
-               {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|Mixed Platforms.Build.0 = Test|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|Win32.ActiveCfg = Test|Win32
@@ -342,10 +289,6 @@ Global
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|Mixed Platforms.Build.0 = Release|Win32
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|Win32.ActiveCfg = Release|Win32
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|x64.ActiveCfg = Release|x64
-               {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Test|Mixed Platforms.Build.0 = Test|Win32
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Test|Win32.ActiveCfg = Test|Win32
@@ -364,10 +307,6 @@ Global
                {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Mixed Platforms.Build.0 = Release|Win32
                {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Win32.ActiveCfg = Release|Win32
                {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|x64.ActiveCfg = Release|x64
-               {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64
                {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|Mixed Platforms.Build.0 = Test|Win32
                {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|Win32.ActiveCfg = Test|Win32
@@ -386,10 +325,6 @@ Global
                {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Mixed Platforms.Build.0 = Release|Win32
                {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Win32.ActiveCfg = Release|Win32
                {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|x64.ActiveCfg = Release|x64
-               {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32
-               {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32
-               {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-               {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64
                {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|Mixed Platforms.ActiveCfg = Test|Win32
                {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|Mixed Platforms.Build.0 = Test|Win32
                {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|Win32.ActiveCfg = Test|Win32
@@ -405,9 +340,6 @@ Global
                {BE211CE1-3955-4674-A664-5038FC791980}.Release|Mixed Platforms.Build.0 = Release|x86
                {BE211CE1-3955-4674-A664-5038FC791980}.Release|Win32.ActiveCfg = Release|x86
                {BE211CE1-3955-4674-A664-5038FC791980}.Release|x64.ActiveCfg = Release|x86
-               {BE211CE1-3955-4674-A664-5038FC791980}.ReleaseXP|Mixed Platforms.ActiveCfg = Release|x86
-               {BE211CE1-3955-4674-A664-5038FC791980}.ReleaseXP|Win32.ActiveCfg = Release|x86
-               {BE211CE1-3955-4674-A664-5038FC791980}.ReleaseXP|x64.ActiveCfg = Release|x64
                {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.ActiveCfg = Release|x86
                {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.Build.0 = Release|x86
                {BE211CE1-3955-4674-A664-5038FC791980}.Test|Win32.ActiveCfg = Release|x86
@@ -427,13 +359,6 @@ Global
                {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|Mixed Platforms.Build.0 = Release|Win32
                {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|Win32.ActiveCfg = Release|Win32
                {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|x64.ActiveCfg = Release|x64
-               {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|x64.Build.0 = Release|x64
-               {EDD28611-EAD9-4EB5-A873-18160AC44434}.ReleaseXP|Mixed Platforms.ActiveCfg = Release|Win32
-               {EDD28611-EAD9-4EB5-A873-18160AC44434}.ReleaseXP|Mixed Platforms.Build.0 = Release|Win32
-               {EDD28611-EAD9-4EB5-A873-18160AC44434}.ReleaseXP|Win32.ActiveCfg = Release|Win32
-               {EDD28611-EAD9-4EB5-A873-18160AC44434}.ReleaseXP|Win32.Build.0 = Release|Win32
-               {EDD28611-EAD9-4EB5-A873-18160AC44434}.ReleaseXP|x64.ActiveCfg = Release|x64
-               {EDD28611-EAD9-4EB5-A873-18160AC44434}.ReleaseXP|x64.Build.0 = Release|x64
                {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|Mixed Platforms.ActiveCfg = Release|Win32
                {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|Mixed Platforms.Build.0 = Release|Win32
                {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|Win32.ActiveCfg = Test|Win32
@@ -453,13 +378,6 @@ Global
                {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|Mixed Platforms.Build.0 = Release|Win32
                {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|Win32.ActiveCfg = Release|Win32
                {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|x64.ActiveCfg = Release|x64
-               {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|x64.Build.0 = Release|x64
-               {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.ReleaseXP|Mixed Platforms.ActiveCfg = Release|Win32
-               {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.ReleaseXP|Mixed Platforms.Build.0 = Release|Win32
-               {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.ReleaseXP|Win32.ActiveCfg = Release|Win32
-               {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.ReleaseXP|Win32.Build.0 = Release|Win32
-               {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.ReleaseXP|x64.ActiveCfg = Release|x64
-               {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.ReleaseXP|x64.Build.0 = Release|x64
                {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|Mixed Platforms.ActiveCfg = Release|Win32
                {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|Mixed Platforms.Build.0 = Release|Win32
                {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|Win32.ActiveCfg = Release|Win32

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
index 43e8f8d7616948d9aeb5019581c63dcfe99bacf8..be21789a52a85635f3cf8a8f949eb5196183e9d9 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -477,7 +477,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -630,7 +630,7 @@
       <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -786,7 +786,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>