From d4c1e932a4fbf9cd0b2dfa4ec2995be0a5106c73 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 28 Nov 2012 21:00:05 -0800 Subject: [PATCH] - fix mysterious problems in Windows build --- checkin_notes | 7 +++ win_build/boinc.sln | 114 +++++++++++++++++++-------------------- win_build/wrapper.vcproj | 4 +- 3 files changed, 66 insertions(+), 59 deletions(-) diff --git a/checkin_notes b/checkin_notes index 6b737e3d8e..3564b88bcc 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7131,3 +7131,10 @@ David 28 Nov 2012 html/user/ submit.php + +David 28 Nov 2012 + - fix mysterious problems in Windows build + + win_build/ + boinc.sln + wrapper.vcproj diff --git a/win_build/boinc.sln b/win_build/boinc.sln index f973ef4602..3e8cf15752 100644 --- a/win_build/boinc.sln +++ b/win_build/boinc.sln @@ -301,8 +301,8 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.ActiveCfg = Release|Win32 - {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.Build.0 = Release|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.ActiveCfg = Debug|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.Build.0 = Debug|Win32 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|x64.ActiveCfg = Debug|x64 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|x64.Build.0 = Debug|x64 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -317,8 +317,8 @@ Global {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|Win32.Build.0 = Release|Win32 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|x64.ActiveCfg = Release|x64 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|x64.Build.0 = Release|x64 - {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Release|Win32 - {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Release|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Debug|Win32 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|x64.ActiveCfg = Debug|x64 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|x64.Build.0 = Debug|x64 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -333,8 +333,8 @@ Global {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|Win32.Build.0 = Release|Win32 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|x64.ActiveCfg = Release|x64 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|x64.Build.0 = Release|x64 - {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.ActiveCfg = Release|Win32 - {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.Build.0 = Release|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.Build.0 = Debug|Win32 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|x64.ActiveCfg = Debug|x64 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|x64.Build.0 = Debug|x64 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -349,8 +349,8 @@ Global {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|Win32.Build.0 = Release|Win32 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|x64.ActiveCfg = Release|x64 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|x64.Build.0 = Release|x64 - {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.ActiveCfg = Release|Win32 - {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.Build.0 = Release|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.ActiveCfg = Debug|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.Build.0 = Debug|Win32 {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|x64.ActiveCfg = Debug|x64 {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|x64.Build.0 = Debug|x64 {06113715-AC51-4E91-8B9D-C987CABE0920}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -365,8 +365,8 @@ Global {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|Win32.Build.0 = Release|Win32 {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|x64.ActiveCfg = Release|x64 {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|x64.Build.0 = Release|x64 - {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.ActiveCfg = Release|Win32 - {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.Build.0 = Release|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.ActiveCfg = Debug|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.Build.0 = Debug|Win32 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|x64.ActiveCfg = Debug|x64 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|x64.Build.0 = Debug|x64 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -381,7 +381,7 @@ Global {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|Win32.Build.0 = Release|Win32 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.ActiveCfg = Release|x64 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.Build.0 = Release|x64 - {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|Win32.ActiveCfg = Release|Win32 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|Win32.ActiveCfg = Debug|Win32 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|x64.ActiveCfg = Debug|x64 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuDebug|Win32.ActiveCfg = Release|Win32 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuDebug|Win32.Build.0 = Debug|Win32 @@ -393,8 +393,8 @@ Global {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.EmuRelease|x64.Build.0 = Release|x64 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|Win32.ActiveCfg = Release|Win32 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|x64.ActiveCfg = Release|x64 - {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Release|Win32 - {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Release|Win32 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Debug|Win32 {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|x64.ActiveCfg = Debug|x64 {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|x64.Build.0 = Debug|x64 {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -409,8 +409,8 @@ Global {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Release|Win32.Build.0 = Release|Win32 {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Release|x64.ActiveCfg = Release|x64 {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Release|x64.Build.0 = Release|x64 - {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Debug|Win32.ActiveCfg = Release|Win32 - {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Debug|Win32.Build.0 = Release|Win32 + {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Debug|Win32.Build.0 = Debug|Win32 {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Debug|x64.ActiveCfg = Debug|x64 {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Debug|x64.Build.0 = Debug|x64 {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -425,8 +425,8 @@ Global {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Release|Win32.Build.0 = Release|Win32 {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Release|x64.ActiveCfg = Release|x64 {D3D21F11-A7E7-4EA2-8518-E24695133BFF}.Release|x64.Build.0 = Release|x64 - {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Debug|Win32.ActiveCfg = Release|Win32 - {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Debug|Win32.Build.0 = Release|Win32 + {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Debug|Win32.ActiveCfg = Debug|Win32 + {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Debug|Win32.Build.0 = Debug|Win32 {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Debug|x64.ActiveCfg = Debug|x64 {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Debug|x64.Build.0 = Debug|x64 {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -441,8 +441,8 @@ Global {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Release|Win32.Build.0 = Release|Win32 {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Release|x64.ActiveCfg = Release|x64 {5F065EAC-B881-4E9A-9E34-7A21D7A01D98}.Release|x64.Build.0 = Release|x64 - {C4165626-F68F-4F66-A126-3B82DDBB7480}.Debug|Win32.ActiveCfg = Release|Win32 - {C4165626-F68F-4F66-A126-3B82DDBB7480}.Debug|Win32.Build.0 = Release|Win32 + {C4165626-F68F-4F66-A126-3B82DDBB7480}.Debug|Win32.ActiveCfg = Debug|Win32 + {C4165626-F68F-4F66-A126-3B82DDBB7480}.Debug|Win32.Build.0 = Debug|Win32 {C4165626-F68F-4F66-A126-3B82DDBB7480}.Debug|x64.ActiveCfg = Debug|x64 {C4165626-F68F-4F66-A126-3B82DDBB7480}.Debug|x64.Build.0 = Debug|x64 {C4165626-F68F-4F66-A126-3B82DDBB7480}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -457,8 +457,8 @@ Global {C4165626-F68F-4F66-A126-3B82DDBB7480}.Release|Win32.Build.0 = Release|Win32 {C4165626-F68F-4F66-A126-3B82DDBB7480}.Release|x64.ActiveCfg = Release|x64 {C4165626-F68F-4F66-A126-3B82DDBB7480}.Release|x64.Build.0 = Release|x64 - {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Debug|Win32.ActiveCfg = Release|Win32 - {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Debug|Win32.Build.0 = Release|Win32 + {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Debug|Win32.Build.0 = Debug|Win32 {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Debug|x64.ActiveCfg = Debug|x64 {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Debug|x64.Build.0 = Debug|x64 {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -473,8 +473,8 @@ Global {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Release|Win32.Build.0 = Release|Win32 {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Release|x64.ActiveCfg = Release|x64 {F243B93C-73CB-44E7-9BDC-847BB95A27CA}.Release|x64.Build.0 = Release|x64 - {A9647CEA-644D-4C0A-8733-D916CD344859}.Debug|Win32.ActiveCfg = Release|Win32 - {A9647CEA-644D-4C0A-8733-D916CD344859}.Debug|Win32.Build.0 = Release|Win32 + {A9647CEA-644D-4C0A-8733-D916CD344859}.Debug|Win32.ActiveCfg = Debug|Win32 + {A9647CEA-644D-4C0A-8733-D916CD344859}.Debug|Win32.Build.0 = Debug|Win32 {A9647CEA-644D-4C0A-8733-D916CD344859}.Debug|x64.ActiveCfg = Debug|x64 {A9647CEA-644D-4C0A-8733-D916CD344859}.Debug|x64.Build.0 = Debug|x64 {A9647CEA-644D-4C0A-8733-D916CD344859}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -489,8 +489,8 @@ Global {A9647CEA-644D-4C0A-8733-D916CD344859}.Release|Win32.Build.0 = Release|Win32 {A9647CEA-644D-4C0A-8733-D916CD344859}.Release|x64.ActiveCfg = Release|x64 {A9647CEA-644D-4C0A-8733-D916CD344859}.Release|x64.Build.0 = Release|x64 - {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Debug|Win32.ActiveCfg = Release|Win32 - {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Debug|Win32.Build.0 = Release|Win32 + {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Debug|Win32.ActiveCfg = Debug|Win32 + {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Debug|Win32.Build.0 = Debug|Win32 {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Debug|x64.ActiveCfg = Debug|x64 {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Debug|x64.Build.0 = Debug|x64 {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -505,8 +505,8 @@ Global {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Release|Win32.Build.0 = Release|Win32 {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Release|x64.ActiveCfg = Release|x64 {F1BE6109-586D-448E-8C5B-D5C2CB874EA2}.Release|x64.Build.0 = Release|x64 - {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Debug|Win32.ActiveCfg = Release|Win32 - {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Debug|Win32.Build.0 = Release|Win32 + {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Debug|Win32.ActiveCfg = Debug|Win32 + {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Debug|Win32.Build.0 = Debug|Win32 {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Debug|x64.ActiveCfg = Debug|x64 {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Debug|x64.Build.0 = Debug|x64 {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -521,8 +521,8 @@ Global {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Release|Win32.Build.0 = Release|Win32 {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Release|x64.ActiveCfg = Release|x64 {CCB9A37C-7AD8-4FC1-ABEC-1A6ED2268F83}.Release|x64.Build.0 = Release|x64 - {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Debug|Win32.ActiveCfg = Release|Win32 - {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Debug|Win32.Build.0 = Release|Win32 + {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Debug|Win32.ActiveCfg = Debug|Win32 + {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Debug|Win32.Build.0 = Debug|Win32 {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Debug|x64.ActiveCfg = Debug|x64 {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Debug|x64.Build.0 = Debug|x64 {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -537,8 +537,8 @@ Global {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Release|Win32.Build.0 = Release|Win32 {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Release|x64.ActiveCfg = Release|x64 {3CF31288-A44D-4C78-A3AA-B05B6E32DF11}.Release|x64.Build.0 = Release|x64 - {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Debug|Win32.ActiveCfg = Release|Win32 - {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Debug|Win32.Build.0 = Release|Win32 + {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Debug|Win32.ActiveCfg = Debug|Win32 + {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Debug|Win32.Build.0 = Debug|Win32 {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Debug|x64.ActiveCfg = Debug|x64 {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Debug|x64.Build.0 = Debug|x64 {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -553,8 +553,8 @@ Global {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Release|Win32.Build.0 = Release|Win32 {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Release|x64.ActiveCfg = Release|x64 {814EBFD3-3CE6-4933-A580-C1FE3147ACB4}.Release|x64.Build.0 = Release|x64 - {B00664BD-71EB-46C1-957E-CD851418D395}.Debug|Win32.ActiveCfg = Release|Win32 - {B00664BD-71EB-46C1-957E-CD851418D395}.Debug|Win32.Build.0 = Release|Win32 + {B00664BD-71EB-46C1-957E-CD851418D395}.Debug|Win32.ActiveCfg = Debug|Win32 + {B00664BD-71EB-46C1-957E-CD851418D395}.Debug|Win32.Build.0 = Debug|Win32 {B00664BD-71EB-46C1-957E-CD851418D395}.Debug|x64.ActiveCfg = Debug|x64 {B00664BD-71EB-46C1-957E-CD851418D395}.Debug|x64.Build.0 = Debug|x64 {B00664BD-71EB-46C1-957E-CD851418D395}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -569,8 +569,8 @@ Global {B00664BD-71EB-46C1-957E-CD851418D395}.Release|Win32.Build.0 = Release|Win32 {B00664BD-71EB-46C1-957E-CD851418D395}.Release|x64.ActiveCfg = Release|x64 {B00664BD-71EB-46C1-957E-CD851418D395}.Release|x64.Build.0 = Release|x64 - {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Debug|Win32.ActiveCfg = Release|Win32 - {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Debug|Win32.Build.0 = Release|Win32 + {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Debug|Win32.Build.0 = Debug|Win32 {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Debug|x64.ActiveCfg = Debug|x64 {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Debug|x64.Build.0 = Debug|x64 {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -585,8 +585,8 @@ Global {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Release|Win32.Build.0 = Release|Win32 {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Release|x64.ActiveCfg = Release|x64 {07BDA8F7-4AAF-4A3B-B96E-EA72A143C5AE}.Release|x64.Build.0 = Release|x64 - {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|Win32.ActiveCfg = Release|Win32 - {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|Win32.Build.0 = Release|Win32 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|Win32.ActiveCfg = Debug|Win32 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|Win32.Build.0 = Debug|Win32 {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|x64.ActiveCfg = Debug|x64 {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|x64.Build.0 = Debug|x64 {9FC47E90-4E0D-4383-B446-A84314B00764}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -601,8 +601,8 @@ Global {9FC47E90-4E0D-4383-B446-A84314B00764}.Release|Win32.Build.0 = Release|Win32 {9FC47E90-4E0D-4383-B446-A84314B00764}.Release|x64.ActiveCfg = Release|x64 {9FC47E90-4E0D-4383-B446-A84314B00764}.Release|x64.Build.0 = Release|x64 - {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Debug|Win32.ActiveCfg = Release|Win32 - {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Debug|Win32.Build.0 = Release|Win32 + {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Debug|Win32.Build.0 = Debug|Win32 {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Debug|x64.ActiveCfg = Debug|x64 {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Debug|x64.Build.0 = Debug|x64 {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -617,8 +617,8 @@ Global {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Release|Win32.Build.0 = Release|Win32 {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Release|x64.ActiveCfg = Release|x64 {C3163ACA-C2E6-49D2-AA21-B8B953331EF7}.Release|x64.Build.0 = Release|x64 - {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Debug|Win32.ActiveCfg = Release|Win32 - {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Debug|Win32.Build.0 = Release|Win32 + {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Debug|Win32.ActiveCfg = Debug|Win32 + {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Debug|Win32.Build.0 = Debug|Win32 {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Debug|x64.ActiveCfg = Debug|x64 {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Debug|x64.Build.0 = Debug|x64 {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -633,7 +633,7 @@ Global {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Release|Win32.Build.0 = Release|Win32 {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Release|x64.ActiveCfg = Release|x64 {3A8DFC5C-D169-4BB6-8282-EBD3D1318140}.Release|x64.Build.0 = Release|x64 - {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.Debug|Win32.ActiveCfg = Release|Win32 + {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.Debug|Win32.ActiveCfg = Debug|Win32 {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.Debug|x64.ActiveCfg = Debug|x64 {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.EmuDebug|Win32.ActiveCfg = Release|Win32 {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.EmuDebug|Win32.Build.0 = Debug|Win32 @@ -645,7 +645,7 @@ Global {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.EmuRelease|x64.Build.0 = Release|x64 {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.Release|Win32.ActiveCfg = Release|Win32 {C41F5C14-772D-4B56-BAF3-0FE8BF6807D5}.Release|x64.ActiveCfg = Release|x64 - {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.Debug|Win32.ActiveCfg = Release|Win32 + {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.Debug|Win32.ActiveCfg = Debug|Win32 {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.Debug|x64.ActiveCfg = Debug|x64 {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.EmuDebug|Win32.ActiveCfg = Release|Win32 {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.EmuDebug|Win32.Build.0 = EmuDebug|Win32 @@ -657,7 +657,7 @@ Global {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.EmuRelease|x64.Build.0 = EmuRelease|x64 {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.Release|Win32.ActiveCfg = Release|Win32 {55F71337-32A6-4C26-8CBA-A06A9183D6F2}.Release|x64.ActiveCfg = Release|x64 - {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.Debug|Win32.ActiveCfg = Release|Win32 + {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.Debug|Win32.ActiveCfg = Debug|Win32 {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.Debug|x64.ActiveCfg = Debug|x64 {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.EmuDebug|Win32.ActiveCfg = Release|Win32 {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.EmuDebug|Win32.Build.0 = Debug|Win32 @@ -669,8 +669,8 @@ Global {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.EmuRelease|x64.Build.0 = Release|x64 {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.Release|Win32.ActiveCfg = Release|Win32 {BDC69EE0-033E-4AE1-B6AD-670E26FC117B}.Release|x64.ActiveCfg = Release|x64 - {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Debug|Win32.ActiveCfg = Release|Win32 - {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Debug|Win32.Build.0 = Release|Win32 + {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Debug|Win32.Build.0 = Debug|Win32 {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Debug|x64.ActiveCfg = Debug|x64 {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Debug|x64.Build.0 = Debug|x64 {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -685,8 +685,8 @@ Global {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Release|Win32.Build.0 = Release|Win32 {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Release|x64.ActiveCfg = Release|x64 {BFE833C6-840F-4F2E-A1FA-A4DE9B9277D6}.Release|x64.Build.0 = Release|x64 - {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Debug|Win32.ActiveCfg = Release|Win32 - {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Debug|Win32.Build.0 = Release|Win32 + {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Debug|Win32.Build.0 = Debug|Win32 {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Debug|x64.ActiveCfg = Debug|x64 {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Debug|x64.Build.0 = Debug|x64 {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -701,7 +701,7 @@ Global {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Release|Win32.Build.0 = Release|Win32 {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Release|x64.ActiveCfg = Release|x64 {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Release|x64.Build.0 = Release|x64 - {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.Debug|Win32.ActiveCfg = Release|Win32 + {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.Debug|Win32.ActiveCfg = Debug|Win32 {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.Debug|x64.ActiveCfg = Debug|x64 {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.EmuDebug|Win32.ActiveCfg = Release|Win32 {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.EmuDebug|Win32.Build.0 = Debug|Win32 @@ -713,8 +713,8 @@ Global {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.EmuRelease|x64.Build.0 = Release|x64 {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.Release|Win32.ActiveCfg = Release|Win32 {D9AF7F68-B881-45B1-A41C-B10E61D764EF}.Release|x64.ActiveCfg = Release|x64 - {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Debug|Win32.ActiveCfg = Release|Win32 - {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Debug|Win32.Build.0 = Release|Win32 + {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Debug|Win32.ActiveCfg = Debug|Win32 + {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Debug|Win32.Build.0 = Debug|Win32 {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Debug|x64.ActiveCfg = Debug|x64 {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Debug|x64.Build.0 = Debug|x64 {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -729,8 +729,8 @@ Global {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Release|Win32.Build.0 = Release|Win32 {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Release|x64.ActiveCfg = Release|x64 {A4145505-5C0E-4675-BF6D-FC3F9119FD83}.Release|x64.Build.0 = Release|x64 - {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Debug|Win32.ActiveCfg = Release|Win32 - {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Debug|Win32.Build.0 = Release|Win32 + {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Debug|Win32.ActiveCfg = Debug|Win32 + {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Debug|Win32.Build.0 = Debug|Win32 {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Debug|x64.ActiveCfg = Debug|x64 {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Debug|x64.Build.0 = Debug|x64 {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -745,8 +745,8 @@ Global {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Release|Win32.Build.0 = Release|Win32 {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Release|x64.ActiveCfg = Release|x64 {C0A2DEEE-2EC5-4F67-8048-53264B6BD14D}.Release|x64.Build.0 = Release|x64 - {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Debug|Win32.ActiveCfg = Release|Win32 - {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Debug|Win32.Build.0 = Release|Win32 + {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Debug|Win32.ActiveCfg = Debug|Win32 + {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Debug|Win32.Build.0 = Debug|Win32 {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Debug|x64.ActiveCfg = Debug|x64 {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Debug|x64.Build.0 = Debug|x64 {753E897D-9ECE-42B1-9F0D-CD566775C77E}.EmuDebug|Win32.ActiveCfg = Release|Win32 @@ -759,7 +759,7 @@ Global {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Release|Win32.Build.0 = Release|Win32 {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Release|x64.ActiveCfg = Release|x64 {753E897D-9ECE-42B1-9F0D-CD566775C77E}.Release|x64.Build.0 = Release|x64 - {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Debug|Win32.ActiveCfg = Release|Win32 + {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Debug|Win32.ActiveCfg = Debug|Win32 {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Debug|x64.ActiveCfg = Debug|x64 {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuDebug|Win32.ActiveCfg = Release|Win32 {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuDebug|x64.ActiveCfg = Debug|x64 @@ -767,7 +767,7 @@ Global {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.EmuRelease|x64.ActiveCfg = Release|x64 {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Release|Win32.ActiveCfg = Release|Win32 {92253F20-4CD6-494E-8DEF-F5B4555B61CD}.Release|x64.ActiveCfg = Release|x64 - {0DCD2FE4-0604-4307-ABAA-C61F0065D717}.Debug|Win32.ActiveCfg = Release|Win32 + {0DCD2FE4-0604-4307-ABAA-C61F0065D717}.Debug|Win32.ActiveCfg = Debug|Win32 {0DCD2FE4-0604-4307-ABAA-C61F0065D717}.Debug|x64.ActiveCfg = Debug|x64 {0DCD2FE4-0604-4307-ABAA-C61F0065D717}.EmuDebug|Win32.ActiveCfg = Release|Win32 {0DCD2FE4-0604-4307-ABAA-C61F0065D717}.EmuDebug|x64.ActiveCfg = Debug|x64 diff --git a/win_build/wrapper.vcproj b/win_build/wrapper.vcproj index e7bc638ce2..0fa02e20f5 100644 --- a/win_build/wrapper.vcproj +++ b/win_build/wrapper.vcproj @@ -251,7 +251,7 @@