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

API: fix Makefile.mingw 

- allow to augment CFLAGS and CXXFLAGS
        - allow to at least set DEBUG flags externally, such that
            backtrace flags can be used
        - minor textual fixes (whitespace error, typo in comment)

svn path=/trunk/boinc/; revision=25881
This commit is contained in:
Bernd Machenschalk 2012-07-18 11:12:06 +00:00
parent 6f330ed430
commit 54147365bb
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -5000,3 +5000,14 @@ Charlie 18 July 2012
lib/ lib/
procinfo_mac.cpp procinfo_mac.cpp
Bernd 18 July 2012
- API: fix Makefile.mingw
- allow to augment CFLAGS and CXXFLAGS
- allow to at least set DEBUG flags externally, such that
backtrace flags can be used
- minor textual fixes (whitespace error, typo in comment)
lib/
Makefile.mingw

12
lib/Makefile.mingw
View File

@ -69,7 +69,7 @@ BIN = $(API_BIN) $(OCL_BIN) $(LIB_BIN) $(GPH_BIN)
# -gstabs is necessary for MinGWs backtrace to work # -gstabs is necessary for MinGWs backtrace to work
#DEBUG = -D__DEBUG__ -gstabs -g3 #DEBUG = -D__DEBUG__ -gstabs -g3
DEBUG = -DNDEBUG DEBUG ?= -DNDEBUG
# where to find headers # where to find headers
INCS = -I"$(BOINC_SRC)" -I"$(BOINC_SRC)/db" -I"$(BOINC_SRC)/lib" -I"$(BOINC_SRC)/api" -I"$(BOINC_SRC)/zip" -I"$(BOINC_SRC)/win_build" INCS = -I"$(BOINC_SRC)" -I"$(BOINC_SRC)/db" -I"$(BOINC_SRC)/lib" -I"$(BOINC_SRC)/api" -I"$(BOINC_SRC)/zip" -I"$(BOINC_SRC)/win_build"
@ -77,7 +77,7 @@ INCS = -I"$(BOINC_SRC)" -I"$(BOINC_SRC)/db" -I"$(BOINC_SRC)/lib" -I"$(BOINC_SRC)
OPTFLAGS = -O3 OPTFLAGS = -O3
# various cpp & gcc flags (for both C and C++ mode) # various cpp & gcc flags (for both C and C++ mode)
# set NOCYGWIN=-mno-cygwin to build non-Cywin Windows libs under Cygwin # set NOCYGWIN=-mno-cygwin to build non-Cygwin Windows libs under Cygwin
# -D_WIN32_WINDOWS=0x0410 sets to use Win98 API # -D_WIN32_WINDOWS=0x0410 sets to use Win98 API
WINVERFLAGS = -D_WINDOWS -D_WIN32 -DWIN32 -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_MT WINVERFLAGS = -D_WINDOWS -D_WIN32 -DWIN32 -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_MT
HAVEFLAGS = -DHAVE_STRCASECMP HAVEFLAGS = -DHAVE_STRCASECMP
@ -90,8 +90,10 @@ ZIP_FLAGS = -DWIN32 -D_LIB -D_MBCS -DNO_MKTEMP $(INCS) -O2 -DDLL $(NOCYGWIN)
# LDFLAGS = -lwinmm # LDFLAGS = -lwinmm
CFLAGS = $(CCXXFLAGS) CFLAGS ?=
CXXFLAGS = $(CCXXFLAGS) CFLAGS += $(CCXXFLAGS)
CXXFLAGS ?=
CXXFLAGS += $(CCXXFLAGS)
# default target # default target
all: $(BIN) all: $(BIN)
@ -159,7 +161,7 @@ install-zip: $(ZIP_BIN) $(ZIP_HEADERS)
$(RANLIB) $(ZIP_BIN) $(RANLIB) $(ZIP_BIN)
cp $(ZIP_BIN) $(BOINC_PREFIX)/lib cp $(ZIP_BIN) $(BOINC_PREFIX)/lib
uninstall: uninstall:
${RM} -rf $(BOINC_PREFIX)/include/boinc ${RM} -rf $(BOINC_PREFIX)/include/boinc
${RM} $(BOINC_PREFIX)/lib/libboinc.a $(BOINC_PREFIX)/lib/libboinc_api.a $(BOINC_PREFIX)/lib/libboinc_opencl.a $(BOINC_PREFIX)/lib/libboinc_graphics2.a ${RM} $(BOINC_PREFIX)/lib/libboinc.a $(BOINC_PREFIX)/lib/libboinc_api.a $(BOINC_PREFIX)/lib/libboinc_opencl.a $(BOINC_PREFIX)/lib/libboinc_graphics2.a
( cd $(BOINC_PREFIX)/lib && rm -f $(BIN) || exit 0 ) ( cd $(BOINC_PREFIX)/lib && rm -f $(BIN) || exit 0 )