svn commit: r1235119 - in /incubator/ooo/trunk/main: postprocess/packcomponents/makefile.mk sccomp/source/solver/makefile.mk scp2/source/calc/file_calc.scp

[pf...@apache.org]

Author: pfg
Date: Tue Jan 24 03:31:14 2012
New Revision: 1235119

URL: http://svn.apache.org/viewvc?rev=1235119&view=rev
Log:
Fix build when CoinMP is disabled. Patch by Pavel.

Modified:
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
    incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1235119&r1=1235118&r2=1235119&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Tue Jan 24 03:31:14 2012
@@ -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

Modified: incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk?rev=1235119&r1=1235118&r2=1235119&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk (original)
+++ incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk Tue Jan 24 03:31:14 2012
@@ -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 : $(
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt solver.component
 
+.ENDIF

Modified: incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp?rev=1235119&r1=1235118&r2=1235119&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp Tue Jan 24 03:31:14 2012
@@ -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, scfil
 
 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)