diff options
| author | Andre Fischer <af@apache.org> | 2012-01-20 12:51:50 +0000 |
|---|---|---|
| committer | Andre Fischer <af@apache.org> | 2012-01-20 12:51:50 +0000 |
| commit | 240ddd003cc98f4227c7615ed668e454438e2d51 (patch) | |
| tree | f169fbbca77cdc02ebf937192e740d66c5d0679f /scp2 | |
| parent | 6d492447a37ec268fb5924e7fc5631c29c67325d (diff) | |
118160: Added external CoinMP library.
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 5 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 51 | ||||
| -rw-r--r-- | scp2/source/calc/makefile.mk | 9 |
3 files changed, 63 insertions, 2 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 52d8f845af43..4f2fc7ffb1d7 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -88,6 +88,11 @@ #define EXENAME(name) STRING(name) #define PROFILENAME(name) STRING(CONCAT2(name,rc)) #define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) + #ifdef MACOSX + #define SPECIAL_NAME_VER(name,version) STRING(CONCAT5(lib,name,.,version,UNXSUFFIX)) + #else + #define SPECIAL_NAME_VER(name,version) STRING(CONCAT5(lib,name,UNXSUFFIX,.,version)) + #endif #define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,UNXSUFFIX)) #else #define LIBNAME(name) STRING(CONCAT3(name,DLLPOSTFIX,.dll)) diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 8131aff663bf..193fd6640976 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -23,6 +23,55 @@ #include "macros.inc" + +#ifdef ENABLE_COINMP +STD_LIB_FILE( gid_File_Lib_Solver, solver) + +#ifdef ADD_ALL_COINMP_LIBRARIES +File gid_File_Lib_CoinMP + Name = SPECIAL_NAME_VER(CoinMP,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_CoinUtils + Name = SPECIAL_NAME_VER(CoinUtils,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Clp + Name = SPECIAL_NAME_VER(Clp,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Cbc + Name = SPECIAL_NAME_VER(Cbc,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Osi + Name = SPECIAL_NAME_VER(Osi,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_OsiClp + Name = SPECIAL_NAME_VER(OsiClp,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Cgl + Name = SPECIAL_NAME_VER(Cgl,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_CbcSolver + Name = SPECIAL_NAME_VER(CbcSolver,0); + PACKED_LIB_FILE_BODY; +End +#else +# On Windows only the CoinMP library is built and used. +# Version numbering is not used either. +File gid_File_Lib_CoinMP + Name = SPECIAL_NAME(CoinMP); + PACKED_LIB_FILE_BODY; +End +#endif + +#endif + + STD_LIB_FILE( gid_File_Lib_Analysis, analysis) File gid_File_Share_Registry_Calc_Xcd @@ -44,6 +93,8 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) STD_LIB_FILE( gid_File_Lib_Scd, scd) +STD_RES_FILE( gid_File_Res_Solver, solver) + STD_RES_FILE( gid_File_Res_Analysis, analysis) STD_RES_FILE( gid_File_Res_Date, date) diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk index 318ee24576c8..cf4db62c5f93 100644 --- a/scp2/source/calc/makefile.mk +++ b/scp2/source/calc/makefile.mk @@ -33,8 +33,13 @@ TARGETTYPE=CUI .INCLUDE : settings.mk -.IF "$(SYSTEM_LPSOLVE)" == "YES" -SCPDEFS+=-DSYSTEM_LPSOLVE +.IF "$(ENABLE_COINMP)" == "YES" +SCPDEFS+=-DENABLE_COINMP +.IF "$(GUI)"!="WNT" +# For the non-Windows platforms all libraries related to CoinMP have to be +# added explicitly. +SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES +.ENDIF .ENDIF SCP_PRODUCT_TYPE=osl |