diff --git a/apps/upper_case.C b/apps/upper_case.C index dee597a2d5..1b0645a881 100755 --- a/apps/upper_case.C +++ b/apps/upper_case.C @@ -71,7 +71,7 @@ char the_char[10]; double xPos=0, yPos=0; double xDelta=0.03, yDelta=0.07; -int run_slow=0,cpu_time=0,raise_signal=0; +int run_slow=0,cpu_time=1,raise_signal=0; time_t my_start_time; APP_INIT_DATA uc_aid; @@ -190,10 +190,11 @@ int main(int argc, char **argv) { if (cpu_time) { n = 0; j = 3.14159; - for(i=0; i<200000000; i++) { + for(i=0; i<200000; i++) { n++; j *= n+j-3.14159; j /= (float)n; + } if (n==j) n = 0; diff --git a/client/win/resource.aps b/client/win/resource.aps index e67da23046..ad2b51de83 100644 Binary files a/client/win/resource.aps and b/client/win/resource.aps differ diff --git a/client/win/resource.rc b/client/win/resource.rc index 24f633999d..68c2aa0eeb 100755 --- a/client/win/resource.rc +++ b/client/win/resource.rc @@ -198,8 +198,8 @@ IDI_ICONHIGHLIGHT ICON DISCARDABLE "res\\iconhigh.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 0,0,4,0 + PRODUCTVERSION 0,0,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -217,14 +217,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Space Sciences Laboratory\0" VALUE "FileDescription", "boinc_gui\0" - VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "FileVersion", "0, 0, 4, 0\0" VALUE "InternalName", "boinc_gui\0" VALUE "LegalCopyright", "Copyright © 2002\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "boinc_gui.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Space Sciences Laboratory boinc_gui\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" + VALUE "ProductVersion", "0, 0, 4, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/win_build/boinc_dll/boinc_dll.dsp b/win_build/boinc_dll/boinc_dll.dsp index 3c696b0f90..dddfacd8d0 100755 --- a/win_build/boinc_dll/boinc_dll.dsp +++ b/win_build/boinc_dll/boinc_dll.dsp @@ -54,6 +54,10 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/boinc.dll" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\boinc.dll ..\boinc_gui\ +# End Special Build Tool !ELSEIF "$(CFG)" == "boinc_dll - Win32 Debug" @@ -83,7 +87,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Copy dll to boinc_gui directory -PostBuild_Cmds=copy Debug\boinc.dll ..\boinc_gui\ +PostBuild_Cmds=copy Debug\boinc.dll ..\boinc_gui\ # End Special Build Tool !ENDIF diff --git a/win_build/boinc_gui/boinc_gui.dsp b/win_build/boinc_gui/boinc_gui.dsp index bd8f95c0f5..c1d1e86189 100755 --- a/win_build/boinc_gui/boinc_gui.dsp +++ b/win_build/boinc_gui/boinc_gui.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../client/" /I "../../RSAEuro/source/" /I "../../client/win/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D MAJOR_VERSION=1 /D MINOR_VERSION=1 /YX /FD /c /Tp +# ADD CPP /nologo /MD /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../client/" /I "../../RSAEuro/source/" /I "../../client/win/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D MAJOR_VERSION=0 /D MINOR_VERSION=04 /YX /FD /c /Tp # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../RSAEuro/source/" /I "../../client/win/" /I "../../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D MAJOR_VERSION=1 /D MINOR_VERSION=1 /FR /YX /FD /GZ /c /Tp +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../RSAEuro/source/" /I "../../client/win/" /I "../../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D MAJOR_VERSION=0 /D MINOR_VERSION=04 /FR /YX /FD /GZ /c /Tp # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -369,7 +369,7 @@ SOURCE=..\..\client\win\res\iconhigh.ico # End Source File # Begin Source File -SOURCE=..\RSAEuro\Debug\RSAEuro.lib +SOURCE=..\RSAEuro\Release\RSAEuro.lib # End Source File # End Group # End Target diff --git a/win_build/boinc_ss/boinc_ss.dsp b/win_build/boinc_ss/boinc_ss.dsp index 29a9727d8c..a414f2f16e 100755 --- a/win_build/boinc_ss/boinc_ss.dsp +++ b/win_build/boinc_ss/boinc_ss.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../../api/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG"