Hotfix: Windows scotch-6.0.4 compilation

This commit is contained in:
Hrvoje Jasak 2015-09-14 14:58:45 +01:00
parent c08017d946
commit b7a18ac1df

View file

@ -46,7 +46,7 @@ LDFLAGS += -L$(MPI_ROOTDIR)/bin -lm -lmpi -lmpid
#PTHREAD_ROOTDIR = $(PGMFILES)/pthread-win32 #PTHREAD_ROOTDIR = $(PGMFILES)/pthread-win32
#CFLAGS_INC += -I$(PTHREAD_ROOTDIR)/include #CFLAGS_INC += -I$(PTHREAD_ROOTDIR)/include
#CLIBFLAGS = #CLIBFLAGS =
LDFLAGS += -L$(PTHREADS_HOME)/Pre-built.2/lib/x64 -lpthreadGC2 LDFLAGS += -L$(PTHREADS_HOME)/Pre-built.2/lib/x64 -lpthread
#--- zlib: Uncomment for compressed files #--- zlib: Uncomment for compressed files
#ZLIB_ROOTDIR = $(PGMFILES)/zlib-1.2.3 #ZLIB_ROOTDIR = $(PGMFILES)/zlib-1.2.3
@ -58,7 +58,7 @@ LDFLAGS += -lz
#CFLAGS_DEF += -DCOMMON_PTHREAD -DCOMMON_FILE_COMPRESS_GZ #CFLAGS_DEF += -DCOMMON_PTHREAD -DCOMMON_FILE_COMPRESS_GZ
#--- SCOTCH_PTHREAD: Uncomment for threaded MPI #--- SCOTCH_PTHREAD: Uncomment for threaded MPI
#CFLAGS_DEF += -DSCOTCH_PTHREAD CFLAGS_DEF += -DSCOTCH_PTHREAD
CFLAGS = $(CFLAGS_CPL) $(CFLAGS_INC) $(CFLAGS_DEF) CFLAGS = $(CFLAGS_CPL) $(CFLAGS_INC) $(CFLAGS_DEF)
CP = cp CP = cp