windows.gcc.inc | windows.gcc.inc | |||
---|---|---|---|---|
# Copyright 2005-2012 Intel Corporation. All Rights Reserved. | # Copyright 2005-2013 Intel Corporation. All Rights Reserved. | |||
# | # | |||
# This file is part of Threading Building Blocks. | # This file is part of Threading Building Blocks. | |||
# | # | |||
# Threading Building Blocks is free software; you can redistribute it | # Threading Building Blocks is free software; you can redistribute it | |||
# and/or modify it under the terms of the GNU General Public License | # and/or modify it under the terms of the GNU General Public License | |||
# version 2 as published by the Free Software Foundation. | # version 2 as published by the Free Software Foundation. | |||
# | # | |||
# Threading Building Blocks is distributed in the hope that it will be | # Threading Building Blocks is distributed in the hope that it will be | |||
# useful, but WITHOUT ANY WARRANTY; without even the implied warranty | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty | |||
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
skipping to change at line 94 | skipping to change at line 94 | |||
ifeq (ok,$(shell cmd /C "cscript /nologo /E:jscript $(tbb_root)/build/detec t.js /minversion gcc 4.4")) | ifeq (ok,$(shell cmd /C "cscript /nologo /E:jscript $(tbb_root)/build/detec t.js /minversion gcc 4.4")) | |||
CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X | CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X | |||
endif | endif | |||
ifeq ($(cfg), release) | ifeq ($(cfg), release) | |||
CPLUS_FLAGS = -O2 | CPLUS_FLAGS = -O2 | |||
endif | endif | |||
ifeq ($(cfg), debug) | ifeq ($(cfg), debug) | |||
CPLUS_FLAGS = -g -O0 -DTBB_USE_DEBUG | CPLUS_FLAGS = -g -O0 -DTBB_USE_DEBUG | |||
endif | endif | |||
ifneq (00,$(lambdas)$(cpp0x)) | ||||
CXX_ONLY_FLAGS += $(CPP11_FLAGS) | ||||
endif | ||||
CPLUS_FLAGS += -DUSE_WINTHREAD | CPLUS_FLAGS += -DUSE_WINTHREAD | |||
CPLUS_FLAGS += -D_WIN32_WINNT=$(_WIN32_WINNT) | CPLUS_FLAGS += -D_WIN32_WINNT=$(_WIN32_WINNT) | |||
# MinGW specific | # MinGW specific | |||
CPLUS_FLAGS += -DMINGW_HAS_SECURE_API=1 -D__MSVCRT_VERSION__=0x0700 -msse - mthreads | CPLUS_FLAGS += -DMINGW_HAS_SECURE_API=1 -D__MSVCRT_VERSION__=0x0700 -msse - mthreads | |||
CONLY = gcc | CONLY = gcc | |||
debugger = gdb | debugger = gdb | |||
C_FLAGS = $(CPLUS_FLAGS) | C_FLAGS = $(CPLUS_FLAGS) | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 6 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |