Changeset 11435


Ignore:
Timestamp:
02/14/12 11:46:58 (13 years ago)
Author:
Eric.Larour
Message:

Missing MEXLIB for compile on Windows machines + changed some properties to ignore byproducts of windows compile

Location:
issm/trunk-jpl/src/mex
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/mex

    • Property svn:ignore

      •  

        old new  
        44*.mexa64
        55.deps
         6*.exe
         7*.exp
         8*.lib
         9*.obj
         10*.mexw64
         11*.mexw64.manifest
         12*.mexw64.map
         13*.exe.manifest

  • issm/trunk-jpl/src/mex/Makefile.am

    r11335 r11435  
    1 INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@
     1INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ 
    22EXEEXT=$(MEXEXT)
    33
    … …  
    9696bin_PROGRAMS +=
    9797else
     98if DAKOTA
    9899bin_PROGRAMS += DakotaResponses\
    99100                                Dakota\
    100101                                InputUpdateFromDakota
     102else
     103bin_PROGRAMS +=
     104endif
    101105endif
    102106#}}}
    103107#Flags and libraries {{{1
    104 LDADD =   $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB)
     108LDADD =   $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(MEXLIB)
    105109
    106110AM_LDFLAGS = $(MEXLINK)
Note: See TracChangeset for help on using the changeset viewer.