Changeset 19396

Timestamp:

06/10/15 16:39:52 (10 years ago)

Author:

glperez

Message:

CHG: changes for Windows parallel build.

File:

• issm/trunk-jpl/src/wrappers/matlab/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/src/wrappers/matlab/Makefile.am ¶

@@ -130 +130 @@
 endif
 
+if !WINDOWS
 libISSMApi_la_LIBADD = $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) $(MATHLIB) $(MEXLIB)
+endif
 
 if STANDALONE_LIBRARIES
@@ -231 +233 @@
 
 Scotch_la_SOURCES = ../Scotch/Scotch.cpp
-Scotch_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB) $(BLASLAPACKLIB)
+Scotch_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB) $(PETSCLIB) $(BLASLAPACKLIB)
 
 ShpRead_la_SOURCES = ../ShpRead/ShpRead.cpp