From 20a54dd3adda6118bebc42da43abb76349f2c37c Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Tue, 16 Nov 1999 16:57:09 +0000 Subject: [PATCH] Set -vi- (inlining off) flag for Borland. Set CGAL_WINDOW/GEOWIN_LDFLAGS also without LEDA (-> CGAL_LDFLAGS). --- Packages/Installation/install_cgal | 10 +++++++--- Packages/Installation/version | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Packages/Installation/install_cgal b/Packages/Installation/install_cgal index 1ea0fc0ddbc..255affdedb4 100755 --- a/Packages/Installation/install_cgal +++ b/Packages/Installation/install_cgal @@ -753,7 +753,7 @@ set_compiler_flags() case ${CGAL_OS_COMPILER} in *bcc32.exe*|*BCC32*) #### settings Borland C++ compiler - ADDITIONAL_CXXFLAGS="-P -w-inl" + ADDITIONAL_CXXFLAGS="-P -vi- -w-inl" CGAL_LIB_CXXFLAGS="-P" CGAL_LIB_CREATE="tlib /C /P512 ''" CGAL_OBJ_PREFIX="+" @@ -4200,21 +4200,25 @@ write_linker_flags() # # CGAL_WINDOW_LDFLAGS # + ${_printf} "%s\\\\\n" "CGAL_WINDOW_LDFLAGS = " >> ${FILE} if [ -n "${LEDA_SUPPORT}" ]; then - ${_printf} "%s\\\\\n" "CGAL_WINDOW_LDFLAGS = " >> ${FILE} makefile_print_line "${START_LD_OPT}\$(CGAL_WINDOW_LIBPATH) ${ADDITIONAL_LDFLAGS}" >> ${FILE} makefile_print_line "\$(CUSTOM_LDFLAGS)" >> ${FILE} ${_printf} "\t%s\n\n" "${WLIBS}" >> ${FILE} + else + ${_printf} "\t%s\n\n" "\$(CGAL_LDFLAGS)" >> ${FILE} fi # # CGAL_GEOWIN_LDFLAGS # + ${_printf} "%s\\\\\n" "CGAL_GEOWIN_LDFLAGS = " >> ${FILE} if [ -n "${LEDA_SUPPORT}" ]; then - ${_printf} "%s\\\\\n" "CGAL_GEOWIN_LDFLAGS = " >> ${FILE} makefile_print_line "${START_LD_OPT}\$(CGAL_WINDOW_LIBPATH) ${ADDITIONAL_LDFLAGS}" >> ${FILE} makefile_print_line "\$(CUSTOM_LDFLAGS)" >> ${FILE} ${_printf} "\t%s\n\n" "${GEOWLIBS}" >> ${FILE} + else + ${_printf} "\t%s\n\n" "\$(CGAL_LDFLAGS)" >> ${FILE} fi } diff --git a/Packages/Installation/version b/Packages/Installation/version index 9cee6bb1c71..768e3d68f4b 100644 --- a/Packages/Installation/version +++ b/Packages/Installation/version @@ -1 +1 @@ -1.71 (03 November 1999) +1.72 (16 November 1999)