Merge pull request #418 from Defee/dev

Added pre-defined BeInExPath to be considered in JotunnLibRefsCorlib…
Valheim-Modding · Dec 25, 2023 · f34c402 · f34c402
2 parents a64aaa1 + be93988
commit f34c402
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/JotunnLib/BuildProps/JotunnLibRefsCorlib.props b/JotunnLib/BuildProps/JotunnLibRefsCorlib.props
@@ -37,19 +37,19 @@
       <Private>false</Private>
     </Reference>
     <Reference Include="BepInEx">
-      <HintPath>$(VALHEIM_INSTALL)\BepInEx\core\BepInEx.dll</HintPath>
+      <HintPath>$(BEPINEX_PATH)\core\BepInEx.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="0Harmony">
-      <HintPath>$(VALHEIM_INSTALL)\BepInEx\core\0Harmony.dll</HintPath>
+      <HintPath>$(BEPINEX_PATH)\core\0Harmony.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="BepInEx.Preloader">
-      <HintPath>$(VALHEIM_INSTALL)\BepInEx\core\BepInEx.Preloader.dll</HintPath>
+      <HintPath>$(BEPINEX_PATH)\core\BepInEx.Preloader.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="HarmonyXInterop">
-      <HintPath>$(VALHEIM_INSTALL)\BepInEx\core\HarmonyXInterop.dll</HintPath>
+      <HintPath>$(BEPINEX_PATH)\core\HarmonyXInterop.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="Mono.Security">
@@ -366,4 +366,4 @@
       <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\UnityEngine.XRModule.dll</HintPath>
     </Reference>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/JotunnLib/BuildProps/Paths.props b/JotunnLib/BuildProps/Paths.props
@@ -19,4 +19,7 @@
       </PropertyGroup>
     </When>
   </Choose>
-</Project>
+  <PropertyGroup Condition="$(BEPINEX_PATH)=='' AND $(VALHEIM_INSTALL) != ''">
+    <BEPINEX_PATH>$(VALHEIM_INSTALL)\BepInEx</BEPINEX_PATH>
+  </PropertyGroup>
+</Project>