Added support for gcc-5.0.0

Tested with snapshot gcc-5-20150215.tar.bz2
2025-11-28 03:28:01 +00:00 · 2015-02-23 08:44:18 +00:00
parent f6e868e1f7
commit 88b6f63bb3
122 changed files with 43 additions and 685 deletions
--- a/wmake/rules/General/coco-cpp
+++ b/wmake/rules/General/coco-cpp
@ -1,12 +0,0 @@
-# handle Coco/R attributed grammars written for the C++ version
-#     http://www.ssw.uni-linz.ac.at/Coco/
-#     http://github.com/olesenm/coco-cpp/
-#
-
-SUFFIXES += .atg
-
-atgtoo =  \
-    $(WM_THIRD_PARTY_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)/coco-cpp/bin/coco-cpp \
-    -single \
-    $< -o $(OBJECTS_DIR) && \
-    $(CC) $(c++FLAGS) -c $(@D)/$(<F).cpp -o $@
--- a/wmake/rules/General/standard
+++ b/wmake/rules/General/standard
@ -5,7 +5,6 @@ SUFFIXES=
 include $(GENERAL_RULES)/version
 include $(GENERAL_RULES)/flex
 include $(GENERAL_RULES)/flex++
-## include $(GENERAL_RULES)/coco-cpp
 ## include $(GENERAL_RULES)/byacc
 ## include $(GENERAL_RULES)/btyacc++
 include $(GENERAL_RULES)/bison
--- a/wmake/rules/linux64Gcc/cOpt
+++ b/wmake/rules/linux64Gcc/cOpt
@ -1,3 +1,2 @@
 cDBUG       =
 cOPT        = -O3
