Changeset 752
- Timestamp:
- Aug 14, 2007 3:02:01 PM (13 years ago)
- Location:
- branches/BSP/trunk/Cbc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/BSP/trunk/Cbc/configure
r748 r752 2809 2809 xlc* | */xlc* | mpxlc* | */mpxlc*) 2810 2810 coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 2811 coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 ,1500-029"2811 coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029" 2812 2812 coin_dbg_cflags="-g" 2813 2813 ;; … … 3650 3650 xlC* | */xlC* | mpxlC* | */mpxlC*) 3651 3651 coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 3652 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 ,1500-029"3652 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029" 3653 3653 coin_dbg_cxxflags="-g" 3654 3654 ;; … … 22086 22086 22087 22087 22088 # In this particular case we include the ASL in ADDLIBS, since currently 22089 # code in libCbc requires symbols from the ASL. Later, when any AMPL code 22090 # is separated, this should go again. NOTE: At that point, ASLLIB needs 22091 # to be used in Cbc/src/Makefile.am again (see comment there) 22092 ADDLIBS="$ASLLIB $ADDLIBS" 22093 22088 22094 ############################################################################# 22089 22095 # CbcGeneric configuration # -
branches/BSP/trunk/Cbc/configure.ac
r733 r752 86 86 # Ampl Solver library 87 87 AC_COIN_HAS_ASL 88 89 # In this particular case we include the ASL in ADDLIBS, since currently 90 # code in libCbc requires symbols from the ASL. Later, when any AMPL code 91 # is separated, this should go again. NOTE: At that point, ASLLIB needs 92 # to be used in Cbc/src/Makefile.am again (see comment there) 93 ADDLIBS="$ASLLIB $ADDLIBS" 88 94 89 95 ############################################################################# -
branches/BSP/trunk/Cbc/src/Makefile.am
r748 r752 1 # Copyright (C) 2006 International Business Machines and others.1 # Copyright (C) 2006, 2007 International Business Machines and others. 2 2 # All Rights Reserved. 3 3 # This file is distributed under the Common Public License. … … 84 84 # List all source files for this executable, including headers 85 85 cbc_SOURCES = \ 86 CoinSolve.cpp \ 87 unitTestClp.cpp 86 CoinSolve.cpp 88 87 89 88 # Additional COIN libraries -
branches/BSP/trunk/Cbc/src/Makefile.in
r748 r752 15 15 @SET_MAKE@ 16 16 17 # Copyright (C) 2006 International Business Machines and others.17 # Copyright (C) 2006, 2007 International Business Machines and others. 18 18 # All Rights Reserved. 19 19 # This file is distributed under the Common Public License. … … 172 172 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 173 173 PROGRAMS = $(bin_PROGRAMS) 174 am__cbc_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp 175 @COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) \ 176 @COIN_HAS_CLP_TRUE@ unitTestClp.$(OBJEXT) 174 am__cbc_SOURCES_DIST = CoinSolve.cpp 175 @COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) 177 176 cbc_OBJECTS = $(am_cbc_OBJECTS) 178 177 am__DEPENDENCIES_1 = … … 540 539 # List all source files for this executable, including headers 541 540 @COIN_HAS_CLP_TRUE@cbc_SOURCES = \ 542 @COIN_HAS_CLP_TRUE@ CoinSolve.cpp \ 543 @COIN_HAS_CLP_TRUE@ unitTestClp.cpp 541 @COIN_HAS_CLP_TRUE@ CoinSolve.cpp 544 542 545 543 … … 779 777 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@ 780 778 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Plo@am__quote@ 781 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@782 779 783 780 .cpp.o:
Note: See TracChangeset
for help on using the changeset viewer.