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

- API: compile fixes for MinGW 

svn path=/trunk/boinc/; revision=21522
This commit is contained in:
David Anderson 2010-05-14 16:22:57 +00:00
parent f4c1bc40ae
commit 50724b0ed9
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/Makefile.mingw
View File

@ -1,6 +1,6 @@
BOINCDIR = .. BOINCDIR = ..
DEBUG = -D__DEBUG__ -g3 DEBUG = -D__DEBUG__ -g3
OBJ = boinc_api.o util.o win_util.o app_ipc.o diagnostics.o diagnostics_win.o filesys.o hostinfo.o md5.o md5_file.o mem_usage.o mfile.o miofile.o parse.o prefs.o proxy_info.o str_util.o shmem.o stackwalker_win.o base64.o OBJ = boinc_api.o util.o win_util.o app_ipc.o diagnostics.o diagnostics_win.o filesys.o hostinfo.o md5.o md5_file.o mem_usage.o mfile.o miofile.o parse.o prefs.o proxy_info.o str_util.o shmem.o stackwalker_win.o base64.o url.o coproc.o
LINKOBJ = $(OBJ) LINKOBJ = $(OBJ)
LDFLAGS = -lwinmm -march=i386 LDFLAGS = -lwinmm -march=i386
INCS = -I"$(BOINCDIR)" -I"$(BOINCDIR)/db" -I"$(BOINCDIR)" -I"$(BOINCDIR)/lib" -I"$(BOINCDIR)/api" INCS = -I"$(BOINCDIR)" -I"$(BOINCDIR)/db" -I"$(BOINCDIR)" -I"$(BOINCDIR)/lib" -I"$(BOINCDIR)/api"

9
checkin_notes
View File

@ -3652,3 +3652,12 @@ David 13 May 2010
clientgui/ clientgui/
BOINCTaskBar.cpp BOINCTaskBar.cpp
David 14 May 2010
- API: compile fixes for MinGW
lib/
boinc_win.h
filesys.cpp
api/
Makefile.mingw

6
lib/boinc_win.h
View File

@ -125,7 +125,7 @@ typedef size_t socklen_t;
#include <commctrl.h> #include <commctrl.h>
#include <raserror.h> #include <raserror.h>
#if defined(MINGW_WIN32) #if defined(__MINGW32__)
#include <stdint.h> #include <stdint.h>
#include <imagehlp.h> #include <imagehlp.h>
#else #else
@ -163,7 +163,7 @@ typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
// C headers // C headers
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#if !defined(MINGW_WIN32) #if !defined(__MINGW32__)
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <malloc.h> #include <malloc.h>
@ -249,11 +249,9 @@ extern "C" {
#endif #endif
void __cdecl _fpreset (void); void __cdecl _fpreset (void);
void __cdecl fpreset (void); void __cdecl fpreset (void);
#ifndef MINGW_WIN32
#define SetClassLongPtr SetClassLong #define SetClassLongPtr SetClassLong
#define GCLP_HICON GCL_HICON #define GCLP_HICON GCL_HICON
#define GCLP_HICONSM GCL_HICONSM #define GCLP_HICONSM GCL_HICONSM
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
lib/filesys.cpp
View File

@ -21,7 +21,7 @@
#include "stdwx.h" #include "stdwx.h"
#endif #endif
#if defined(MINGW_WIN32) #if defined(__MINGW32__)
#include <fcntl.h> #include <fcntl.h>
#endif #endif