From 1ff98caae026704c0a7dea059521f0e02083b18d Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 17 Jul 2022 00:07:16 +0200 Subject: [PATCH] add git submodule for api and penumbra --- .gitmodules | 6 +++++ MareAPI | 1 + MareSynchronos.sln | 36 ++++++++++++++-------------- MareSynchronos/MareSynchronos.csproj | 5 ---- Penumbra | 1 + 5 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 .gitmodules create mode 160000 MareAPI create mode 160000 Penumbra diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a9931b0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "MareAPI"] + path = MareAPI + url = https://github.com/Penumbra-Sync/api.git +[submodule "Penumbra"] + path = Penumbra + url = https://github.com/xivdev/Penumbra.git diff --git a/MareAPI b/MareAPI new file mode 160000 index 0000000..af8516d --- /dev/null +++ b/MareAPI @@ -0,0 +1 @@ +Subproject commit af8516d44a99d3a46e2a0de36c848732937f9c6a diff --git a/MareSynchronos.sln b/MareSynchronos.sln index cc723e3..d92ff59 100644 --- a/MareSynchronos.sln +++ b/MareSynchronos.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.1.32328.378 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos", "MareSynchronos\MareSynchronos.csproj", "{13C812E9-0D42-4B95-8646-40EEBF30636F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.GameData", "..\..\Penumbra\Penumbra.GameData\Penumbra.GameData.csproj", "{44F7CA6A-898C-4901-ADB8-010BC74FF781}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "..\server\MareSynchronosServer\MareSynchronos.API\MareSynchronos.API.csproj", "{4C92F86D-9C84-4F58-9C1A-671AEBACA256}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.GameData", "Penumbra\Penumbra.GameData\Penumbra.GameData.csproj", "{89DD407C-B2B7-4BB3-BF26-C550BA1841F8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,22 +25,22 @@ Global {13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|Any CPU.Build.0 = Release|x64 {13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.ActiveCfg = Release|x64 {13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.Build.0 = Release|x64 - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Debug|x64.ActiveCfg = Debug|Any CPU - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Debug|x64.Build.0 = Debug|Any CPU - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Release|Any CPU.Build.0 = Release|Any CPU - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Release|x64.ActiveCfg = Release|Any CPU - {44F7CA6A-898C-4901-ADB8-010BC74FF781}.Release|x64.Build.0 = Release|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Debug|x64.ActiveCfg = Debug|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Debug|x64.Build.0 = Debug|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Release|Any CPU.Build.0 = Release|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Release|x64.ActiveCfg = Release|Any CPU - {4C92F86D-9C84-4F58-9C1A-671AEBACA256}.Release|x64.Build.0 = Release|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Debug|x64.ActiveCfg = Debug|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Debug|x64.Build.0 = Debug|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Release|Any CPU.Build.0 = Release|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Release|x64.ActiveCfg = Release|Any CPU + {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Release|x64.Build.0 = Release|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Debug|x64.ActiveCfg = Debug|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Debug|x64.Build.0 = Debug|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Release|Any CPU.Build.0 = Release|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Release|x64.ActiveCfg = Release|Any CPU + {89DD407C-B2B7-4BB3-BF26-C550BA1841F8}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 7be8699..ddcf69d 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -31,11 +31,6 @@ - - - - - $(DalamudLibPath)FFXIVClientStructs.dll diff --git a/Penumbra b/Penumbra new file mode 160000 index 0000000..cfc441b --- /dev/null +++ b/Penumbra @@ -0,0 +1 @@ +Subproject commit cfc441b9b1acaaf1bf2da758bd875cfb5229ab60