improve cross complation configuration

8 files changed, 72 insertions, 55 deletions

diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua
index 1a1c0b2a3..a368375f3 100644
--- a/xmake/languages/asm/xmake.lua
+++ b/xmake/languages/asm/xmake.lua
@@ -118,22 +118,26 @@ language("asm")
     set_menu {
                 config = 
                 {   
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/Asm"       }
-                ,   {nil, "as",         "kv", nil,          "The Assembler"                                  }
-                ,   {nil, "ar",         "kv", nil,          "The Static Library Linker"                      }
-                ,   {nil, "ld",         "kv", nil,          "The Linker"                                     }
-                ,   {nil, "sh",         "kv", nil,          "The Shared Library Linker"                      }
+                    {category = "Cross Complation Configuration/Compiler Configuration"       }
+                ,   {nil, "as",         "kv", nil,          "The Assembler"                   }
 
-                ,   {category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/Asm" }
-                ,   {nil, "asflags",    "kv", nil,          "The Assembler Flags"                            }
-                ,   {nil, "ldflags",    "kv", nil,          "The Binary Linker Flags"                        }
-                ,   {nil, "arflags",    "kv", nil,          "The Static Library Linker Flags"                }
-                ,   {nil, "shflags",    "kv", nil,          "The Shared Library Linker Flags"                }
+                ,   {category = "Cross Complation Configuration/Linker Configuration"         }
+                ,   {nil, "ar",         "kv", nil,          "The Static Library Linker"       }
+                ,   {nil, "ld",         "kv", nil,          "The Linker"                      }
+                ,   {nil, "sh",         "kv", nil,          "The Shared Library Linker"       }
 
-                ,   {                                                                                        }
-                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                             }
-                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"                    }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"                 }
+                ,   {category = "Cross Complation Configuration/Compiler Flags Configuration" }
+                ,   {nil, "asflags",    "kv", nil,          "The Assembler Flags"             }
+
+                ,   {category = "Cross Complation Configuration/Linker Flags Configuration"   }
+                ,   {nil, "ldflags",    "kv", nil,          "The Binary Linker Flags"         }
+                ,   {nil, "arflags",    "kv", nil,          "The Static Library Linker Flags" }
+                ,   {nil, "shflags",    "kv", nil,          "The Shared Library Linker Flags" }
+
+                ,   {category = "Cross Complation Configuration/Builin Flags Configuration"   }
+                ,   {nil, "links",      "kv", nil,          "The Link Libraries"              }
+                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"     }
+                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"  }
                 }
             }
 
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua
index 110d2dcb1..f96fcfd14 100644
--- a/xmake/languages/c++/xmake.lua
+++ b/xmake/languages/c++/xmake.lua
@@ -147,29 +147,32 @@ language("c++")
     set_menu {
                 config = 
                 {   
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/C++"              }
+                    {category = "Cross Complation Configuration/Compiler Configuration"                             }
                 ,   {nil, "cc",            "kv", nil,          "The C Compiler"                                     }
                 ,   {nil, "cxx",           "kv", nil,          "The C++ Compiler"                                   }
+
+                ,   {category = "Cross Complation Configuration/Linker Configuration"                               }
                 ,   {nil, "ld",            "kv", nil,          "The Linker"                                         }
                 ,   {nil, "ar",            "kv", nil,          "The Static Library Linker"                          }
                 ,   {nil, "sh",            "kv", nil,          "The Shared Library Linker"                          }
 
-                ,   {category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/C++"        }
+                ,   {category = "Cross Complation Configuration/Compiler Flags Configuration"                       }
                 ,   {nil, "cflags",        "kv", nil,          "The C Compiler Flags"                               }
                 ,   {nil, "cxflags",       "kv", nil,          "The C/C++ compiler Flags"                           }
                 ,   {nil, "cxxflags",      "kv", nil,          "The C++ Compiler Flags"                             }
 
-                ,   {                                                                                               }
+                ,   {category = "Cross Complation Configuration/Linker Flags Configuration"                         }
                 ,   {nil, "ldflags",       "kv", nil,          "The Binary Linker Flags"                            }
                 ,   {nil, "arflags",       "kv", nil,          "The Static Library Linker Flags"                    }
                 ,   {nil, "shflags",       "kv", nil,          "The Shared Library Linker Flags"                    }
-                ,   {                                                                                               }
+
+                ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"                        }
                 ,   {nil, "links",         "kv", nil,          "The Link Libraries"                                 }
                 ,   {nil, "linkdirs",      "kv", nil,          "The Link Search Directories"                        }
                 ,   {nil, "includedirs",   "kv", nil,          "The Include Search Directories"                     }
                 ,   {nil, "frameworks",    "kv", nil,          "The Include and Link Frameworks"                    }
                 ,   {nil, "frameworkdirs", "kv", nil,          "The Include and Link Frameworks Search Directories" }
-                                                                                                                    }
+                }
             }
 
 