-# -fprefetch-loop-arrays
--- a/wmake/rules/linux64Gcc45
+++ b/wmake/rules/linux64Gcc45
@ -0,0 +1 @@
+linux64Gcc
--- a/wmake/rules/linux64Gcc45/c
+++ b/wmake/rules/linux64Gcc45/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linux64Gcc45/c++
+++ b/wmake/rules/linux64Gcc45/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# 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)
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linux64Gcc45/c++Debug
+++ b/wmake/rules/linux64Gcc45/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linux64Gcc45/c++Opt
+++ b/wmake/rules/linux64Gcc45/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linux64Gcc45/c++Prof
+++ b/wmake/rules/linux64Gcc45/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linux64Gcc45/cDebug
+++ b/wmake/rules/linux64Gcc45/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linux64Gcc45/cOpt
+++ b/wmake/rules/linux64Gcc45/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linux64Gcc45/cProf
+++ b/wmake/rules/linux64Gcc45/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linux64Gcc45/general
+++ b/wmake/rules/linux64Gcc45/general
@ -1,8 +0,0 @@
-CPP        = cpp -traditional-cpp
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linux64Gcc45/mplibHPMPI
+++ b/wmake/rules/linux64Gcc45/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
--- a/wmake/rules/linux64Gcc45/mplibINTELMPI
+++ b/wmake/rules/linux64Gcc45/mplibINTELMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
--- a/wmake/rules/linux64Gcc46
+++ b/wmake/rules/linux64Gcc46
@ -0,0 +1 @@
+linux64Gcc
--- a/wmake/rules/linux64Gcc46/c
+++ b/wmake/rules/linux64Gcc46/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linux64Gcc46/c++
+++ b/wmake/rules/linux64Gcc46/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# 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)
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linux64Gcc46/c++Debug
+++ b/wmake/rules/linux64Gcc46/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linux64Gcc46/c++Opt
+++ b/wmake/rules/linux64Gcc46/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linux64Gcc46/c++Prof
+++ b/wmake/rules/linux64Gcc46/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linux64Gcc46/cDebug
+++ b/wmake/rules/linux64Gcc46/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linux64Gcc46/cOpt
+++ b/wmake/rules/linux64Gcc46/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linux64Gcc46/cProf
+++ b/wmake/rules/linux64Gcc46/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linux64Gcc46/general
+++ b/wmake/rules/linux64Gcc46/general
@ -1,8 +0,0 @@
-CPP        = cpp -traditional-cpp
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linux64Gcc46/mplibHPMPI
+++ b/wmake/rules/linux64Gcc46/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
--- a/wmake/rules/linux64Gcc46/mplibINTELMPI
+++ b/wmake/rules/linux64Gcc46/mplibINTELMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
--- a/wmake/rules/linux64Gcc47
+++ b/wmake/rules/linux64Gcc47
@ -0,0 +1 @@
+linux64Gcc
--- a/wmake/rules/linux64Gcc47/c
+++ b/wmake/rules/linux64Gcc47/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linux64Gcc47/c++
+++ b/wmake/rules/linux64Gcc47/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# 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)
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linux64Gcc47/c++Debug
+++ b/wmake/rules/linux64Gcc47/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linux64Gcc47/c++Opt
+++ b/wmake/rules/linux64Gcc47/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linux64Gcc47/c++Prof
+++ b/wmake/rules/linux64Gcc47/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linux64Gcc47/cDebug
+++ b/wmake/rules/linux64Gcc47/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linux64Gcc47/cOpt
+++ b/wmake/rules/linux64Gcc47/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linux64Gcc47/cProf
+++ b/wmake/rules/linux64Gcc47/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linux64Gcc47/general
+++ b/wmake/rules/linux64Gcc47/general
@ -1,8 +0,0 @@
-CPP        = cpp -traditional-cpp
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linux64Gcc47/mplibHPMPI
+++ b/wmake/rules/linux64Gcc47/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
--- a/wmake/rules/linux64Gcc47/mplibINTELMPI
+++ b/wmake/rules/linux64Gcc47/mplibINTELMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
--- a/wmake/rules/linux64Gcc48
+++ b/wmake/rules/linux64Gcc48
@ -0,0 +1 @@
+linux64Gcc
--- a/wmake/rules/linux64Gcc48/c
+++ b/wmake/rules/linux64Gcc48/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linux64Gcc48/c++
+++ b/wmake/rules/linux64Gcc48/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# 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)
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linux64Gcc48/c++Debug
+++ b/wmake/rules/linux64Gcc48/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linux64Gcc48/c++Opt
+++ b/wmake/rules/linux64Gcc48/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linux64Gcc48/c++Prof
+++ b/wmake/rules/linux64Gcc48/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linux64Gcc48/cDebug
+++ b/wmake/rules/linux64Gcc48/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linux64Gcc48/cOpt
+++ b/wmake/rules/linux64Gcc48/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linux64Gcc48/cProf
+++ b/wmake/rules/linux64Gcc48/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linux64Gcc48/general
+++ b/wmake/rules/linux64Gcc48/general
@ -1,8 +0,0 @@
-CPP        = cpp -traditional-cpp
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linux64Gcc48/mplibHPMPI
+++ b/wmake/rules/linux64Gcc48/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
--- a/wmake/rules/linux64Gcc48/mplibINTELMPI
+++ b/wmake/rules/linux64Gcc48/mplibINTELMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
--- a/wmake/rules/linux64Gcc49
+++ b/wmake/rules/linux64Gcc49
@ -0,0 +1 @@
+linux64Gcc
--- a/wmake/rules/linux64Gcc49/c
+++ b/wmake/rules/linux64Gcc49/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linux64Gcc49/c++
+++ b/wmake/rules/linux64Gcc49/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# 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)
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linux64Gcc49/c++Debug
+++ b/wmake/rules/linux64Gcc49/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linux64Gcc49/c++Opt
+++ b/wmake/rules/linux64Gcc49/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linux64Gcc49/c++Prof
+++ b/wmake/rules/linux64Gcc49/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linux64Gcc49/cDebug
+++ b/wmake/rules/linux64Gcc49/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linux64Gcc49/cOpt
+++ b/wmake/rules/linux64Gcc49/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linux64Gcc49/cProf
+++ b/wmake/rules/linux64Gcc49/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linux64Gcc49/general
+++ b/wmake/rules/linux64Gcc49/general
@ -1,8 +0,0 @@
-CPP        = cpp -traditional-cpp
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linux64Gcc49/mplibHPMPI
+++ b/wmake/rules/linux64Gcc49/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
--- a/wmake/rules/linux64Gcc49/mplibINTELMPI
+++ b/wmake/rules/linux64Gcc49/mplibINTELMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
--- a/wmake/rules/linux64Gcc50
+++ b/wmake/rules/linux64Gcc50
@ -0,0 +1 @@
+linux64Gcc
--- a/wmake/rules/linuxGcc45
+++ b/wmake/rules/linuxGcc45
@ -0,0 +1 @@
+linuxGcc
--- a/wmake/rules/linuxGcc45/c
+++ b/wmake/rules/linuxGcc45/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linuxGcc45/c++
+++ b/wmake/rules/linuxGcc45/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# Suppress CGAL warnings
-c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linuxGcc45/c++Debug
+++ b/wmake/rules/linuxGcc45/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linuxGcc45/c++Opt
+++ b/wmake/rules/linuxGcc45/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linuxGcc45/c++Prof
+++ b/wmake/rules/linuxGcc45/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linuxGcc45/cDebug
+++ b/wmake/rules/linuxGcc45/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linuxGcc45/cOpt
+++ b/wmake/rules/linuxGcc45/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linuxGcc45/cProf
+++ b/wmake/rules/linuxGcc45/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linuxGcc45/general
+++ b/wmake/rules/linuxGcc45/general
@ -1,9 +0,0 @@
-CPP        = cpp -traditional-cpp
-LD         = ld -melf_i386
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linuxGcc45/mplibHPMPI
+++ b/wmake/rules/linuxGcc45/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
--- a/wmake/rules/linuxGcc46
+++ b/wmake/rules/linuxGcc46
@ -0,0 +1 @@
+linuxGcc
--- a/wmake/rules/linuxGcc46/c
+++ b/wmake/rules/linuxGcc46/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linuxGcc46/c++
+++ b/wmake/rules/linuxGcc46/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# Suppress CGAL warnings
-c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linuxGcc46/c++Debug
+++ b/wmake/rules/linuxGcc46/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linuxGcc46/c++Opt
+++ b/wmake/rules/linuxGcc46/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linuxGcc46/c++Prof
+++ b/wmake/rules/linuxGcc46/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linuxGcc46/cDebug
+++ b/wmake/rules/linuxGcc46/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linuxGcc46/cOpt
+++ b/wmake/rules/linuxGcc46/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linuxGcc46/cProf
+++ b/wmake/rules/linuxGcc46/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linuxGcc46/general
+++ b/wmake/rules/linuxGcc46/general
@ -1,9 +0,0 @@
-CPP        = cpp -traditional-cpp
-LD         = ld -melf_i386
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linuxGcc46/mplibHPMPI
+++ b/wmake/rules/linuxGcc46/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
--- a/wmake/rules/linuxGcc47
+++ b/wmake/rules/linuxGcc47
@ -0,0 +1 @@
+linuxGcc
--- a/wmake/rules/linuxGcc47/c
+++ b/wmake/rules/linuxGcc47/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linuxGcc47/c++
+++ b/wmake/rules/linuxGcc47/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# Suppress CGAL warnings
-c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/wmake/rules/linuxGcc47/c++Debug
+++ b/wmake/rules/linuxGcc47/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linuxGcc47/c++Opt
+++ b/wmake/rules/linuxGcc47/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-
-ROUNDING_MATH = -frounding-math
--- a/wmake/rules/linuxGcc47/c++Prof
+++ b/wmake/rules/linuxGcc47/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/linuxGcc47/cDebug
+++ b/wmake/rules/linuxGcc47/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linuxGcc47/cOpt
+++ b/wmake/rules/linuxGcc47/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/linuxGcc47/cProf
+++ b/wmake/rules/linuxGcc47/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/linuxGcc47/general
+++ b/wmake/rules/linuxGcc47/general
@ -1,9 +0,0 @@
-CPP        = cpp -traditional-cpp
-LD         = ld -melf_i386
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/c
-include $(RULES)/c++
--- a/wmake/rules/linuxGcc47/mplibHPMPI
+++ b/wmake/rules/linuxGcc47/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
--- a/wmake/rules/linuxGcc48
+++ b/wmake/rules/linuxGcc48
@ -0,0 +1 @@
+linuxGcc
--- a/wmake/rules/linuxGcc48/c
+++ b/wmake/rules/linuxGcc48/c
@ -1,16 +0,0 @@
-SUFFIXES += .c
-
-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 $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
--- a/wmake/rules/linuxGcc48/c++
+++ b/wmake/rules/linuxGcc48/c++
@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
-
-# Suppress CGAL warnings
-c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor
-
-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 $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-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
--- a/Show More
+++ b/Show More