cafeberry/cafeberry-dev
3
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

fix: 4JLibs building, windows64 files not copying & add buildsteps to solution filter

Browse Source
This commit is contained in:
str1k3r
2026-08-08 20:56:23 -04:00
parent 9cba342973
commit af2040a849
7 changed files with 70 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Minecraft.World.vcxproj
+18 -66
View File
@@ -819,17 +819,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
<Command>if not exist "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\libs" (
for %%C in (Debug Release) do (
"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=%%C /v:minimal
if errorlevel 1 (
echo 4JLibs build failed for %%C
exit /b 1
)
)
xcopy "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\Headers\Windows64" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\inc" /E /I /Y
)</Command>
<Message>Build 4JLibs</Message>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
@@ -883,19 +875,11 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
<Command>if not exist "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\libs" (
for %%C in (Debug Release) do (
"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=%%C /v:minimal
if errorlevel 1 (
echo 4JLibs build failed for %%C
exit /b 1
)
)
xcopy "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\Headers\Windows64" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\inc" /E /I /Y
)</Command>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Build 4JLibs</Message>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
@@ -1276,17 +1260,9 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>if not exist "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\libs" (
for %%C in (Debug Release) do (
"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=%%C /v:minimal
if errorlevel 1 (
echo 4JLibs build failed for %%C
exit /b 1
)
)
xcopy "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\Headers\Windows64" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\inc" /E /I /Y
)</Command>
<Message>Build 4JLibs</Message>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">
@@ -1312,17 +1288,9 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>if not exist "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\libs" (
for %%C in (Debug Release) do (
"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=%%C /v:minimal
if errorlevel 1 (
echo 4JLibs build failed for %%C
exit /b 1
)
)
xcopy "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\Headers\Windows64" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\inc" /E /I /Y
)</Command>
<Message>Build 4JLibs</Message>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">
@@ -1348,17 +1316,9 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>if not exist "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\libs" (
for %%C in (Debug Release) do (
"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=%%C /v:minimal
if errorlevel 1 (
echo 4JLibs build failed for %%C
exit /b 1
)
)
xcopy "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\Headers\Windows64" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\inc" /E /I /Y
)</Command>
<Message>Build 4JLibs</Message>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">
@@ -1384,17 +1344,9 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>if not exist "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\libs" (
for %%C in (Debug Release) do (
"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=%%C /v:minimal
if errorlevel 1 (
echo 4JLibs build failed for %%C
exit /b 1
)
)
xcopy "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\Headers\Windows64" "$(SolutionDir)Minecraft.Client\Windows64\4JLibs\inc" /E /I /Y
)</Command>
<Message>Build 4JLibs</Message>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">