From 32504258f41592aa48d14da62aea057d1d71e857 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Thu, 27 Aug 2015 21:58:39 +0100 Subject: [PATCH] Rename installation for MSWin --- wmake/rules/mingw64/ARCHITECTURE_TESTED | 1 - wmake/rules/mingw64/X | 3 --- wmake/rules/mingw64/c | 16 ---------------- wmake/rules/mingw64/c++ | 22 ---------------------- wmake/rules/mingw64/c++Debug | 2 -- wmake/rules/mingw64/c++Opt | 4 ---- wmake/rules/mingw64/c++Prof | 2 -- wmake/rules/mingw64/cDebug | 2 -- wmake/rules/mingw64/cOpt | 2 -- wmake/rules/mingw64/cProf | 2 -- wmake/rules/mingw64/general | 11 ----------- wmake/rules/mingw64/mplib | 3 --- wmake/rules/mingw64/mplibGAMMA | 3 --- wmake/rules/mingw64/mplibHPMPI | 3 --- wmake/rules/mingw64/mplibMPICH | 3 --- wmake/rules/mingw64/mplibMPICH-GM | 3 --- wmake/rules/mingw64/mplibOPENMPI | 3 --- wmake/rules/mingw64/mplibQSMPI | 3 --- wmake/rules/mingw64/mplibSYSTEMOPENMPI | 1 - wmake/rules/mingw64/nvcc | 17 ----------------- 20 files changed, 106 deletions(-) delete mode 100644 wmake/rules/mingw64/ARCHITECTURE_TESTED delete mode 100644 wmake/rules/mingw64/X delete mode 100644 wmake/rules/mingw64/c delete mode 100644 wmake/rules/mingw64/c++ delete mode 100644 wmake/rules/mingw64/c++Debug delete mode 100644 wmake/rules/mingw64/c++Opt delete mode 100644 wmake/rules/mingw64/c++Prof delete mode 100644 wmake/rules/mingw64/cDebug delete mode 100644 wmake/rules/mingw64/cOpt delete mode 100644 wmake/rules/mingw64/cProf delete mode 100644 wmake/rules/mingw64/general delete mode 100644 wmake/rules/mingw64/mplib delete mode 100644 wmake/rules/mingw64/mplibGAMMA delete mode 100644 wmake/rules/mingw64/mplibHPMPI delete mode 100644 wmake/rules/mingw64/mplibMPICH delete mode 100644 wmake/rules/mingw64/mplibMPICH-GM delete mode 100644 wmake/rules/mingw64/mplibOPENMPI delete mode 100644 wmake/rules/mingw64/mplibQSMPI delete mode 100644 wmake/rules/mingw64/mplibSYSTEMOPENMPI delete mode 100644 wmake/rules/mingw64/nvcc diff --git a/wmake/rules/mingw64/ARCHITECTURE_TESTED b/wmake/rules/mingw64/ARCHITECTURE_TESTED deleted file mode 100644 index fa5233266..000000000 --- a/wmake/rules/mingw64/ARCHITECTURE_TESTED +++ /dev/null @@ -1 +0,0 @@ -by bgschaid. 2010-10-06 on Centos 5.5 with gcc 4.1 diff --git a/wmake/rules/mingw64/X b/wmake/rules/mingw64/X deleted file mode 100644 index 5d1f9c5cc..000000000 --- a/wmake/rules/mingw64/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/mingw64/c b/wmake/rules/mingw64/c deleted file mode 100644 index a8e588f66..000000000 --- a/wmake/rules/mingw64/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC -Dmingw - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ - -LINK_LIBS = $(cDBUG) - -LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/mingw64/c++ b/wmake/rules/mingw64/c++ deleted file mode 100644 index 2692d673e..000000000 --- a/wmake/rules/mingw64/c++ +++ /dev/null @@ -1,22 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor - -CC = g++ - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-200 - -GFLAGS = -DWM_$(WM_PRECISION_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -I$(OPENMPI_DIR)/include -I$(WM_THIRD_PARTY_DIR)/packages/system/include -Dmingw -DBIG_ENDIAN=0 -DLITTLE_ENDIAN=1 -DBYTE_ORDER=BIG_ENDIAN - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) -L$(OPENMPI_DIR)/lib -lmpi -lpthread -lz -L$(WM_THIRD_PARTY_DIR)/packages/system/lib -ldl -lpsapi - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed $(FOAM_LIBBIN)/libOSspecific.o diff --git a/wmake/rules/mingw64/c++Debug b/wmake/rules/mingw64/c++Debug deleted file mode 100644 index 19bdb9c33..000000000 --- a/wmake/rules/mingw64/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/mingw64/c++Opt b/wmake/rules/mingw64/c++Opt deleted file mode 100644 index 3446f7f58..000000000 --- a/wmake/rules/mingw64/c++Opt +++ /dev/null @@ -1,4 +0,0 @@ -c++DBUG = -c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/mingw64/c++Prof b/wmake/rules/mingw64/c++Prof deleted file mode 100644 index 3bda4dad5..000000000 --- a/wmake/rules/mingw64/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/mingw64/cDebug b/wmake/rules/mingw64/cDebug deleted file mode 100644 index 72b638f45..000000000 --- a/wmake/rules/mingw64/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/mingw64/cOpt b/wmake/rules/mingw64/cOpt deleted file mode 100644 index 17318709f..000000000 --- a/wmake/rules/mingw64/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/mingw64/cProf b/wmake/rules/mingw64/cProf deleted file mode 100644 index ca3ac9bf5..000000000 --- a/wmake/rules/mingw64/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/mingw64/general b/wmake/rules/mingw64/general deleted file mode 100644 index 59e047a34..000000000 --- a/wmake/rules/mingw64/general +++ /dev/null @@ -1,11 +0,0 @@ -CPP = cpp -traditional-cpp -LD = ld - -PROJECT_LIBS = -l$(WM_PROJECT) -liberty - -include $(GENERAL_RULES)/standard - -include $(RULES)/X -include $(RULES)/c -include $(RULES)/c++ -include $(RULES)/nvcc diff --git a/wmake/rules/mingw64/mplib b/wmake/rules/mingw64/mplib deleted file mode 100644 index 294bd8615..000000000 --- a/wmake/rules/mingw64/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/mingw64/mplibGAMMA b/wmake/rules/mingw64/mplibGAMMA deleted file mode 100644 index 11606f298..000000000 --- a/wmake/rules/mingw64/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/mingw64/mplibHPMPI b/wmake/rules/mingw64/mplibHPMPI deleted file mode 100644 index 574492a23..000000000 --- a/wmake/rules/mingw64/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi diff --git a/wmake/rules/mingw64/mplibMPICH b/wmake/rules/mingw64/mplibMPICH deleted file mode 100644 index ad53c8d44..000000000 --- a/wmake/rules/mingw64/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich diff --git a/wmake/rules/mingw64/mplibMPICH-GM b/wmake/rules/mingw64/mplibMPICH-GM deleted file mode 100644 index 88493ebc7..000000000 --- a/wmake/rules/mingw64/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/mingw64/mplibOPENMPI b/wmake/rules/mingw64/mplibOPENMPI deleted file mode 100644 index 50018e30b..000000000 --- a/wmake/rules/mingw64/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(OPENMPI_DIR)/include -PLIBS = -L$(OPENMPI_DIR)/lib -lmpi diff --git a/wmake/rules/mingw64/mplibQSMPI b/wmake/rules/mingw64/mplibQSMPI deleted file mode 100644 index 807d20ab3..000000000 --- a/wmake/rules/mingw64/mplibQSMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/mingw64/mplibSYSTEMOPENMPI b/wmake/rules/mingw64/mplibSYSTEMOPENMPI deleted file mode 100644 index 98fa814ce..000000000 --- a/wmake/rules/mingw64/mplibSYSTEMOPENMPI +++ /dev/null @@ -1 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX diff --git a/wmake/rules/mingw64/nvcc b/wmake/rules/mingw64/nvcc deleted file mode 100644 index 9a04fe4d6..000000000 --- a/wmake/rules/mingw64/nvcc +++ /dev/null @@ -1,17 +0,0 @@ -.SUFFIXES: .cu - -NVCC = nvcc -arch $(CUDA_ARCH) - -NVCC_ptFLAGS = -DNoRepository - -NVCC_FLAGS = $(NVCC_ptFLAGS) -Xcompiler -fPIC $(LIB_HEADER_DIRS) $(GFLAGS) $(c++OPT) $(c++DBUG) - -cutoo = $(WM_SCHEDULER) $(NVCC) $(NVCC_FLAGS) -c $$SOURCE -o $@ - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed - -.cu.dep: - $(MAKE_DEP)