mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-24 20:35:28 +00:00
Better handling of Enums namespace/nested class.
This commit is contained in:
parent
b2e838a33f
commit
b9afd64b0a
|
@ -26,14 +26,17 @@ namespace Bind
|
||||||
public static string ConstantPrefix = "GL_";
|
public static string ConstantPrefix = "GL_";
|
||||||
|
|
||||||
// TODO: This code is too fragile.
|
// TODO: This code is too fragile.
|
||||||
private static string normalEnumsClassOverride;
|
// Old enums code:
|
||||||
|
public static string normalEnumsClassOverride;
|
||||||
public static string NestedEnumsClass = "Enums";
|
public static string NestedEnumsClass = "Enums";
|
||||||
public static string NormalEnumsClass
|
public static string NormalEnumsClass
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return String.IsNullOrEmpty(NestedEnumsClass) ? OutputClass :
|
return
|
||||||
OutputClass + "." + NestedEnumsClass;
|
normalEnumsClassOverride == null ?
|
||||||
|
String.IsNullOrEmpty(NestedEnumsClass) ? OutputClass : OutputClass + "." + NestedEnumsClass :
|
||||||
|
normalEnumsClassOverride;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +45,31 @@ namespace Bind
|
||||||
get { return GLClass + "." + NestedEnumsClass; }
|
get { return GLClass + "." + NestedEnumsClass; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string EnumsOutput
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if ((Settings.Compatibility & Settings.Legacy.NestedEnums) != Settings.Legacy.None)
|
||||||
|
return OutputNamespace + "." + OutputClass + "." + NestedEnumsClass;
|
||||||
|
else
|
||||||
|
return OutputNamespace + "." + EnumsNamespace;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string EnumsAuxOutput
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if ((Settings.Compatibility & Settings.Legacy.NestedEnums) != Settings.Legacy.None)
|
||||||
|
return OutputNamespace + "." + GLClass + "." + NestedEnumsClass;
|
||||||
|
else
|
||||||
|
return OutputNamespace + "." + EnumsNamespace;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// New enums namespace (no nested class).
|
||||||
|
public static string EnumsNamespace = "Enums";
|
||||||
|
|
||||||
public static string DelegatesClass = "Delegates";
|
public static string DelegatesClass = "Delegates";
|
||||||
public static string ImportsClass = "Imports";
|
public static string ImportsClass = "Imports";
|
||||||
|
|
||||||
|
@ -64,6 +92,7 @@ namespace Bind
|
||||||
NoSeparateFunctionNamespaces = 0x10,
|
NoSeparateFunctionNamespaces = 0x10,
|
||||||
TurnVoidPointersToIntPtr = 0x20,
|
TurnVoidPointersToIntPtr = 0x20,
|
||||||
GenerateAllPermutations = 0x40,
|
GenerateAllPermutations = 0x40,
|
||||||
|
NestedEnums = 0x80,
|
||||||
Tao = ConstIntEnums | NoAdvancedEnumProcessing | NoPublicUnsafeFunctions | NoTrimFunctionEnding | NoTrimFunctionPrefix | NoSeparateFunctionNamespaces | TurnVoidPointersToIntPtr | GenerateAllPermutations,
|
Tao = ConstIntEnums | NoAdvancedEnumProcessing | NoPublicUnsafeFunctions | NoTrimFunctionEnding | NoTrimFunctionPrefix | NoSeparateFunctionNamespaces | TurnVoidPointersToIntPtr | GenerateAllPermutations,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue