diff options
| author | Pedro Giffuni <pfg@apache.org> | 2012-01-24 02:31:14 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2012-01-24 02:31:14 +0000 |
| commit | 286fb456bc171d49266b4b40c4853e56d4c14022 (patch) | |
| tree | 8e04e01253a86c90d98df0df372118267ecb00bd | |
| parent | 6a043632d0941afbf1d4020b57241a4ab2a27204 (diff) | |
Fix build when CoinMP is disabled. Patch by Pavel.
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 5 | ||||
| -rw-r--r-- | sccomp/source/solver/makefile.mk | 8 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index c134a4d36621..3e72d064b641 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -144,7 +144,6 @@ my_components = \ slideshow \ sm \ smd \ - solver \ spl \ srtrs1 \ stringresource \ @@ -191,6 +190,10 @@ my_components += component/vcl/vcl.unx my_components += oooimprovement .END +.IF "$(ENABLE_COINMP)"=="YES" +my_components += solver +.END + .IF "$(DISABLE_SAXON)" == "" my_components += XSLTFilter.jar \ xsltfilter diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk index d746de7e596e..1719caa63840 100644 --- a/sccomp/source/solver/makefile.mk +++ b/sccomp/source/solver/makefile.mk @@ -36,6 +36,13 @@ LIBTARGET=NO # --- Files ------------------------------------- +.IF "$(ENABLE_COINMP)"=="NO" + +dummy: + @echo "Nothing to build (CoinMP is disabled)" + +.ELSE + SLOFILES=$(SLO)$/solver.obj SRS1NAME=$(TARGET) @@ -80,3 +87,4 @@ $(MISC)/solver.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt solver.component +.ENDIF diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 193fd6640976..d3d169fb7963 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -61,8 +61,8 @@ File gid_File_Lib_CbcSolver PACKED_LIB_FILE_BODY; End #else -# On Windows only the CoinMP library is built and used. -# Version numbering is not used either. +// 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; @@ -93,7 +93,9 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) STD_LIB_FILE( gid_File_Lib_Scd, scd) +#ifdef ENABLE_COINMP STD_RES_FILE( gid_File_Res_Solver, solver) +#endif STD_RES_FILE( gid_File_Res_Analysis, analysis) |