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

lib: 

- fixed whitespace error in Makefile.mingw                                                                                                                                                  
        - build and install svn_version.h in Makefile.mingw                                                                                                                                         
        - fixed boinc_win.h for MinGW gcc-4                                                                                                                                                         
        - not sure why client_msgs.h was ever included in procinfo_unix.cpp,                                                                                                                      
          but in current code caused a nasty trail of includes breaking the                                                                                                                         
          Linux build, so removed it

svn path=/trunk/boinc/; revision=22561
This commit is contained in:
Bernd Machenschalk 2010-10-20 11:28:02 +00:00
parent 2201bfec30
commit a73bbac1dc
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
checkin_notes
View File

@ -7528,3 +7528,17 @@ Charlie 16 Oct 2010
lib/
mac/
mac_backtrace.cpp
Bernd 20 Oct 2010
- lib:
- fixed whitespace error in Makefile.mingw
- build and install svn_version.h in Makefile.mingw
- fixed boinc_win.h for MinGW gcc-4
- not sure why "client_msgs.h" was ever included in procinfo_unix.cpp,
but in current code caused a nasty trail of includes breaking the
Linux build, so removed it
lib/
Makefile.mingw
boinc_win.h
procinfo_unix.cpp

6
lib/Makefile.mingw
View File

@ -12,7 +12,8 @@ HEADERS = $(BOINC_SRC)/version.h $(BOINC_SRC)/api/boinc_api.h $(BOINC_SRC)/api/g
$(BOINC_SRC)/lib/boinc_win.h $(BOINC_SRC)/lib/url.h $(BOINC_SRC)/lib/common_defs.h $(BOINC_SRC)/lib/diagnostics.h \
$(BOINC_SRC)/lib/diagnostics_win.h $(BOINC_SRC)/lib/filesys.h $(BOINC_SRC)/lib/hostinfo.h $(BOINC_SRC)/lib/proxy_info.h \
$(BOINC_SRC)/lib/prefs.h $(BOINC_SRC)/lib/miofile.h $(BOINC_SRC)/lib/mfile.h $(BOINC_SRC)/lib/parse.h \
$(BOINC_SRC)/lib/util.h $(BOINC_SRC)/lib/coproc.h $(BOINC_SRC)/lib/cal_boinc.h $(BOINC_SRC)/win_build/config.h
$(BOINC_SRC)/lib/util.h $(BOINC_SRC)/lib/coproc.h $(BOINC_SRC)/lib/cal_boinc.h $(BOINC_SRC)/lib/svn_version.h \
$(BOINC_SRC)/win_build/config.h
ZIP_HEADERS = zip/boinc_zip.h
@ -110,6 +111,9 @@ md5.o: $(BOINC_SRC)/lib/md5.c
z_util.o: $(BOINC_SRC)/zip/zip/util.c
$(CC) -c $< -o $@ $(ZIP_FLAGS)
$(BOINC_SRC)/lib/svn_version.h:
cd $(BOINC_SRC)/lib && sh ../generate_svn_version.sh
# set to the target ranlib when cross-compiling
RANLIB ?= ranlib

6
lib/boinc_win.h
View File

@ -249,13 +249,15 @@ extern "C" {
#endif
void __cdecl _fpreset (void);
void __cdecl fpreset (void);
#if (__GNUC__ < 4) // breaks build on MinGW gcc-4
#define SetClassLongPtr SetClassLong
#define GCLP_HICON GCL_HICON
#define GCLP_HICONSM GCL_HICONSM
#endif //GNUC
#ifdef __cplusplus
}
#endif
#endif
#endif //cplusplus
#endif //MINGW
// On the Win32 platform include file and line number information for each
// memory allocation/deallocation

1
lib/procinfo_unix.cpp
View File

@ -45,7 +45,6 @@
#include "procinfo.h"
#include "str_util.h"
#include "str_replace.h"
#include "client_msgs.h"
using std::vector;