diff --git a/checkin_notes b/checkin_notes
index 83d1a1c4fd..f54c945c55 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9229,3 +9229,12 @@ David 17 July 2005
client/
cs_scheduler.C
+
+Rom 17 July 2005
+ - Windows project file cleanup
+ Add a library for libboinc and libboinc_api and remove duplicate
+ compilation from remain projects.
+
+ win_build/
+ *.vcproj
+ *.sln
diff --git a/win_build/boinc.sln b/win_build/boinc.sln
index 4900e3484b..433113c86e 100644
--- a/win_build/boinc.sln
+++ b/win_build/boinc.sln
@@ -1,12 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSAEuro", "RSAEuro.vcproj", "{264D5059-0A60-4B6E-8979-245BC31141FE}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc", "boinc_cli.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
ProjectSection(ProjectDependencies) = postProject
- {264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE}
- {21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
+ {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}
{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
EndProjectSection
EndProject
@@ -16,43 +11,47 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_dll", "boinc_dll.vcpr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_ss", "boinc_ss.vcproj", "{21E7357D-41D8-444C-A120-18064B497174}"
ProjectSection(ProjectDependencies) = postProject
+ {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upper_case", "upper_case.vcproj", "{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}"
ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_cmd", "boinc_guirpc_test.vcproj", "{DA997BD1-B575-465C-9851-EEBB727F506A}"
- ProjectSection(ProjectDependencies) = postProject
- {06113715-AC51-4E91-8B9D-C987CABE0920} = {06113715-AC51-4E91-8B9D-C987CABE0920}
- {21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
- {0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "BOINCGUI.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
- ProjectSection(ProjectDependencies) = postProject
- {06113715-AC51-4E91-8B9D-C987CABE0920} = {06113715-AC51-4E91-8B9D-C987CABE0920}
- {21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
- {0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
+ {0BC1DB36-030A-4321-B387-1CEE2611E329} = {0BC1DB36-030A-4321-B387-1CEE2611E329}
+ {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_gui", "boinc_gui.vcproj", "{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}"
ProjectSection(ProjectDependencies) = postProject
- {264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE}
{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboinc_api", "libboincapi.vcproj", "{0BC1DB36-030A-4321-B387-1CEE2611E329}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboinc", "libboinc.vcproj", "{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_cmd", "boinccmd.vcproj", "{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "boincmgr.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librsaeuro", "librsaeuro.vcproj", "{48A8C65D-334A-4F36-AB78-35F759205889}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {264D5059-0A60-4B6E-8979-245BC31141FE}.Debug.ActiveCfg = Debug|Win32
- {264D5059-0A60-4B6E-8979-245BC31141FE}.Debug.Build.0 = Debug|Win32
- {264D5059-0A60-4B6E-8979-245BC31141FE}.Release.ActiveCfg = Release|Win32
- {264D5059-0A60-4B6E-8979-245BC31141FE}.Release.Build.0 = Release|Win32
{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.ActiveCfg = Debug|Win32
{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.Build.0 = Debug|Win32
{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.ActiveCfg = Release|Win32
@@ -67,16 +66,28 @@ Global
{21E7357D-41D8-444C-A120-18064B497174}.Release.Build.0 = Release|Win32
{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Debug.ActiveCfg = Debug|Win32
{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Release.ActiveCfg = Release|Win32
- {DA997BD1-B575-465C-9851-EEBB727F506A}.Debug.ActiveCfg = Debug|Win32
- {DA997BD1-B575-465C-9851-EEBB727F506A}.Debug.Build.0 = Debug|Win32
- {DA997BD1-B575-465C-9851-EEBB727F506A}.Release.ActiveCfg = Release|Win32
- {DA997BD1-B575-465C-9851-EEBB727F506A}.Release.Build.0 = Release|Win32
+ {78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Debug.ActiveCfg = Debug|Win32
+ {78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Release.ActiveCfg = Release|Win32
+ {0BC1DB36-030A-4321-B387-1CEE2611E329}.Debug.ActiveCfg = Debug|Win32
+ {0BC1DB36-030A-4321-B387-1CEE2611E329}.Debug.Build.0 = Debug|Win32
+ {0BC1DB36-030A-4321-B387-1CEE2611E329}.Release.ActiveCfg = Release|Win32
+ {0BC1DB36-030A-4321-B387-1CEE2611E329}.Release.Build.0 = Release|Win32
+ {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug.ActiveCfg = Debug|Win32
+ {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug.Build.0 = Debug|Win32
+ {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release.ActiveCfg = Release|Win32
+ {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release.Build.0 = Release|Win32
+ {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug.ActiveCfg = Debug|Win32
+ {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug.Build.0 = Debug|Win32
+ {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release.ActiveCfg = Release|Win32
+ {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release.Build.0 = Release|Win32
{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.ActiveCfg = Debug|Win32
{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.Build.0 = Debug|Win32
{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.ActiveCfg = Release|Win32
{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.Build.0 = Release|Win32
- {78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Debug.ActiveCfg = Debug|Win32
- {78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Release.ActiveCfg = Release|Win32
+ {48A8C65D-334A-4F36-AB78-35F759205889}.Debug.ActiveCfg = Debug|Win32
+ {48A8C65D-334A-4F36-AB78-35F759205889}.Debug.Build.0 = Debug|Win32
+ {48A8C65D-334A-4F36-AB78-35F759205889}.Release.ActiveCfg = Release|Win32
+ {48A8C65D-334A-4F36-AB78-35F759205889}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/win_build/boinc_cli.vcproj b/win_build/boinc_cli.vcproj
index beb2fbebed..84b367d98c 100644
--- a/win_build/boinc_cli.vcproj
+++ b/win_build/boinc_cli.vcproj
@@ -98,7 +98,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../lib/,../api/,../RSAEuro/source/,../client/win/,../client,.."
- PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_MT;_WINDOWS;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
StringPooling="FALSE"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -197,29 +197,6 @@
-
-
-
-
-
-
-
-
@@ -517,9 +494,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -713,58 +661,6 @@
CompileAs="2"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -814,32 +710,6 @@
CompileAs="2"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1006,9 +821,6 @@
-
-
@@ -1030,9 +842,6 @@
-
-
@@ -1042,15 +851,9 @@
-
-
-
-
@@ -1069,18 +872,6 @@
-
-
-
-
-
-
-
-
@@ -1090,45 +881,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/win_build/boinc_ss.vcproj b/win_build/boinc_ss.vcproj
index f3fdeaa96e..3125a67547 100644
--- a/win_build/boinc_ss.vcproj
+++ b/win_build/boinc_ss.vcproj
@@ -22,9 +22,9 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../,../api/,../lib,../client/"
- PreprocessorDefinitions="WIN32;_DEBUG;_MT;_WINDOWS;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="boinc_win.h"
@@ -42,7 +42,7 @@
Name="VCCustomBuildTool"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/win_build/boinc_guirpc_test.vcproj b/win_build/boinccmd.vcproj
similarity index 69%
rename from win_build/boinc_guirpc_test.vcproj
rename to win_build/boinccmd.vcproj
index 2f07d6d64d..8dee848f12 100644
--- a/win_build/boinc_guirpc_test.vcproj
+++ b/win_build/boinccmd.vcproj
@@ -3,6 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="boinc_cmd"
+ ProjectGUID="{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}"
RootNamespace="boinc_guirpctest"
SccProjectName=""
SccLocalPath="">
@@ -23,9 +24,9 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../lib/,../api/,../RSAEuro/source/,../client/win/,../client;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_MT;_WINDOWS;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="FALSE"
UsePrecompiledHeader="2"
@@ -44,9 +45,9 @@
Name="VCCustomBuildTool"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -204,20 +198,6 @@
Name="Release|Win32">
-
-
-
@@ -273,12 +253,6 @@
Name="VCCLCompilerTool"
CompileAs="2"/>
-
-
-
@@ -286,20 +260,6 @@
Name="Release|Win32">
-
-
-
@@ -309,20 +269,6 @@
Name="Release|Win32">
-
-
-
@@ -334,12 +280,6 @@
Name="VCCLCompilerTool"
CompileAs="2"/>
-
-
-
@@ -347,20 +287,6 @@
Name="Release|Win32">
-
-
-
@@ -372,12 +298,6 @@
Name="VCCLCompilerTool"
CompileAs="2"/>
-
-
-
@@ -406,20 +326,6 @@
Name="Release|Win32">
-
-
-
diff --git a/win_build/libboinc.vcproj b/win_build/libboinc.vcproj
new file mode 100644
index 0000000000..b3ca8cddf0
--- /dev/null
+++ b/win_build/libboinc.vcproj
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win_build/libboincapi.vcproj b/win_build/libboincapi.vcproj
new file mode 100644
index 0000000000..a815f4ec15
--- /dev/null
+++ b/win_build/libboincapi.vcproj
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win_build/RSAEuro.vcproj b/win_build/librsaeuro.vcproj
similarity index 98%
rename from win_build/RSAEuro.vcproj
rename to win_build/librsaeuro.vcproj
index 872675d073..5f9cd1e93f 100644
--- a/win_build/RSAEuro.vcproj
+++ b/win_build/librsaeuro.vcproj
@@ -2,7 +2,8 @@
@@ -38,7 +39,7 @@
Name="VCCustomBuildTool"/>
@@ -94,7 +95,7 @@
Name="VCCustomBuildTool"/>
diff --git a/win_build/upper_case.vcproj b/win_build/upper_case.vcproj
index 9a93777254..ae82dfc69f 100644
--- a/win_build/upper_case.vcproj
+++ b/win_build/upper_case.vcproj
@@ -15,7 +15,7 @@
OutputDirectory=".\Build\Release"
IntermediateDirectory=".\Build\Release\upper_case\obj"
ConfigurationType="1"
- UseOfMFC="2"
+ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -427,7 +190,7 @@
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">