From 8a3bde0d4b58433af18ffc0006db58d9b855beee Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 16 Jun 2004 23:29:48 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3619 --- apps/upper_case.C | 2 +- checkin_notes | 10 ++++++++++ client/dhrystone.C | 2 +- client/stdafx.cpp | 28 ---------------------------- client/whetstone.C | 2 +- client/win/hostinfo_win.cpp | 3 ++- client/win/win_screensaver.cpp | 12 ++++++++++++ client/win/win_screensaver.h | 14 -------------- client/win/wingui_listctrl.cpp | 1 + client/win/wingui_proxydlg.cpp | 1 + lib/base64.C | 2 +- lib/language.C | 2 +- lib/msg_log.C | 2 +- lib/stackwalker_win.cpp | 2 +- lib/util.C | 2 +- win_build/RSAEuro.vcproj | 3 ++- win_build/boinc_cli.vcproj | 4 ++-- win_build/boinc_dll.vcproj | 4 ++-- win_build/boinc_gui.vcproj | 12 ++++++------ win_build/boinc_guirpc_test.vcproj | 4 ++-- win_build/boinc_ss.vcproj | 4 ++-- win_build/upper_case.vcproj | 3 ++- 22 files changed, 52 insertions(+), 67 deletions(-) delete mode 100644 client/stdafx.cpp diff --git a/apps/upper_case.C b/apps/upper_case.C index 876785ad47..46c88895de 100755 --- a/apps/upper_case.C +++ b/apps/upper_case.C @@ -26,7 +26,7 @@ // #ifdef _WIN32 -#include "stdafx.h" +#include "boinc_win.h" #endif #ifndef _WIN32 diff --git a/checkin_notes b/checkin_notes index 01537828c7..470e471ca0 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13748,3 +13748,13 @@ David 16 June 2004 *.C lib/ *.C + +Rom 16 June 2004 + - Additional include changes from stdafx.h to boinc_win.h + + api/ + *.C + client/ + *.C + lib/ + *.C diff --git a/client/dhrystone.C b/client/dhrystone.C index 1fcdda07be..bff2bdcc28 100644 --- a/client/dhrystone.C +++ b/client/dhrystone.C @@ -37,7 +37,7 @@ // e.g.: no global variables, since we run this multithreaded #ifdef _WIN32 -#include "stdafx.h" +#include "boinc_win.h" #endif #include diff --git a/client/stdafx.cpp b/client/stdafx.cpp deleted file mode 100644 index 9462d2c369..0000000000 --- a/client/stdafx.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// The contents of this file are subject to the BOINC Public License -// Version 1.0 (the "License"); you may not use this file except in -// compliance with the License. You may obtain a copy of the License at -// http://boinc.berkeley.edu/license_1.0.txt -// -// Software distributed under the License is distributed on an "AS IS" -// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -// License for the specific language governing rights and limitations -// under the License. -// -// The Original Code is the Berkeley Open Infrastructure for Network Computing. -// -// The Initial Developer of the Original Code is the SETI@home project. -// Portions created by the SETI@home project are Copyright (C) 2002 -// University of California at Berkeley. All Rights Reserved. -// -// Contributor(s): -// - -// stdafx.cpp : source file that includes just the standard includes -// Test.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#ifdef _WIN32 -#include "boinc_win.h" -#endif - - diff --git a/client/whetstone.C b/client/whetstone.C index 1b36034de4..0c7567cd49 100644 --- a/client/whetstone.C +++ b/client/whetstone.C @@ -20,7 +20,7 @@ // Modified a little to work with BOINC #ifdef _WIN32 -#include "stdafx.h" +#include "boinc_win.h" #endif #ifndef _WIN32 diff --git a/client/win/hostinfo_win.cpp b/client/win/hostinfo_win.cpp index ddd3991d7d..236aa5c849 100755 --- a/client/win/hostinfo_win.cpp +++ b/client/win/hostinfo_win.cpp @@ -17,7 +17,8 @@ // Contributor(s): // -#include "stdafx.h" +#include "boinc_win.h" + #include "client_types.h" #include "filesys.h" #include "util.h" diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp index 0fdef4a2ca..bcbfae864d 100755 --- a/client/win/win_screensaver.cpp +++ b/client/win/win_screensaver.cpp @@ -19,6 +19,18 @@ // Microsoft Knowledge Base Article - 79212 // +#include "boinc_win.h" + +#include +#include +#include +#include +#define COMPILE_MULTIMON_STUBS +#include +#include + +#include "boinc_ss.h" +#include "win_util.h" #include "win_screensaver.h" //----------------------------------------------------------------------------- diff --git a/client/win/win_screensaver.h b/client/win/win_screensaver.h index f55cf45a45..6ea5904a7c 100644 --- a/client/win/win_screensaver.h +++ b/client/win/win_screensaver.h @@ -22,20 +22,6 @@ #ifndef _BOINC_H #define _BOINC_H -#include "stdafx.h" - -#include -#include -#include -#include -#define COMPILE_MULTIMON_STUBS -#include -#include - -#include "boinc_ss.h" -#include "win_util.h" - - //----------------------------------------------------------------------------- // Error codes //----------------------------------------------------------------------------- diff --git a/client/win/wingui_listctrl.cpp b/client/win/wingui_listctrl.cpp index c95167f696..4df4155c93 100755 --- a/client/win/wingui_listctrl.cpp +++ b/client/win/wingui_listctrl.cpp @@ -18,6 +18,7 @@ // #include "boinc_win.h" + #include "wingui_listctrl.h" ///////////////////////////////////////////////////////////////////////// diff --git a/client/win/wingui_proxydlg.cpp b/client/win/wingui_proxydlg.cpp index 6f4d6302fa..ac24215f3b 100644 --- a/client/win/wingui_proxydlg.cpp +++ b/client/win/wingui_proxydlg.cpp @@ -18,6 +18,7 @@ // #include "boinc_win.h" + #include "boinc_gui.h" #include "wingui_proxydlg.h" #include "wingui.h" diff --git a/lib/base64.C b/lib/base64.C index d4cdf17726..5db4bfc201 100644 --- a/lib/base64.C +++ b/lib/base64.C @@ -18,7 +18,7 @@ // #ifdef _WIN32 -#include "stdafx.h" +#include "boinc_win.h" #endif #include "base64.h" diff --git a/lib/language.C b/lib/language.C index be258b3f6a..71dbac4e60 100755 --- a/lib/language.C +++ b/lib/language.C @@ -18,7 +18,7 @@ // #ifdef _WIN32 -#include "stdafx.h" +#include "boinc_win.h" #endif #ifndef _WIN32 diff --git a/lib/msg_log.C b/lib/msg_log.C index fb6559a991..6de40efc4d 100644 --- a/lib/msg_log.C +++ b/lib/msg_log.C @@ -18,7 +18,7 @@ // #ifdef _WIN32 -#include "stdafx.h" +#include "boinc_win.h" #endif #ifndef _WIN32 diff --git a/lib/stackwalker_win.cpp b/lib/stackwalker_win.cpp index 9562c1e6f3..991ba54137 100644 --- a/lib/stackwalker_win.cpp +++ b/lib/stackwalker_win.cpp @@ -39,7 +39,7 @@ *////////////////////////////////////////////////////////////////////////////// #ifdef _WIN32 -#include "stdafx.h" +#include "boinc_win.h" #endif // the form of the output file diff --git a/lib/util.C b/lib/util.C index 32e56dbb1d..390b48719a 100755 --- a/lib/util.C +++ b/lib/util.C @@ -18,8 +18,8 @@ // #ifdef _WIN32 -#define M_LN2 0.693147180559945309417 #include "boinc_win.h" +#define M_LN2 0.693147180559945309417 #endif #ifndef _WIN32 diff --git a/win_build/RSAEuro.vcproj b/win_build/RSAEuro.vcproj index 1fe85f36a2..e92cdd21a4 100644 --- a/win_build/RSAEuro.vcproj +++ b/win_build/RSAEuro.vcproj @@ -81,7 +81,8 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Build\Release\RSAEuro\obj/RSAEuro.pch" + PrecompiledHeaderThrough="../lib/boinc_win.h" + PrecompiledHeaderFile=".\Build\Release\RSAEuro\obj/boinc_win.pch" AssemblerListingLocation=".\Build\Release\RSAEuro\obj/" ObjectFile=".\Build\Release\RSAEuro\obj/" ProgramDataBaseFileName=".\Build\Release\RSAEuro\obj/" diff --git a/win_build/boinc_cli.vcproj b/win_build/boinc_cli.vcproj index d650198434..5911a13b0c 100644 --- a/win_build/boinc_cli.vcproj +++ b/win_build/boinc_cli.vcproj @@ -101,8 +101,8 @@ RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="../client/StdAfx.h" - PrecompiledHeaderFile=".\Build\Release\boinc_cli\obj/boinc_cli.pch" + PrecompiledHeaderThrough="../lib/boinc_win.h" + PrecompiledHeaderFile=".\Build\Release\boinc_cli\obj/boinc_win.pch" AssemblerListingLocation=".\Build\Release\boinc_cli\obj/" ObjectFile=".\Build\Release\boinc_cli\obj/" ProgramDataBaseFileName=".\Build\Release\boinc_cli\obj/" diff --git a/win_build/boinc_dll.vcproj b/win_build/boinc_dll.vcproj index 933d557d2f..28207c6cb0 100644 --- a/win_build/boinc_dll.vcproj +++ b/win_build/boinc_dll.vcproj @@ -101,8 +101,8 @@ RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="..\client\StdAfx.h" - PrecompiledHeaderFile=".\Build\Release\boinc_dll\obj/boinc_dll.pch" + PrecompiledHeaderThrough="..\lib\boinc_win.h" + PrecompiledHeaderFile=".\Build\Release\boinc_dll\obj/boinc_win.pch" AssemblerListingLocation=".\Build\Release\boinc_dll\obj/" ObjectFile=".\Build\Release\boinc_dll\obj/" ProgramDataBaseFileName=".\Build\Release\boinc_dll\obj/" diff --git a/win_build/boinc_gui.vcproj b/win_build/boinc_gui.vcproj index 6bcd80e9f4..2e0aca2af6 100644 --- a/win_build/boinc_gui.vcproj +++ b/win_build/boinc_gui.vcproj @@ -30,8 +30,8 @@ RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="../client/StdAfx.h" - PrecompiledHeaderFile=".\Build\Release\boinc_gui\obj/boinc_gui.pch" + PrecompiledHeaderThrough="../lib/boinc_win.h" + PrecompiledHeaderFile=".\Build\Release\boinc_gui\obj/boinc_win.pch" AssemblerListingLocation=".\Build\Release\boinc_gui\obj/" ObjectFile=".\Build\Release\boinc_gui\obj/" ProgramDataBaseFileName=".\Build\Release\boinc_gui\obj/" @@ -1379,10 +1379,10 @@ Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + RelativePath="..\client\win\res\boinc.bmp"> + RelativePath="..\client\win\boinc.bmp"> @@ -1402,10 +1402,10 @@ + RelativePath="..\client\win\boincsm.bmp"> + RelativePath="..\client\win\res\boincsm.bmp"> diff --git a/win_build/boinc_guirpc_test.vcproj b/win_build/boinc_guirpc_test.vcproj index 5b48fe6d2d..0585570f0b 100644 --- a/win_build/boinc_guirpc_test.vcproj +++ b/win_build/boinc_guirpc_test.vcproj @@ -100,8 +100,8 @@ RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="../client/StdAfx.h" - PrecompiledHeaderFile=".\Build\Release\boinc_guirpctest\obj/boinc_guirpctest.pch" + PrecompiledHeaderThrough="../client/boinc_win.h" + PrecompiledHeaderFile=".\Build\Release\boinc_guirpctest\obj/boinc_win.pch" AssemblerListingLocation=".\Build\Release\boinc_guirpctest\obj/" ObjectFile=".\Build\Release\boinc_guirpctest\obj/" ProgramDataBaseFileName=".\Build\Release\boinc_guirpctest\obj/" diff --git a/win_build/boinc_ss.vcproj b/win_build/boinc_ss.vcproj index e60bfc4555..9122d95902 100644 --- a/win_build/boinc_ss.vcproj +++ b/win_build/boinc_ss.vcproj @@ -105,8 +105,8 @@ RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="../client/StdAfx.h" - PrecompiledHeaderFile=".\Build\Release\boinc_ss\obj/boinc_ss.pch" + PrecompiledHeaderThrough="../client/boinc_win.h" + PrecompiledHeaderFile=".\Build\Release\boinc_ss\obj/boinc_win.pch" AssemblerListingLocation=".\Build\Release\boinc_ss\obj/" ObjectFile=".\Build\Release\boinc_ss\obj/" ProgramDataBaseFileName=".\Build\Release\boinc_ss\obj/" diff --git a/win_build/upper_case.vcproj b/win_build/upper_case.vcproj index 443fd30522..610ec31598 100644 --- a/win_build/upper_case.vcproj +++ b/win_build/upper_case.vcproj @@ -32,7 +32,8 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Build\Release\upper_case\obj/upper_case.pch" + PrecompiledHeaderThrough="../lib/boinc_win.h" + PrecompiledHeaderFile=".\Build\Release\upper_case\obj/boinc_win.pch" AssemblerListingLocation=".\Build\Release\upper_case\obj/" ObjectFile=".\Build\Release\upper_case\obj/" ProgramDataBaseFileName=".\Build\Release\upper_case\obj/"