diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..354d454 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "SubModules/Fasm.NET"] + path = SubModules/Fasm.NET + url = https://github.com/ZenLulz/Fasm.NET.git diff --git a/MemorySharp.sln b/MemorySharp.sln index 44a8c57..434c924 100644 --- a/MemorySharp.sln +++ b/MemorySharp.sln @@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fasm.NET", "SubModules\Fasm.NET\Fasm.NET\Fasm.NET.vcxproj", "{2DAC1A31-EF28-499A-B67A-963B5343D778}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -50,6 +52,18 @@ Global {E3EFE942-113F-46AA-9CF4-A51473D9E8B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {E3EFE942-113F-46AA-9CF4-A51473D9E8B8}.Release|Win32.ActiveCfg = Release|Any CPU {E3EFE942-113F-46AA-9CF4-A51473D9E8B8}.Release|x64.ActiveCfg = Release|Any CPU + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Debug|Win32.ActiveCfg = Debug|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Debug|Win32.Build.0 = Debug|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Debug|x64.ActiveCfg = Debug|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Release|Any CPU.ActiveCfg = Release|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Release|Win32.ActiveCfg = Release|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Release|Win32.Build.0 = Release|Win32 + {2DAC1A31-EF28-499A-B67A-963B5343D778}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MemorySharp/MemorySharp.csproj b/MemorySharp/MemorySharp.csproj index a1315af..7c4c40a 100644 --- a/MemorySharp/MemorySharp.csproj +++ b/MemorySharp/MemorySharp.csproj @@ -51,9 +51,6 @@ MinimumRecommendedRules.ruleset - - ..\Libraries\Fasm.NET.dll - @@ -120,6 +117,12 @@ + + + {2dac1a31-ef28-499a-b67a-963b5343d778} + Fasm.NET + +