From 47409548ca41432571c772ceb0883acee23b749f Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 18 Mar 2014 15:24:50 +0000 Subject: [PATCH] COMP: wmake: removed gcc43,44. Added cgal compilation rules to gcc --- wmake/rules/linux64Gcc/c++ | 4 ++++ wmake/rules/linux64Gcc43/c | 16 ---------------- wmake/rules/linux64Gcc43/c++ | 21 --------------------- wmake/rules/linux64Gcc43/c++Debug | 2 -- wmake/rules/linux64Gcc43/c++Opt | 4 ---- wmake/rules/linux64Gcc43/c++Prof | 2 -- wmake/rules/linux64Gcc43/cDebug | 2 -- wmake/rules/linux64Gcc43/cOpt | 2 -- wmake/rules/linux64Gcc43/cProf | 2 -- wmake/rules/linux64Gcc43/general | 8 -------- wmake/rules/linux64Gcc43/mplibHPMPI | 3 --- wmake/rules/linux64Gcc43/mplibINTELMPI | 3 --- wmake/rules/linux64Gcc44/c | 16 ---------------- wmake/rules/linux64Gcc44/c++ | 21 --------------------- wmake/rules/linux64Gcc44/c++Debug | 2 -- wmake/rules/linux64Gcc44/c++Opt | 4 ---- wmake/rules/linux64Gcc44/c++Prof | 2 -- wmake/rules/linux64Gcc44/cDebug | 2 -- wmake/rules/linux64Gcc44/cOpt | 2 -- wmake/rules/linux64Gcc44/cProf | 2 -- wmake/rules/linux64Gcc44/general | 8 -------- wmake/rules/linux64Gcc44/mplibHPMPI | 3 --- wmake/rules/linux64Gcc44/mplibINTELMPI | 3 --- wmake/rules/linux64Gcc45/c++ | 6 +++++- wmake/rules/linux64Gcc46/c++ | 6 +++++- wmake/rules/linux64Gcc47/c++ | 6 +++++- wmake/rules/linux64Gcc48/c++ | 6 +++++- wmake/rules/linux64Gcc49/c++ | 6 +++++- wmake/rules/linuxGcc/c++ | 6 +++++- wmake/rules/linuxGcc43/c | 16 ---------------- wmake/rules/linuxGcc43/c++ | 21 --------------------- wmake/rules/linuxGcc43/c++Debug | 2 -- wmake/rules/linuxGcc43/c++Opt | 2 -- wmake/rules/linuxGcc43/c++Prof | 2 -- wmake/rules/linuxGcc43/cDebug | 2 -- wmake/rules/linuxGcc43/cOpt | 2 -- wmake/rules/linuxGcc43/cProf | 2 -- wmake/rules/linuxGcc43/general | 9 --------- wmake/rules/linuxGcc43/mplibHPMPI | 3 --- wmake/rules/linuxGcc44/c | 16 ---------------- wmake/rules/linuxGcc44/c++ | 21 --------------------- wmake/rules/linuxGcc44/c++Debug | 2 -- wmake/rules/linuxGcc44/c++Opt | 2 -- wmake/rules/linuxGcc44/c++Prof | 2 -- wmake/rules/linuxGcc44/cDebug | 2 -- wmake/rules/linuxGcc44/cOpt | 2 -- wmake/rules/linuxGcc44/cProf | 2 -- wmake/rules/linuxGcc44/general | 9 --------- wmake/rules/linuxGcc44/mplibHPMPI | 3 --- wmake/rules/linuxGcc45/c++ | 6 +++++- wmake/rules/linuxGcc46/c++ | 6 +++++- wmake/rules/linuxGcc47/c++ | 6 +++++- wmake/rules/linuxGcc48/c++ | 6 +++++- wmake/rules/linuxGcc49/c++ | 6 +++++- 54 files changed, 59 insertions(+), 263 deletions(-) delete mode 100644 wmake/rules/linux64Gcc43/c delete mode 100644 wmake/rules/linux64Gcc43/c++ delete mode 100644 wmake/rules/linux64Gcc43/c++Debug delete mode 100644 wmake/rules/linux64Gcc43/c++Opt delete mode 100644 wmake/rules/linux64Gcc43/c++Prof delete mode 100644 wmake/rules/linux64Gcc43/cDebug delete mode 100644 wmake/rules/linux64Gcc43/cOpt delete mode 100644 wmake/rules/linux64Gcc43/cProf delete mode 100644 wmake/rules/linux64Gcc43/general delete mode 100644 wmake/rules/linux64Gcc43/mplibHPMPI delete mode 100644 wmake/rules/linux64Gcc43/mplibINTELMPI delete mode 100644 wmake/rules/linux64Gcc44/c delete mode 100644 wmake/rules/linux64Gcc44/c++ delete mode 100644 wmake/rules/linux64Gcc44/c++Debug delete mode 100644 wmake/rules/linux64Gcc44/c++Opt delete mode 100644 wmake/rules/linux64Gcc44/c++Prof delete mode 100644 wmake/rules/linux64Gcc44/cDebug delete mode 100644 wmake/rules/linux64Gcc44/cOpt delete mode 100644 wmake/rules/linux64Gcc44/cProf delete mode 100644 wmake/rules/linux64Gcc44/general delete mode 100644 wmake/rules/linux64Gcc44/mplibHPMPI delete mode 100644 wmake/rules/linux64Gcc44/mplibINTELMPI delete mode 100644 wmake/rules/linuxGcc43/c delete mode 100644 wmake/rules/linuxGcc43/c++ delete mode 100644 wmake/rules/linuxGcc43/c++Debug delete mode 100644 wmake/rules/linuxGcc43/c++Opt delete mode 100644 wmake/rules/linuxGcc43/c++Prof delete mode 100644 wmake/rules/linuxGcc43/cDebug delete mode 100644 wmake/rules/linuxGcc43/cOpt delete mode 100644 wmake/rules/linuxGcc43/cProf delete mode 100644 wmake/rules/linuxGcc43/general delete mode 100644 wmake/rules/linuxGcc43/mplibHPMPI delete mode 100644 wmake/rules/linuxGcc44/c delete mode 100644 wmake/rules/linuxGcc44/c++ delete mode 100644 wmake/rules/linuxGcc44/c++Debug delete mode 100644 wmake/rules/linuxGcc44/c++Opt delete mode 100644 wmake/rules/linuxGcc44/c++Prof delete mode 100644 wmake/rules/linuxGcc44/cDebug delete mode 100644 wmake/rules/linuxGcc44/cOpt delete mode 100644 wmake/rules/linuxGcc44/cProf delete mode 100644 wmake/rules/linuxGcc44/general delete mode 100644 wmake/rules/linuxGcc44/mplibHPMPI diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++ index 3dfb033360..f83128a541 100644 --- a/wmake/rules/linux64Gcc/c++ +++ b/wmake/rules/linux64Gcc/c++ @@ -2,6 +2,10 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + + CC = g++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linux64Gcc43/c b/wmake/rules/linux64Gcc43/c deleted file mode 100644 index f4114be314..0000000000 --- a/wmake/rules/linux64Gcc43/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m64 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -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/linux64Gcc43/c++ b/wmake/rules/linux64Gcc43/c++ deleted file mode 100644 index 3ca193e296..0000000000 --- a/wmake/rules/linux64Gcc43/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m64 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-100 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linux64Gcc43/c++Debug b/wmake/rules/linux64Gcc43/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linux64Gcc43/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64Gcc43/c++Opt b/wmake/rules/linux64Gcc43/c++Opt deleted file mode 100644 index 3446f7f58c..0000000000 --- a/wmake/rules/linux64Gcc43/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/linux64Gcc43/c++Prof b/wmake/rules/linux64Gcc43/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linux64Gcc43/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linux64Gcc43/cDebug b/wmake/rules/linux64Gcc43/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linux64Gcc43/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linux64Gcc43/cOpt b/wmake/rules/linux64Gcc43/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linux64Gcc43/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linux64Gcc43/cProf b/wmake/rules/linux64Gcc43/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linux64Gcc43/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general deleted file mode 100644 index 243cb7d8c7..0000000000 --- a/wmake/rules/linux64Gcc43/general +++ /dev/null @@ -1,8 +0,0 @@ -CPP = cpp -traditional-cpp $(GFLAGS) - -PROJECT_LIBS = -l$(WM_PROJECT) -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linux64Gcc43/mplibHPMPI b/wmake/rules/linux64Gcc43/mplibHPMPI deleted file mode 100644 index 574492a236..0000000000 --- a/wmake/rules/linux64Gcc43/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/linux64Gcc43/mplibINTELMPI b/wmake/rules/linux64Gcc43/mplibINTELMPI deleted file mode 100644 index cf80ec2eaf..0000000000 --- a/wmake/rules/linux64Gcc43/mplibINTELMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include64 -PLIBS = -L$(MPI_ARCH_PATH)/lib64 -lmpi diff --git a/wmake/rules/linux64Gcc44/c b/wmake/rules/linux64Gcc44/c deleted file mode 100644 index f4114be314..0000000000 --- a/wmake/rules/linux64Gcc44/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m64 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -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/linux64Gcc44/c++ b/wmake/rules/linux64Gcc44/c++ deleted file mode 100644 index 3ca193e296..0000000000 --- a/wmake/rules/linux64Gcc44/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m64 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-100 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linux64Gcc44/c++Debug b/wmake/rules/linux64Gcc44/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linux64Gcc44/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64Gcc44/c++Opt b/wmake/rules/linux64Gcc44/c++Opt deleted file mode 100644 index 3446f7f58c..0000000000 --- a/wmake/rules/linux64Gcc44/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/linux64Gcc44/c++Prof b/wmake/rules/linux64Gcc44/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linux64Gcc44/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linux64Gcc44/cDebug b/wmake/rules/linux64Gcc44/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linux64Gcc44/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linux64Gcc44/cOpt b/wmake/rules/linux64Gcc44/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linux64Gcc44/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linux64Gcc44/cProf b/wmake/rules/linux64Gcc44/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linux64Gcc44/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general deleted file mode 100644 index 243cb7d8c7..0000000000 --- a/wmake/rules/linux64Gcc44/general +++ /dev/null @@ -1,8 +0,0 @@ -CPP = cpp -traditional-cpp $(GFLAGS) - -PROJECT_LIBS = -l$(WM_PROJECT) -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linux64Gcc44/mplibHPMPI b/wmake/rules/linux64Gcc44/mplibHPMPI deleted file mode 100644 index 574492a236..0000000000 --- a/wmake/rules/linux64Gcc44/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/linux64Gcc44/mplibINTELMPI b/wmake/rules/linux64Gcc44/mplibINTELMPI deleted file mode 100644 index cf80ec2eaf..0000000000 --- a/wmake/rules/linux64Gcc44/mplibINTELMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include64 -PLIBS = -L$(MPI_ARCH_PATH)/lib64 -lmpi diff --git a/wmake/rules/linux64Gcc45/c++ b/wmake/rules/linux64Gcc45/c++ index 98b25ed1fe..f83128a541 100644 --- a/wmake/rules/linux64Gcc45/c++ +++ b/wmake/rules/linux64Gcc45/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m64 diff --git a/wmake/rules/linux64Gcc46/c++ b/wmake/rules/linux64Gcc46/c++ index 98b25ed1fe..f83128a541 100644 --- a/wmake/rules/linux64Gcc46/c++ +++ b/wmake/rules/linux64Gcc46/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m64 diff --git a/wmake/rules/linux64Gcc47/c++ b/wmake/rules/linux64Gcc47/c++ index 98b25ed1fe..f83128a541 100644 --- a/wmake/rules/linux64Gcc47/c++ +++ b/wmake/rules/linux64Gcc47/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m64 diff --git a/wmake/rules/linux64Gcc48/c++ b/wmake/rules/linux64Gcc48/c++ index 98b25ed1fe..f83128a541 100644 --- a/wmake/rules/linux64Gcc48/c++ +++ b/wmake/rules/linux64Gcc48/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m64 diff --git a/wmake/rules/linux64Gcc49/c++ b/wmake/rules/linux64Gcc49/c++ index 98b25ed1fe..f83128a541 100644 --- a/wmake/rules/linux64Gcc49/c++ +++ b/wmake/rules/linux64Gcc49/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m64 diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++ index 357f4106e1..d5ce2516d4 100644 --- a/wmake/rules/linuxGcc/c++ +++ b/wmake/rules/linuxGcc/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m32 diff --git a/wmake/rules/linuxGcc43/c b/wmake/rules/linuxGcc43/c deleted file mode 100644 index d914fcd37d..0000000000 --- a/wmake/rules/linuxGcc43/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m32 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -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/linuxGcc43/c++ b/wmake/rules/linuxGcc43/c++ deleted file mode 100644 index e862181fc5..0000000000 --- a/wmake/rules/linuxGcc43/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m32 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-100 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linuxGcc43/c++Debug b/wmake/rules/linuxGcc43/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linuxGcc43/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxGcc43/c++Opt b/wmake/rules/linuxGcc43/c++Opt deleted file mode 100644 index 2aedabd628..0000000000 --- a/wmake/rules/linuxGcc43/c++Opt +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -c++OPT = -O3 diff --git a/wmake/rules/linuxGcc43/c++Prof b/wmake/rules/linuxGcc43/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linuxGcc43/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linuxGcc43/cDebug b/wmake/rules/linuxGcc43/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linuxGcc43/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxGcc43/cOpt b/wmake/rules/linuxGcc43/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linuxGcc43/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linuxGcc43/cProf b/wmake/rules/linuxGcc43/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linuxGcc43/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general deleted file mode 100644 index fa1eb5b925..0000000000 --- a/wmake/rules/linuxGcc43/general +++ /dev/null @@ -1,9 +0,0 @@ -CPP = cpp -traditional-cpp $(GFLAGS) -LD = ld -melf_i386 - -PROJECT_LIBS = -l$(WM_PROJECT) -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linuxGcc43/mplibHPMPI b/wmake/rules/linuxGcc43/mplibHPMPI deleted file mode 100644 index 8aff40632b..0000000000 --- a/wmake/rules/linuxGcc43/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi diff --git a/wmake/rules/linuxGcc44/c b/wmake/rules/linuxGcc44/c deleted file mode 100644 index d914fcd37d..0000000000 --- a/wmake/rules/linuxGcc44/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m32 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -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/linuxGcc44/c++ b/wmake/rules/linuxGcc44/c++ deleted file mode 100644 index e862181fc5..0000000000 --- a/wmake/rules/linuxGcc44/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m32 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-100 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linuxGcc44/c++Debug b/wmake/rules/linuxGcc44/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linuxGcc44/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxGcc44/c++Opt b/wmake/rules/linuxGcc44/c++Opt deleted file mode 100644 index 2aedabd628..0000000000 --- a/wmake/rules/linuxGcc44/c++Opt +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -c++OPT = -O3 diff --git a/wmake/rules/linuxGcc44/c++Prof b/wmake/rules/linuxGcc44/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linuxGcc44/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linuxGcc44/cDebug b/wmake/rules/linuxGcc44/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linuxGcc44/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxGcc44/cOpt b/wmake/rules/linuxGcc44/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linuxGcc44/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linuxGcc44/cProf b/wmake/rules/linuxGcc44/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linuxGcc44/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general deleted file mode 100644 index fa1eb5b925..0000000000 --- a/wmake/rules/linuxGcc44/general +++ /dev/null @@ -1,9 +0,0 @@ -CPP = cpp -traditional-cpp $(GFLAGS) -LD = ld -melf_i386 - -PROJECT_LIBS = -l$(WM_PROJECT) -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linuxGcc44/mplibHPMPI b/wmake/rules/linuxGcc44/mplibHPMPI deleted file mode 100644 index 8aff40632b..0000000000 --- a/wmake/rules/linuxGcc44/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi diff --git a/wmake/rules/linuxGcc45/c++ b/wmake/rules/linuxGcc45/c++ index 357f4106e1..d5ce2516d4 100644 --- a/wmake/rules/linuxGcc45/c++ +++ b/wmake/rules/linuxGcc45/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m32 diff --git a/wmake/rules/linuxGcc46/c++ b/wmake/rules/linuxGcc46/c++ index 357f4106e1..d5ce2516d4 100644 --- a/wmake/rules/linuxGcc46/c++ +++ b/wmake/rules/linuxGcc46/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m32 diff --git a/wmake/rules/linuxGcc47/c++ b/wmake/rules/linuxGcc47/c++ index 357f4106e1..d5ce2516d4 100644 --- a/wmake/rules/linuxGcc47/c++ +++ b/wmake/rules/linuxGcc47/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m32 diff --git a/wmake/rules/linuxGcc48/c++ b/wmake/rules/linuxGcc48/c++ index 357f4106e1..d5ce2516d4 100644 --- a/wmake/rules/linuxGcc48/c++ +++ b/wmake/rules/linuxGcc48/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m32 diff --git a/wmake/rules/linuxGcc49/c++ b/wmake/rules/linuxGcc49/c++ index 357f4106e1..d5ce2516d4 100644 --- a/wmake/rules/linuxGcc49/c++ +++ b/wmake/rules/linuxGcc49/c++ @@ -1,6 +1,10 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor + +# Suppress CGAL warnings +c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor + CC = g++ -m32