Merge branch 'redm'

TomGrobbe · Nov 21, 2019 · 0fecc2c · 0fecc2c
2 parents aa919da + fe52996
commit 0fecc2c
Show file tree

Hide file tree

Showing 13 changed files with 1,737 additions and 187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -262,3 +262,7 @@ __pycache__/
 dependencies/MenuAPI\.net\.dll
 
 postbuild\.cmd
+
+postbuild-fivem.cmd
+
+postbuild-redm.cmd
diff --git a/MenuAPI/Menu.cs b/MenuAPI/Menu.cs
diff --git a/MenuAPI/MenuAPI.csproj b/MenuAPI/MenuAPI.csproj
@@ -3,28 +3,33 @@
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
     <DebugType>embedded</DebugType>
-    <TargetName>$(AssemblyName).net</TargetName>
+    <TargetName>$(AssemblyName)</TargetName>
     <Configurations>Release RedM;Release FiveM;Debug RedM;Debug FiveM</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup
-    Condition="'$(Configuration)' == 'Debug FiveM' Or '$(Configuration)' == 'Release FiveM'">
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug FiveM' Or '$(Configuration)' == 'Release FiveM'">
     <DefineConstants>FIVEM</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup
-    Condition="'$(Configuration)' == 'Debug RedM' Or '$(Configuration)' == 'Release RedM'">
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug RedM' Or '$(Configuration)' == 'Release RedM'">
     <DefineConstants>REDM</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\shared\RedM\Controls.cs" Link="Controls.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
 
-    <PackageReference Include="CitizenFX.Core.Client" Version="1.0.1688" Condition="'$(Configuration)' == 'Release FiveM' Or '$(Configuration)' == 'Debug FiveM'" ExcludeAssets="runtime" />
+    <PackageReference Include="CitizenFX.Core.Client" Version="1.0.1688" Condition="'$(Configuration)' == 'Release FiveM' Or '$(Configuration)' == 'Debug FiveM'">
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
 
     <!-- currently hardcoded path as no nuget package for RedM exists yet -->
     <Reference Include="CitizenFX.Core.Client" Condition="'$(Configuration)' == 'Release RedM' Or '$(Configuration)' == 'Debug RedM'">
-      <HintPath>..\..\..\..\citizen\clr2\lib\mono\4.5\citizenfx.core.dll</HintPath>
+      <HintPath>..\dependencies\RedM\CitizenFX.Core.dll</HintPath>
+      <Private>false</Private>
     </Reference>
   </ItemGroup>