build: fix CUE4Parse linking
This commit is contained in:
+8
-16
@@ -62,20 +62,13 @@ if (UNLOCKER_DUMPER)
|
|||||||
set(CUE4PARSE_NATIVE_DIR "${cue4parse_SOURCE_DIR}/CUE4Parse-Natives")
|
set(CUE4PARSE_NATIVE_DIR "${cue4parse_SOURCE_DIR}/CUE4Parse-Natives")
|
||||||
add_subdirectory(${CUE4PARSE_NATIVE_DIR})
|
add_subdirectory(${CUE4PARSE_NATIVE_DIR})
|
||||||
|
|
||||||
# net
|
include_external_msproject(
|
||||||
set(CUE4PARSE_NET_DIR "${cue4parse_SOURCE_DIR}/CUE4Parse")
|
CUE4Parse-Net
|
||||||
set(CUE4PARSE_OUTPUT_DIR "${CUE4PARSE_NET_DIR}/bin/$(Configuration)/net8.0")
|
"${cue4parse_SOURCE_DIR}/CUE4Parse/CUE4Parse.csproj"
|
||||||
|
TYPE "9A19103F-16F7-4668-BE54-9A1E7A4F7556"
|
||||||
add_custom_target(CUE4Parse-Net
|
PLATFORM "Any CPU"
|
||||||
COMMAND dotnet build "${CUE4PARSE_NET_DIR}/CUE4Parse.csproj"
|
|
||||||
--configuration $(Configuration)
|
|
||||||
-p:BuildNatives=false
|
|
||||||
-p:SkipNativeBuild=true
|
|
||||||
-p:CMakeExitCode=0
|
|
||||||
--output "${CUE4PARSE_OUTPUT_DIR}"
|
|
||||||
WORKING_DIRECTORY "${CUE4PARSE_NET_DIR}"
|
|
||||||
COMMENT "Building CUE4Parse"
|
|
||||||
)
|
)
|
||||||
|
add_dependencies(CUE4Parse-Net CUE4Parse-Natives)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(SEALLIB_ASSERT ON CACHE BOOL "" FORCE)
|
set(SEALLIB_ASSERT ON CACHE BOOL "" FORCE)
|
||||||
@@ -116,9 +109,8 @@ endif()
|
|||||||
# dumper
|
# dumper
|
||||||
# ------------------------------
|
# ------------------------------
|
||||||
if (UNLOCKER_DUMPER)
|
if (UNLOCKER_DUMPER)
|
||||||
include_external_msproject(hex-dumped "${CMAKE_CURRENT_SOURCE_DIR}/src/dumper/hex-dumped.csproj")
|
include_external_msproject(hex-dumped "${CMAKE_CURRENT_SOURCE_DIR}/src/dumper/hex-dumped.csproj" TYPE "9A19103F-16F7-4668-BE54-9A1E7A4F7556")
|
||||||
set_target_properties(hex-dumped PROPERTIES VS_PROJECT_TYPE "9A19103F-16F7-4668-BE54-9A1E7A4F7556")
|
add_dependencies(hex-dumped CUE4Parse-Net)
|
||||||
add_dependencies(hex-dumped CUE4Parse-Natives CUE4Parse-Net)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# ------------------------------
|
# ------------------------------
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ProjectGuid>{3CC38FE8-76CA-38B5-8D90-6E68FA37A029}</ProjectGuid>
|
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net10.0-windows</TargetFramework>
|
<TargetFramework>net10.0-windows</TargetFramework>
|
||||||
<UseWindowsForms>true</UseWindowsForms>
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
@@ -9,9 +8,9 @@
|
|||||||
<Platforms>x64</Platforms>
|
<Platforms>x64</Platforms>
|
||||||
<Configurations>Debug;Release</Configurations>
|
<Configurations>Debug;Release</Configurations>
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
|
|
||||||
<OutputPath>..\..\proj\$(Configuration)\</OutputPath>
|
<OutputPath>..\..\proj\$(Configuration)\</OutputPath>
|
||||||
<BaseIntermediateOutputPath>..\..\proj\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
|
<BaseOutputPath>$(SolutionDir)bin\$(MSBuildProjectName)\</BaseOutputPath>
|
||||||
|
<BaseIntermediateOutputPath>$(SolutionDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
@@ -23,8 +22,9 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\proj\_deps\cue4parse-src\CUE4Parse\CUE4Parse.csproj">
|
<ProjectReference Include="$(SolutionDir)_deps\cue4parse-src\CUE4Parse\CUE4Parse.csproj">
|
||||||
<Project>{E3464BCC-66F1-3FBA-B83E-B064C2637900}</Project>
|
<Project>{E3464BCC-66F1-3FBA-B83E-B064C2637900}</Project>
|
||||||
|
<Properties>BuildNatives=false;SkipNativeBuild=true;CMakeExitCode=0;Platform=AnyCPU</Properties>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Reference in New Issue
Block a user