Merge branch 'ps4' of https://git.neolegacy.dev/pieeebot/cafeberry into ps4
# Conflicts: # Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp # Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp # Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp # Minecraft.Client/OrbisMedia/strings.h # MinecraftConsoles.sln
This commit is contained in:
@@ -3068,6 +3068,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<PostBuildEvent>
|
||||
<Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
|
||||
</PostBuildEvent>
|
||||
<PostAnalyzeEvent>
|
||||
<Message>Run Orbis postbuild script</Message>
|
||||
</PostAnalyzeEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">
|
||||
<ClCompile>
|
||||
@@ -3185,6 +3191,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<PostBuildEvent>
|
||||
<Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
|
||||
</PostBuildEvent>
|
||||
<PostAnalyzeEvent>
|
||||
<Message>Run Orbis postbuild script</Message>
|
||||
</PostAnalyzeEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<None Include="ClassDiagram.cd" />
|
||||
|
||||
Reference in New Issue
Block a user