Merge commit 'origin/master' into splitCyclic

2025-11-28 03:28:01 +00:00 · 2010-04-30 15:10:10 +01:00
parent caf974fcfb 08916e83a2
commit 7f6740a9eb
1069 changed files with 14455 additions and 8251 deletions
--- a/wmake/rules/linux64Gcc/X
+++ b/wmake/rules/linux64Gcc/X
@ -1 +0,0 @@
-../General/X
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

 include $(GENERAL_RULES)/standard

-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
--- a/wmake/rules/linux64Gcc/mplib
+++ b/wmake/rules/linux64Gcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ b/wmake/rules/linux64Gcc/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ b/wmake/rules/linux64Gcc/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linux64Gcc/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linux64Gcc/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linux64Gcc/mplibQSMPI
+++ b/wmake/rules/linux64Gcc/mplibQSMPI
@ -1 +0,0 @@
-../General/mplibQSMPI
--- a/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI