diff --git a/.gitea/workflows/orbis.yaml b/.gitea/workflows/orbis.yaml index bb338ea7..3c60c6c0 100644 --- a/.gitea/workflows/orbis.yaml +++ b/.gitea/workflows/orbis.yaml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: windows-2022 + runs-on: sdk-orbis strategy: matrix: @@ -27,6 +27,7 @@ jobs: uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 + clean: false lfs: false - name: Build Cafeberry @@ -48,7 +49,8 @@ jobs: Copy-Item "./ORBIS_${{ inputs.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg - name: Upload artifacts - uses: https://github.com/actions/upload-artifact@v3 + uses: https://github.com/christopherHX/gitea-upload-artifact@v4 with: name: build-${{ matrix.platform }} - path: staging/* \ No newline at end of file + path: staging/* + compression-level: 0 \ No newline at end of file diff --git a/.gitea/workflows/ps3.yaml b/.gitea/workflows/ps3.yaml index d908f44c..4583712d 100644 --- a/.gitea/workflows/ps3.yaml +++ b/.gitea/workflows/ps3.yaml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: windows-2022 + runs-on: sdk-ps3 strategy: matrix: @@ -27,6 +27,7 @@ jobs: uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 + clean: false lfs: false - name: Build Cafeberry @@ -37,7 +38,7 @@ jobs: /m - name: Zip Build - run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj" + run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map" - name: Stage artifacts run: | @@ -45,7 +46,8 @@ jobs: Copy-Item LCE${{ matrix.platform }}.zip staging/ - name: Upload artifacts - uses: https://github.com/actions/upload-artifact@v3 + uses: https://github.com/christopherHX/gitea-upload-artifact@v4 with: name: build-${{ matrix.platform }} - path: staging/* \ No newline at end of file + path: staging/* + compression-level: 0 \ No newline at end of file diff --git a/.gitea/workflows/psvita.yaml b/.gitea/workflows/psvita.yaml index dc2c1132..06342a18 100644 --- a/.gitea/workflows/psvita.yaml +++ b/.gitea/workflows/psvita.yaml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: windows-2022 + runs-on: sdk-psvita strategy: matrix: @@ -27,6 +27,7 @@ jobs: uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 + clean: false lfs: false - name: Build Cafeberry @@ -46,7 +47,8 @@ jobs: Copy-Item "./PSVita_${{ inputs.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk - name: Upload artifacts - uses: https://github.com/actions/upload-artifact@v3 + uses: https://github.com/christopherHX/gitea-upload-artifact@v4 with: name: build-${{ matrix.platform }} - path: staging/* \ No newline at end of file + path: staging/* + compression-level: 0 \ No newline at end of file diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 30df8b6c..9e58ba54 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -25,19 +25,31 @@ jobs: build: needs: validate - runs-on: windows-2022 - strategy: matrix: configuration: [Release] - platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64] + platform: [Windows64, Xbox360, Orbis, PSVita, PS3] + include: + - platform: Windows64 + sdk_label: windows-2022 # str1k3r - can run on any runner + - platform: Xbox360 + sdk_label: sdk-xbox360 + - platform: Orbis + sdk_label: sdk-orbis + - platform: PSVita + sdk_label: sdk-psvita + - platform: PS3 + sdk_label: sdk-ps3 + + runs-on: [windows-2022, "${{ matrix.sdk_label }}"] steps: - name: Checkout Repository uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 - lfs: false + clean: false + lfs: false - name: Build Cafeberry run: | @@ -57,7 +69,7 @@ jobs: } elseif ("${{ matrix.platform }}" -eq "PSVita") { 7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*" } elseif ("${{ matrix.platform }}" -eq "PS3") { - 7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/PS3_GAME/*" + 7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/*" "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map" } elseif ("${{ matrix.platform }}" -eq "Xbox360") { 7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb" } else { @@ -78,17 +90,18 @@ jobs: } - name: Upload artifacts - uses: https://github.com/actions/upload-artifact@v3 + uses: https://github.com/christopherHX/gitea-upload-artifact@v4 with: name: build-${{ matrix.platform }} path: staging/* + compression-level: 0 release: needs: build runs-on: windows-2022 steps: - name: Download all build artifacts - uses: https://github.com/actions/download-artifact@v3 + uses: https://github.com/christopherHX/gitea-download-artifact@v4 with: path: downloaded @@ -110,9 +123,10 @@ jobs: } $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))" - "description<<$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM - $body | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM - "$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM + $content = "description<<$delimiter`n$body`n$delimiter`n" + + $utf8NoBom = New-Object System.Text.UTF8Encoding($false) + [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, $content, $utf8NoBom) - name: Publish Release uses: akkuman/gitea-release-action@v1 diff --git a/.gitea/workflows/windows64.yaml b/.gitea/workflows/windows64.yaml index 54bdddbb..78166a79 100644 --- a/.gitea/workflows/windows64.yaml +++ b/.gitea/workflows/windows64.yaml @@ -27,6 +27,7 @@ jobs: uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 + clean: false lfs: false - name: Build Cafeberry @@ -46,7 +47,8 @@ jobs: Copy-Item LCE${{ matrix.platform }}.zip staging/ - name: Upload artifacts - uses: https://github.com/actions/upload-artifact@v3 + uses: https://github.com/christopherHX/gitea-upload-artifact@v4 with: name: build-${{ matrix.platform }} - path: staging/* \ No newline at end of file + path: staging/* + compression-level: 0 \ No newline at end of file diff --git a/.gitea/workflows/xbox.yaml b/.gitea/workflows/xbox.yaml index 3afadd05..86dd655c 100644 --- a/.gitea/workflows/xbox.yaml +++ b/.gitea/workflows/xbox.yaml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: windows-2022 + runs-on: sdk-xbox360 strategy: matrix: @@ -27,6 +27,7 @@ jobs: uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 + clean: false lfs: false - name: Build Cafeberry @@ -48,7 +49,8 @@ jobs: Copy-Item LCE${{ matrix.platform }}.zip staging/ - name: Upload artifacts - uses: https://github.com/actions/upload-artifact@v3 + uses: https://github.com/christopherHX/gitea-upload-artifact@v4 with: name: build-${{ matrix.platform }} - path: staging/* \ No newline at end of file + path: staging/* + compression-level: 0 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5e405026..76482abb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,35 @@ -/*Debug -/*Release -/*ContentPackage -/*ContentPackage_NO_TU -/*ContentPackage_SYMBOLS -/*ReleaseForArt +.vs /x64 /ipch -.vs/ +.vscode +/*Debug +/*Release* +/*ContentPackage* # Minecraft.Client -/Minecraft.Client/x64/ +/Minecraft.Client/x64 /Minecraft.Client/x64_* /Minecraft.Client/*Debug -/Minecraft.Client/*Release -/Minecraft.Client/*ContentPackage -/Minecraft.Client/*ContentPackage_NO_TU -/Minecraft.Client/*ContentPackage_SYMBOLS -/Minecraft.Client/*ReleaseForArt +/Minecraft.Client/*Release* +/Minecraft.Client/*ContentPackage* /Minecraft.Client/Windows64/GameHDD # Minecraft.world -/Minecraft.World/x64/ +/Minecraft.World/x64 /Minecraft.World/x64_* /Minecraft.World/*Debug -/Minecraft.World/*Release -/Minecraft.World/*ContentPackage -/Minecraft.World/*ContentPackage_NO_TU -/Minecraft.World/*ContentPackage_SYMBOLS -/Minecraft.World/*ReleaseForArt +/Minecraft.World/*Release* +/Minecraft.World/*ContentPackage* -# PS3 SPU -/Minecraft.Client/PS3/SPU_Tasks/objFiles/ -/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3* -/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3* -/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3* -/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3* -/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3* -/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3* +# PS3 SPU Tasks +/Minecraft.Client/PS3/SPU_Tasks/objFiles +/Minecraft.Client/PS3/SPU_Tasks/*/PS3* +/Minecraft.Client/PS3/SPU_Tasks/*/Debug +/Minecraft.Client/PS3/SPU_Tasks/*/Release +/Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage # Misc +*.ppu.o *.pkg /*.gp4p /*.vpk @@ -46,4 +37,5 @@ *-app *.sdf *.opensdf -*.v11.suo \ No newline at end of file +*.v11.suo +*.vcxproj.user \ No newline at end of file diff --git a/Minecraft.Client/Common/CommonMedia.sln b/Minecraft.Client/Common/CommonMedia.sln index 86953838..5fbe9d84 100644 --- a/Minecraft.Client/Common/CommonMedia.sln +++ b/Minecraft.Client/Common/CommonMedia.sln @@ -4,14 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonMedia", "CommonMedia.vcxproj", "{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}" EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark - SccProjectUniqueName0 = CommonMedia.vcxproj - SccLocalPath0 = . - SccLocalPath1 = . - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp index ec483669..c26c37e9 100644 --- a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp +++ b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp @@ -9,7 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] = L"Friends", L"MyScore", L"TopRank" }; -#ifdef __PS3__ // str1k3r - only PS3 needs this, also this wasnt in the leak? +#if defined(__PS3__) && !defined(_CONTENT_PACKAGE) // str1k3r - only PS3 needs this, also this wasnt in the leak? LeaderboardManager *LeaderboardManager::m_instance = NULL; #endif diff --git a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 index c6e83fec..65723d49 100644 --- a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 +++ b/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 @@ -1,6 +1,7 @@ param( [string]$OutDir, - [string]$ProjectDir + [string]$ProjectDir, + [string]$Configuration ) Write-Host "PS3 Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir" @@ -59,7 +60,12 @@ foreach ($copy in $fileCopies) { } } -$builtFile = Join-Path $OutDir "Minecraft.Client.self" +if ($Configuration -match "ContentPackage") { + $builtFile = Join-Path $OutDir "Minecraft.Client.elf" +} else { + $builtFile = Join-Path $OutDir "Minecraft.Client.self" +} + $newName = "EBOOT.BIN" $destDir = Join-Path $OutDir "PS3_GAME\USRDIR" $destPath = Join-Path $destDir $newName diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index 84f8c303..bec19c1c 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -528,48 +528,12 @@ void UIController::loadSkins() } #endif - // Every platform has one of these, so nothing shared - if(m_fScreenHeight==1080.0f) + + // str1k3r - Fixes 720p/480p Crashes on Windows64, also allows this to be used on 1080p consoles instead of just Windows64 + // This also cleans up some 4J code and turns 3 if statements into 1. + if (m_fScreenHeight >= 1080.0f) { m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskinHD.swf"); - } - else - { - m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskin.swf"); - } - -#if defined(__PS3__) || defined(__PSVITA__) - m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf"); - m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf"); - m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf"); - m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf"); - m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf"); - m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf"); - m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf"); - m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf"); - m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf"); - m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf"); -#endif - -#if ( defined(_WINDOWS64) || defined(_DURANGO) || defined(__ORBIS__) ) - -#if defined(_WINDOWS64) - if (m_fScreenHeight <= 720.0f) - { - m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf"); - m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf"); - m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf"); - m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf"); - m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf"); - m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf"); - m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf"); - m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf"); - m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf"); - m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf"); - } - else -#endif - { m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf"); m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf"); m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf"); @@ -581,7 +545,20 @@ void UIController::loadSkins() m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf"); m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf"); } -#endif // HD platforms + else + { + m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskin.swf"); + m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf"); + m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf"); + m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf"); + m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf"); + m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf"); + m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf"); + m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf"); + m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf"); + m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf"); + m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf"); + } } IggyLibrary UIController::loadSkin(const wstring &skinPath, const wstring &skinName) diff --git a/Minecraft.Client/Common/UI/UIController.h b/Minecraft.Client/Common/UI/UIController.h index 289c12b0..2a81694f 100644 --- a/Minecraft.Client/Common/UI/UIController.h +++ b/Minecraft.Client/Common/UI/UIController.h @@ -96,24 +96,7 @@ private: eLibrary_HUD, eLibrary_Tooltips, eLibrary_Default, - -#if ( defined(_WINDOWS64) ) - // 4J Stu - Load the 720/480 skins so that we have something to fallback on during development -#ifndef _FINAL_BUILD - eLibraryFallback_Platform, - eLibraryFallback_GraphicsDefault, - eLibraryFallback_GraphicsHUD, - eLibraryFallback_GraphicsInGame, - eLibraryFallback_GraphicsTooltips, - eLibraryFallback_GraphicsLabels, - eLibraryFallback_Labels, - eLibraryFallback_InGame, - eLibraryFallback_HUD, - eLibraryFallback_Tooltips, - eLibraryFallback_Default, -#endif -#endif - + eLibrary_Count, }; diff --git a/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln b/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln index 2db538d5..ca450112 100644 --- a/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln +++ b/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln @@ -4,14 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRules", "GameRules.vcxproj", "{0DD2FD59-36AC-476F-9201-D687A4CE9E98}" EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark - SccProjectUniqueName0 = GameRules.vcxproj - SccLocalPath0 = . - SccLocalPath1 = . - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Xbox 360 = Debug|Xbox 360 Release|Xbox 360 = Release|Xbox 360 diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index 31e040ea..9eab3062 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -806,9 +806,15 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script + + "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Debug /v:minimal + + + Build PS3 SPU Tasks + @@ -893,11 +899,17 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script + + "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Release /v:minimal + + + Build PS3 SPU Tasks + @@ -920,7 +932,7 @@ true $(OutDir)$(ProjectName).pdb - d3d11.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) NotSet false @@ -1015,7 +1027,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)$(ProjectName).pch MultiThreaded - _FINAL_BUILD;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions) + _DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions) Disabled Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories) true @@ -1027,7 +1039,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU true $(OutDir)$(ProjectName).pdb - d3d11.lib;..\Minecraft.World\x64_Release\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) NotSet false @@ -1340,11 +1352,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script + + "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal + + + Build PS3 SPU Tasks + @@ -1431,11 +1449,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script + + "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal + + + Build PS3 SPU Tasks + @@ -1530,11 +1554,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script + + "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Release /v:minimal + + + Build PS3 SPU Tasks + @@ -1606,6 +1636,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUDefault 1700;613;1011 -Xpch_override=1 %(AdditionalOptions) + PS3\Iggy\include;%(AdditionalIncludeDirectories) true @@ -1620,11 +1651,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script + + "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal + + + Build PS3 SPU Tasks + @@ -1681,7 +1718,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)$(ProjectName).pch MultiThreaded - _FINAL_BUILD;NDEBUG;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _LARGE_WORLDS;_FINAL_BUILD;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true Disabled @@ -1694,12 +1731,12 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)default.pdb true - d3d11.lib;..\Minecraft.World\x64_Release\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) false false - + UseLinkTimeCodeGeneration powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" @@ -1733,7 +1770,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)default.pdb true - xavatar2.lib;xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xbox\Sentient\libs\SenCore.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;xuirun.lib;xuirender.lib;xuihtml.lib;xonline.lib;xhv2.lib;qnetxaudio2.lib;xbox\4JLibs\libs\4J_Input.lib;xbox\4JLibs\libs\4J_Storage.lib;xbox\4JLibs\libs\4J_Profile.lib;xbox\4JLibs\libs\4J_Render.lib;..\Minecraft.World\ContentPackage\Minecraft.World.lib;xsocialpost.lib;xrnm.lib;xparty.lib;xbox\Sentient\libs\SenNews.lib;xbox\Sentient\libs\SenUGC.lib;xbox\Sentient\libs\SenBoxArt.lib;NuiApi.lib;ST.lib;NuiFitnessApi.lib;NuiHandles.lib;NuiSpeech.lib;NuiAudio.lib;xhttp.lib;xauth.lib;xgetserviceendpoint.lib;xav.lib;xjson.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) xapilib.lib false false @@ -1767,7 +1804,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU true $(OutDir)$(ProjectName).pdb - d3d11.lib;..\Minecraft.World\x64_ReleaseForArt\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) NotSet false @@ -1803,7 +1840,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)default.pdb true - xavatar2.lib;xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xbox\Sentient\libs\SenCore.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;xuirun.lib;xuirender.lib;xuihtml.lib;xonline.lib;xhv2.lib;qnetxaudio2.lib;xbox\4JLibs\libs\4J_Input.lib;xbox\4JLibs\libs\4J_Storage.lib;xbox\4JLibs\libs\4J_Profile.lib;xbox\4JLibs\libs\4J_Render.lib;..\Minecraft.World\ContentPackage\Minecraft.World.lib;xsocialpost.lib;xrnm.lib;xparty.lib;xbox\Sentient\libs\SenNews.lib;xbox\Sentient\libs\SenUGC.lib;xbox\Sentient\libs\SenBoxArt.lib;NuiApi.lib;ST.lib;NuiFitnessApi.lib;NuiHandles.lib;NuiSpeech.lib;NuiAudio.lib;xhttp.lib;xauth.lib;xgetserviceendpoint.lib;xav.lib;xjson.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) xapilib.lib false false @@ -14156,8 +14193,46 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true - - + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true true @@ -14287,7 +14362,32 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true - + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true true @@ -27787,7 +27887,32 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true - + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true true @@ -34008,12 +34133,110 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true - true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true - true true @@ -34088,10 +34311,110 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true - - - - + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true true @@ -34101,7 +34424,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true + false true false true @@ -34154,6 +34477,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true + true true @@ -34170,7 +34494,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true + false true false true @@ -34214,7 +34538,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false + true false true false @@ -34257,7 +34581,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true + false true true true diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters index ff5a19d4..f92e8d8d 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj.filters +++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters @@ -3773,7 +3773,7 @@ Common\Source Files\Leaderboards - + PSVita @@ -5923,7 +5923,7 @@ Common\Source Files\Leaderboards - + PSVita @@ -6189,6 +6189,7 @@ PSVita\4JLibs\libs + diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.user b/Minecraft.Client/Minecraft.Client.vcxproj.user deleted file mode 100644 index 695b5c78..00000000 --- a/Minecraft.Client/Minecraft.Client.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate.ppu.o deleted file mode 100644 index d1eb56d8..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj index 2d024f54..7cb9a013 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj @@ -171,15 +171,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -211,8 +211,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -234,8 +237,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -257,9 +263,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/Common/Prebuild.ps1 b/Minecraft.Client/PS3/SPU_Tasks/Common/Prebuild.ps1 new file mode 100644 index 00000000..c1971dde --- /dev/null +++ b/Minecraft.Client/PS3/SPU_Tasks/Common/Prebuild.ps1 @@ -0,0 +1,15 @@ +# str1k3r - This prebuild makes sure that the ObjFiles directory exists so the PS3 SPU tasks can properly build +param( + [string]$ProjectDir, + [string]$Configuration +) + +$ParentDir = Split-Path -Path $ProjectDir -Parent + +$directories = @( + "ObjFiles\$Configuration" +) + +foreach ($dir in $directories) { + New-Item -ItemType Directory -Path (Join-Path $ParentDir $dir) -Force | Out-Null +} \ No newline at end of file diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile.ppu.o deleted file mode 100644 index 5631bed8..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj index 2e908d07..b6865a83 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj @@ -65,15 +65,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -104,8 +104,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -127,8 +130,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -150,9 +156,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress.ppu.o deleted file mode 100644 index edd2503f..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj index c86bb632..1fc522e4 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj @@ -61,15 +61,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -100,8 +100,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -123,8 +126,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -146,9 +152,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData.ppu.o deleted file mode 100644 index 9d51f78c..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj index bcf4e559..fc408e07 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj @@ -57,15 +57,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_Release\ - PS3_Release\ - PS3_Release\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -96,8 +96,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -119,8 +122,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -142,8 +148,11 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture.ppu.o deleted file mode 100644 index 8b2e5c2f..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj index 6459acb4..a6b1785d 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj @@ -1,6 +1,10 @@ + + ContentPackage + PS3 + Debug PS3 @@ -25,6 +29,10 @@ Application SPU + + Application + SPU + Application SPU @@ -35,25 +43,34 @@ + + + <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_Release\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) + *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) + false + false $(ProjectName) SpursInit $(ProjectName) + $(ProjectName) @@ -74,7 +91,11 @@ JobBin2 + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -96,8 +117,37 @@ JobBin2 - ..\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + + + + + -ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions) + $(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories) + true + Level3 + SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions) + + + true + + + -Wl,--gc-sections -g %(AdditionalOptions) + -ldma;-lspurs_jq;%(AdditionalDependencies) + false + + + + + JobBin2 + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks.ppu.o deleted file mode 100644 index 5a1c08c2..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk.ppu.o deleted file mode 100644 index 7979e985..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj index 32533dd9..61020ac9 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj @@ -56,15 +56,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -95,8 +95,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -119,8 +122,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -143,9 +149,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull.ppu.o deleted file mode 100644 index eb3eb279..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj index 30350107..ef68e17b 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj @@ -56,15 +56,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -95,8 +95,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -119,8 +122,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -143,9 +149,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull_d.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull_d.ppu.o deleted file mode 100644 index fac885e0..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull_d.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort.ppu.o deleted file mode 100644 index f1a3c176..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj index 2d04a393..24bf2d05 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj @@ -56,15 +56,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -95,8 +95,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -119,8 +122,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -143,9 +149,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise.ppu.o deleted file mode 100644 index 264ca850..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj index 2402c902..4ab47477 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj @@ -61,15 +61,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -101,8 +101,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -125,8 +128,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -149,9 +155,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/RLECompress.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/RLECompress.ppu.o deleted file mode 100644 index fd72ba7f..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/RLECompress.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate.ppu.o deleted file mode 100644 index 010789d5..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj index 78bb8e6c..2b93559e 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj @@ -56,15 +56,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -95,8 +95,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -119,8 +122,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -143,9 +149,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln b/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln index 7b7214db..5b3907d1 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln +++ b/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln @@ -13,60 +13,89 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LevelRenderer_FindNearestCh EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture_blit", "Texture_blit\Texture_blit.spu.vcxproj", "{A71AAA51-6541-4348-9814-E5FE2D36183B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompressedTileStorage_getData", "CompressedTileStorage_getData\CompressedTileStorage_getData.spu.vcxproj", "{ED672663-B86E-436B-9530-A6589DE02366}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRenderer_updateLightTexture", "GameRenderer_updateLightTexture\GameRenderer_updateLightTexture.spu.vcxproj", "{1F6ECBFE-3089-457D-8A11-5CFDC0392439}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LevelRenderer_zSort", "LevelRenderer_zSort\LevelRenderer_zSort.spu.vcxproj", "{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlinNoise", "PerlinNoise\PerlinNoise.spu.vcxproj", "{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Renderer_TextureUpdate", "Renderer_TextureUpdate\Renderer_TextureUpdate.spu.vcxproj", "{AEC81E5C-04B5-4F77-91A0-D94065F885B7}" +EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 7 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark - SccLocalPath0 = . - SccProjectUniqueName1 = CompressedTile\\CompressedTile.spu.vcxproj - SccProjectName1 = CompressedTile - SccLocalPath1 = CompressedTile - SccProjectUniqueName2 = LevelRenderer_cull\\LevelRenderer_cull.spu.vcxproj - SccProjectName2 = LevelRenderer_cull - SccLocalPath2 = LevelRenderer_cull - SccProjectUniqueName3 = ChunkUpdate\\ChunkUpdate.spu.vcxproj - SccProjectName3 = ChunkUpdate - SccLocalPath3 = ChunkUpdate - SccProjectUniqueName4 = CompressedTileStorage_compress\\CompressedTileStorage_compress.spu.vcxproj - SccProjectName4 = CompressedTileStorage_compress - SccLocalPath4 = CompressedTileStorage_compress - SccProjectUniqueName5 = LevelRenderer_FindNearestChunk\\LevelRenderer_FindNearestChunk.spu.vcxproj - SccProjectName5 = LevelRenderer_FindNearestChunk - SccLocalPath5 = LevelRenderer_FindNearestChunk - SccProjectUniqueName6 = Texture_blit\\Texture_blit.spu.vcxproj - SccProjectName6 = Texture_blit - SccLocalPath6 = Texture_blit - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + ContentPackage|PS3 = ContentPackage|PS3 Debug|PS3 = Debug|PS3 Release|PS3 = Release|PS3 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Debug|PS3.ActiveCfg = Debug|PS3 {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Debug|PS3.Build.0 = Debug|PS3 {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Release|PS3.ActiveCfg = Release|PS3 {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Release|PS3.Build.0 = Release|PS3 + {4B436D43-D35B-4E56-988A-A3543B70C8E5}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {4B436D43-D35B-4E56-988A-A3543B70C8E5}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 {4B436D43-D35B-4E56-988A-A3543B70C8E5}.Debug|PS3.ActiveCfg = Debug|PS3 {4B436D43-D35B-4E56-988A-A3543B70C8E5}.Debug|PS3.Build.0 = Debug|PS3 {4B436D43-D35B-4E56-988A-A3543B70C8E5}.Release|PS3.ActiveCfg = Release|PS3 {4B436D43-D35B-4E56-988A-A3543B70C8E5}.Release|PS3.Build.0 = Release|PS3 + {297888B4-8234-461B-9861-214988A95711}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {297888B4-8234-461B-9861-214988A95711}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 {297888B4-8234-461B-9861-214988A95711}.Debug|PS3.ActiveCfg = Debug|PS3 {297888B4-8234-461B-9861-214988A95711}.Debug|PS3.Build.0 = Debug|PS3 {297888B4-8234-461B-9861-214988A95711}.Release|PS3.ActiveCfg = Release|PS3 {297888B4-8234-461B-9861-214988A95711}.Release|PS3.Build.0 = Release|PS3 + {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Debug|PS3.ActiveCfg = Debug|PS3 {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Debug|PS3.Build.0 = Debug|PS3 {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Release|PS3.ActiveCfg = Release|PS3 {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Release|PS3.Build.0 = Release|PS3 + {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Debug|PS3.ActiveCfg = Debug|PS3 {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Debug|PS3.Build.0 = Debug|PS3 {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Release|PS3.ActiveCfg = Release|PS3 {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Release|PS3.Build.0 = Release|PS3 + {A71AAA51-6541-4348-9814-E5FE2D36183B}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {A71AAA51-6541-4348-9814-E5FE2D36183B}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 {A71AAA51-6541-4348-9814-E5FE2D36183B}.Debug|PS3.ActiveCfg = Debug|PS3 {A71AAA51-6541-4348-9814-E5FE2D36183B}.Debug|PS3.Build.0 = Debug|PS3 {A71AAA51-6541-4348-9814-E5FE2D36183B}.Release|PS3.ActiveCfg = Release|PS3 {A71AAA51-6541-4348-9814-E5FE2D36183B}.Release|PS3.Build.0 = Release|PS3 + {ED672663-B86E-436B-9530-A6589DE02366}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {ED672663-B86E-436B-9530-A6589DE02366}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 + {ED672663-B86E-436B-9530-A6589DE02366}.Debug|PS3.ActiveCfg = Debug|PS3 + {ED672663-B86E-436B-9530-A6589DE02366}.Debug|PS3.Build.0 = Debug|PS3 + {ED672663-B86E-436B-9530-A6589DE02366}.Release|PS3.ActiveCfg = Release|PS3 + {ED672663-B86E-436B-9530-A6589DE02366}.Release|PS3.Build.0 = Release|PS3 + {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 + {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Debug|PS3.ActiveCfg = Debug|PS3 + {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Debug|PS3.Build.0 = Debug|PS3 + {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Release|PS3.ActiveCfg = Release|PS3 + {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Release|PS3.Build.0 = Release|PS3 + {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 + {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Debug|PS3.ActiveCfg = Debug|PS3 + {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Debug|PS3.Build.0 = Debug|PS3 + {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Release|PS3.ActiveCfg = Release|PS3 + {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Release|PS3.Build.0 = Release|PS3 + {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 + {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Debug|PS3.ActiveCfg = Debug|PS3 + {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Debug|PS3.Build.0 = Debug|PS3 + {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Release|PS3.ActiveCfg = Release|PS3 + {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Release|PS3.Build.0 = Release|PS3 + {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3 + {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.ContentPackage|PS3.Build.0 = ContentPackage|PS3 + {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Debug|PS3.ActiveCfg = Debug|PS3 + {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Debug|PS3.Build.0 = Debug|PS3 + {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Release|PS3.ActiveCfg = Release|PS3 + {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Release|PS3.Build.0 = Release|PS3 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit.ppu.o deleted file mode 100644 index 698e0fa7..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit.ppu.o and /dev/null differ diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj index 0d0bb861..b29724a3 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj +++ b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj @@ -56,15 +56,15 @@ <_ProjectFileVersion>10.0.30319.1 - PS3_Debug\ - PS3_Debug\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) false - PS3_Release\ - PS3_ContentPackage\ - PS3_Release\ - PS3_ContentPackage\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ + $(Platform)_$(Configuration)\ *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) *.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean) @@ -95,8 +95,11 @@ JobBin2 - ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -119,8 +122,11 @@ JobBin2 - ..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + @@ -143,9 +149,12 @@ JobBin2 - ..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt) + ..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt) Hard + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" + diff --git a/Minecraft.Client/PS3/SPU_Tasks/mssspurs.elf b/Minecraft.Client/PS3/SPU_Tasks/mssspurs.elf deleted file mode 100644 index 31ade45d..00000000 Binary files a/Minecraft.Client/PS3/SPU_Tasks/mssspurs.elf and /dev/null differ diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h index f1a85feb..23ca2365 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h @@ -10,7 +10,7 @@ #include "..\..\Common\Network\Sony\SQRNetworkManager.h" -#include "../OldSdk.h" +#include "../PSVitaExtras/OldSdk.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PSVita/OldSdk.cpp b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.cpp similarity index 98% rename from Minecraft.Client/PSVita/OldSdk.cpp rename to Minecraft.Client/PSVita/PSVitaExtras/OldSdk.cpp index 3b2619ed..00d93077 100644 --- a/Minecraft.Client/PSVita/OldSdk.cpp +++ b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "OldSdk.h" -#ifdef __PSVITA__ int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status) { if (status) *status = SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN; @@ -49,5 +48,4 @@ int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param) { return -1; -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Minecraft.Client/PSVita/OldSdk.h b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h similarity index 98% rename from Minecraft.Client/PSVita/OldSdk.h rename to Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h index c77631ab..2739b5f6 100644 --- a/Minecraft.Client/PSVita/OldSdk.h +++ b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h @@ -1,5 +1,4 @@ #pragma once -#ifdef __PSVITA__ #ifndef _OLD_SDK_H #define _OLD_SDK_H 1 @@ -51,5 +50,4 @@ SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEvent #define SCE_APPUTIL_APPEVENT_TYPE_NP_BASIC_JOINABLE_PRESENCE (3) -#endif #endif \ No newline at end of file diff --git a/Minecraft.World/Minecraft.World.vcxproj b/Minecraft.World/Minecraft.World.vcxproj index f9105bc4..5b74574e 100644 --- a/Minecraft.World/Minecraft.World.vcxproj +++ b/Minecraft.World/Minecraft.World.vcxproj @@ -858,7 +858,7 @@ false $(OutDir)$(ProjectName).pch MultiThreaded - _FINAL_BUILD;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions) + _DEBUG_MENUS_ENABLED;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions) Disabled true false @@ -1238,9 +1238,10 @@ false $(OutDir)$(ProjectName).pch MultiThreaded - _FINAL_BUILD;NDEBUG;_WINDOWS64;_LIB;_CONTENT_PACKAGE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _LARGE_WORLDS;_FINAL_BUILD;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Default + true true diff --git a/Minecraft.World/Minecraft.World.vcxproj.user b/Minecraft.World/Minecraft.World.vcxproj.user deleted file mode 100644 index 695b5c78..00000000 --- a/Minecraft.World/Minecraft.World.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/README.md b/README.md index 6fc18557..e67ea8e8 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,16 @@ Cafeberry is a project aiming to update the December 17th 2014 codebase (mostly) | Platform | Development Status | Known Issues | | :------------- | :-------------------- | :------------------------------------------------------------------------ | | PS3 | Active | SPU variants for TU19 blocks are missing, needs to be further optimized. | -| Xbox 360 | On hold | Havent tested, should work? | -| PS4 | Active | Only buildable on Windows 7 With 1.70 SDK. See Notes | +| Xbox 360 | Active | Works, Crashes when using updated XUI Scenes. See Notes | +| PS4 | Active | Only Easily buildable on Windows 7. See Notes | | Xbox One | On hold | Needs to be re-coded to run on Developer Mode UWP instead. | -| PS Vita | Active | Only buildable on Windows 7 With 3.75 SDK. | +| PSVita | Active | Buildable With 3.570 or 3.750 SDK. | | Wii U & Switch | Work in progress | UI System (ImXui) is still in progress, need to decompile the rest. | **Notes:** - **PS4:** Can't be built on Windows 10+ because the 1.70 SDK only supports Windows 7, solutions: 1. Attempt to add support for 4.50 SDK (difficult or unlikely to work) - 2. Getting the 1.70 SDK on Windows 10+ (annoying to do) \ No newline at end of file + 2. Force the 1.70 SDK on Windows 10+ (Takes 5-15m) +- **Xbox 360:** Needs XUI Scenes from TU18+, solutions: + 1. Get XURS from built .xex's and turn them back into XUI file's + 2. Recreate XUI scenes based off of Iggy scenes from TU57+ \ No newline at end of file