Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- Win compile fixes. 

For now, include psapi.lib in various project properties.
		Try to figure out a different way.

svn path=/trunk/boinc/; revision=26149
This commit is contained in:
David Anderson 2012-10-11 19:22:34 +00:00
parent 7d40c46923
commit 76282d0a20
11 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/boinc_api.cpp
View File

@ -387,7 +387,7 @@ static bool client_dead() {
// Windows doesn't have waitpid() :-(
//
DWORD pids[4096], nb;
BOOL r = EnumProcesses(pids, sizeof(pids), nb);
BOOL r = EnumProcesses(pids, sizeof(pids), &nb);
if (!r) return false;
int n = nb/sizeof(DWORD);
for (int i=0; i<n; i++) {

14
checkin_notes
View File

@ -6129,3 +6129,17 @@ David 11 Oct 2012
lib/
app_ipc.cpp,h
proc_control.cpp
David 11 Oct 2012
- Win compile fixes.
For now, include psapi.lib in various project properties.
Try to figure out a different way.
api/
boinc_api.cpp
client/
app_start.cpp
lib/
boinc_win.h
win_build/
various .proj files

2
client/app_start.cpp
View File

@ -219,7 +219,7 @@ void ACTIVE_TASK::init_app_init_data(APP_INIT_DATA& aid) {
strcpy(aid.authenticator, wup->project->authenticator);
aid.slot = slot;
#ifdef _WIN32
if (strstr(gstate.hostinfo.os_name, "Windows 2000")) {
if (strstr(gstate.host_info.os_name, "Windows 2000")) {
// Win2K immediately reuses PIDs, so can't use this mechanism
//
aid.client_pid = 0;

1
lib/boinc_win.h
View File

@ -96,6 +96,7 @@
#include <shlobj.h>
#include <userenv.h>
#include <aclapi.h>
#include <psapi.h>
#include <iphlpapi.h>
#if !defined(__CYGWIN32__) || defined(USE_WINSOCK)

2
win_build/boinc_ss.vcproj
View File

@ -287,7 +287,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib wsock32.lib advapi32.lib freetype2410_D.lib ftgl_static_D.lib $(NOINHERIT)"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib wsock32.lib advapi32.lib freetype2410_D.lib ftgl_static_D.lib psapi.lib $(NOINHERIT)"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boincscr.exe"
LinkIncremental="0"
SuppressStartupBanner="true"

2
win_build/example_app_multi_thread.vcproj
View File

@ -279,7 +279,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib psapi.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_intelx86.exe"
LinkIncremental="0"
SuppressStartupBanner="true"

2
win_build/sleeper.vcproj
View File

@ -278,7 +278,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib psapi.lib glu32.lib ole32.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_intelx86.exe"
LinkIncremental="0"
SuppressStartupBanner="true"

2
win_build/uc2.vcproj
View File

@ -278,7 +278,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib psapi.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"

2
win_build/uc2_graphics.vcproj
View File

@ -283,7 +283,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib freetype2410_D.lib ftgl_static_D.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib psapi.lib glu32.lib ole32.lib delayimp.lib freetype2410_D.lib ftgl_static_D.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"

2
win_build/vboxwrapper.vcproj
View File

@ -278,7 +278,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib psapi.lib wsock32.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_6.1_windows_intelx86.exe"
LinkIncremental="0"
SuppressStartupBanner="true"

2
win_build/wrapper.vcproj
View File

@ -278,7 +278,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib psapi.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\wrapper_6.1_windows_intelx86.exe"
LinkIncremental="0"
SuppressStartupBanner="true"