diff --git a/xmake/languages/dlang/xmake.lua b/xmake/languages/dlang/xmake.lua
index 07aefcba4..3987bb992 100644
--- a/xmake/languages/dlang/xmake.lua
+++ b/xmake/languages/dlang/xmake.lua
@@ -102,16 +102,18 @@ language("dlang")
     set_menu {
                 config = 
                 {   
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/D"       }
-                ,   {nil, "dc",         "kv", nil,          "The Dlang Compiler"                           }
-                ,   {nil, "dc-ld",      "kv", nil,          "The Dlang Linker"                             }
-                ,   {nil, "dc-ar",      "kv", nil,          "The Dlang Static Library Archiver"            }
-                ,   {nil, "dc-sh",      "kv", nil,          "The Dlang Shared Library Linker"              }
+                    {category = "Cross Complation Configuration/Compiler Configuration"         }
+                ,   {nil, "dc",         "kv", nil,          "The Dlang Compiler"                }
 
-                ,   {category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/D" }
-                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                           }
-                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"                  }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"               }
+                ,   {category = "Cross Complation Configuration/Linker Configuration"           }
+                ,   {nil, "dc-ld",      "kv", nil,          "The Dlang Linker"                  }
+                ,   {nil, "dc-ar",      "kv", nil,          "The Dlang Static Library Archiver" }
+                ,   {nil, "dc-sh",      "kv", nil,          "The Dlang Shared Library Linker"   }
+
+                ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"    }
+                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                }
+                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"       }
+                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"    }
                 }
             } 
 
diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua
index 2a4d7a70d..38c9d4d97 100644
--- a/xmake/languages/golang/xmake.lua
+++ b/xmake/languages/golang/xmake.lua
@@ -98,15 +98,17 @@ language("golang")
     set_menu {
                 config = 
                 {   
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/Go"       }
-                ,   {nil, "go",         "kv", nil,          "The Golang Compiler"                           }
-                ,   {nil, "gc-ld",      "kv", nil,          "The Golang Linker"                             }
-                ,   {nil, "go-ar",      "kv", nil,          "The Golang Static Library Linker"              }
+                    {category = "Cross Complation Configuration/Compiler Configuration"        }
+                ,   {nil, "go",         "kv", nil,          "The Golang Compiler"              }
 
-                ,   {category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/Go" }
-                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                            }
-                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"                   }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"                }
+                ,   {category = "Cross Complation Configuration/Linker Configuration"          }
+                ,   {nil, "gc-ld",      "kv", nil,          "The Golang Linker"                }
+                ,   {nil, "go-ar",      "kv", nil,          "The Golang Static Library Linker" }
+
+                ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"   }
+                ,   {nil, "links",      "kv", nil,          "The Link Libraries"               }
+                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"      }
+                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"   }
                 }
             }
 
