equal
deleted
inserted
replaced
570 fi |
570 fi |
571 # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to |
571 # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to |
572 # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual |
572 # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual |
573 # studio. |
573 # studio. |
574 if test "x$TOOLCHAIN_VERSION" = "x2010"; then |
574 if test "x$TOOLCHAIN_VERSION" = "x2010"; then |
575 COMMON_CXXFLAGS_JDK="$COMMON_CXXFLAGS_JDK \ |
575 COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \ |
576 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB" |
576 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB" |
577 fi |
577 fi |
578 fi |
578 fi |
579 |
579 |
580 ############################################################################### |
580 ############################################################################### |