diff --git a/xmake/languages/msrc/xmake.lua b/xmake/languages/msrc/xmake.lua
index 8be2990ec..6d347c55b 100644
--- a/xmake/languages/msrc/xmake.lua
+++ b/xmake/languages/msrc/xmake.lua
@@ -63,14 +63,14 @@ language("msrc")
     set_menu {
                 config = 
                 {   
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/MSRC"       }
-                ,   {nil, "mrc",        "kv", nil,          "The Microsoft Resource Compiler"                 }
+                    {category = "Cross Complation Configuration/Compiler Configuration"       }
+                ,   {nil, "mrc",        "kv", nil,          "The Microsoft Resource Compiler" }
 
-                ,   {category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/MSRC" }
-                ,   {nil, "mrcflags",   "kv", nil,          "The Microsoft Resource Flags"                    }
+                ,   {category = "Cross Complation Configuration/Compiler Flags Configuration" }
+                ,   {nil, "mrcflags",   "kv", nil,          "The Microsoft Resource Flags"    }
 
-                ,   {                                                                                         }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"                  }
+                ,   {category = "Cross Complation Configuration/Builti Flags Configuration"   }
+                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"  }
                 }
             } 
 
diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua
index 8362dd254..cfb26e528 100644
--- a/xmake/languages/objc++/xmake.lua
+++ b/xmake/languages/objc++/xmake.lua
@@ -147,24 +147,26 @@ language("objc++")
     set_menu {
                 config = 
                 {   
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/Objc++"           }
+                    {category = "Cross Complation Configuration/Compiler Configuration"                             }
                 ,   {nil, "mm",            "kv", nil,          "The Objc Compiler"                                  }
                 ,   {nil, "mxx",           "kv", nil,          "The Objc++ Compiler"                                }
+
+                ,   {category = "Cross Complation Configuration/Linker Configuration"                               }
                 ,   {nil, "ld",            "kv", nil,          "The Linker"                                         }
                 ,   {nil, "ar",            "kv", nil,          "The Static Library Linker"                          }
                 ,   {nil, "sh",            "kv", nil,          "The Shared Library Linker"                          }
 
-                ,   {category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/Objc++"     }
+                ,   {category = "Cross Complation Configuration/Compiler Flags Configuration"                       }
                 ,   {nil, "mflags",        "kv", nil,          "The Objc Compiler Flags"                            }
                 ,   {nil, "mxflags",       "kv", nil,          "The Objc/c++ Compiler Flags"                        }
                 ,   {nil, "mxxflags",      "kv", nil,          "The Objc++ Compiler Flags"                          }
 
-                ,   {                                                                                               }
+                ,   {category = "Cross Complation Configuration/Linker Flags Configuration"                         }
                 ,   {nil, "ldflags",       "kv", nil,          "The Binary Linker Flags"                            }
                 ,   {nil, "arflags",       "kv", nil,          "The Static Library Linker Flags"                    }
                 ,   {nil, "shflags",       "kv", nil,          "The Shared Library Linker Flags"                    }
 
-                ,   {                                                                                               }
+                ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"                        }
                 ,   {nil, "links",         "kv", nil,          "The Link Libraries"                                 }
                 ,   {nil, "linkdirs",      "kv", nil,          "The Link Search Directories"                        }
                 ,   {nil, "includedirs",   "kv", nil,          "The Include Search Directories"                     }
diff --git a/xmake/languages/rust/xmake.lua b/xmake/languages/rust/xmake.lua
index 5b01d45de..3d7c9a4ad 100644
--- a/xmake/languages/rust/xmake.lua
+++ b/xmake/languages/rust/xmake.lua
@@ -91,14 +91,16 @@ language("rust")
     set_menu {
                 config = 
                 {   
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/Rust"       }
-                ,   {nil, "rc",         "kv", nil,          "The Rust Compiler"                               }
-                ,   {nil, "rc-ld",      "kv", nil,          "The Rust Linker"                                 }
-                ,   {nil, "rc-ar",      "kv", nil,          "The Rust Static Library Archiver"                }
-                ,   {nil, "rc-sh",      "kv", nil,          "The Rust Shared Library Linker"                  }
+                    {category = "Cross Complation Configuration/Compiler Configuration"        }
+                ,   {nil, "rc",         "kv", nil,          "The Rust Compiler"                }
 
-                ,   {category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/Rust" }
-                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"                     }
+                ,   {category = "Cross Complation Configuration/Linker Configuration"          }
+                ,   {nil, "rc-ld",      "kv", nil,          "The Rust Linker"                  }
+                ,   {nil, "rc-ar",      "kv", nil,          "The Rust Static Library Archiver" }
+                ,   {nil, "rc-sh",      "kv", nil,          "The Rust Shared Library Linker"   }
+
+                ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"   }
+                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"      }
                 }
             } 
 
diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua
index f757ec38e..f392831c4 100644
--- a/xmake/languages/swift/xmake.lua
+++ b/xmake/languages/swift/xmake.lua
@@ -142,12 +142,14 @@ language("swift")
     set_menu {
                 config = 
                 {
-                    {category = "Cross Complation Configuration/Compiler and Linker Configuration/Swift"             }
+                    {category = "Cross Complation Configuration/Compiler Configuration"                              }
                 ,   { nil, "sc",            "kv", nil,          "The Swift Compiler"                                 }
+
+                ,   {category = "Cross Complation Configuration/Linker Configuration"                                }
                 ,   { nil, "sc-ld",         "kv", nil,          "The Swift Linker"                                   }
                 ,   { nil, "sc-sh",         "kv", nil,          "The Swift Shared Library Linker"                    }
 
-                ,   { category = "Cross Complation Configuration/Compiler and Linker Flags Configuration/Swift"      }
+                ,   { category = "Cross Complation Configuration/Builtin Flags Configuration"                        }
                 ,   { nil, "links",         "kv", nil,          "The Link Libraries"                                 }
                 ,   { nil, "linkdirs",      "kv", nil,          "The Link Search Directories"                        }
                 ,   { nil, "includedirs",   "kv", nil,          "The Include Search Directories"                     }