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/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index fb407878..a58a8247 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -4419,7 +4419,7 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto // 4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus #ifdef __ORBIS__ sceNpCommerceHidePsStoreIcon(); -#elif defined __PSVITA__ +#elif defined(__PSVITA__) && !defined(DISABLE_PSN) app.GetCommerce()->HidePsStoreIcon(); #endif app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus); @@ -6885,12 +6885,20 @@ HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGe // ignore the names if we don't recognize them if(pBannerName!=L"") { +#ifdef __PSVITA__ + wcsncpy_s( pDLCData->wchBanner, MAX_BANNERNAME_SIZE, pBannerName, MAX_BANNERNAME_SIZE); +#else wcsncpy_s( pDLCData->wchBanner, pBannerName, MAX_BANNERNAME_SIZE); +#endif } if(pDataFile[0]!=0) { +#ifdef __PSVITA__ + wcsncpy_s( pDLCData->wchDataFile, MAX_BANNERNAME_SIZE, pDataFile, MAX_BANNERNAME_SIZE); +#else wcsncpy_s( pDLCData->wchDataFile, pDataFile, MAX_BANNERNAME_SIZE); +#endif } #endif 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/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp index 53ea7a0e..e7a63676 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp @@ -1847,7 +1847,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO * // joinData->pInviteInfo = pInviteInfo; // tell the app to process this -#ifdef __PSVITA__ +#if !defined(DISABLE_PSN) && defined(__PSVITA__) if(((CPlatformNetworkManagerSony*)s_pPlatformNetworkManager)->checkValidInviteData(pInviteInfo)) #endif { @@ -2090,7 +2090,7 @@ void CGameNetworkManager::FakeLocalPlayerJoined() } #endif -#ifdef __PSVITA__ +#if !defined(DISABLE_PSN) && defined(__PSVITA__) bool CGameNetworkManager::usingAdhocMode() { return ((CPlatformNetworkManagerSony*)s_pPlatformNetworkManager)->usingAdhocMode(); @@ -2105,5 +2105,17 @@ void CGameNetworkManager::startAdhocMatching() { ((CPlatformNetworkManagerSony*)s_pPlatformNetworkManager)->startAdhocMatching(); } +#elif defined(__PSVITA__) +bool CGameNetworkManager::usingAdhocMode() +{ + return false; +} +void CGameNetworkManager::setAdhocMode(bool bAdhoc) +{ +} + +void CGameNetworkManager::startAdhocMatching() +{ +} #endif diff --git a/Minecraft.Client/Common/Network/NetworkSocketLayer.cpp b/Minecraft.Client/Common/Network/NetworkSocketLayer.cpp index f971b748..66d3ba31 100644 --- a/Minecraft.Client/Common/Network/NetworkSocketLayer.cpp +++ b/Minecraft.Client/Common/Network/NetworkSocketLayer.cpp @@ -4,28 +4,23 @@ #include "..\..\Common\Network\PlatformNetworkManager.h" #include "..\..\..\Minecraft.World\Socket.h" -#if defined _WINDOWS64 || defined _XBOX SOCKET NetworkSocketLayer::s_listenSocket = INVALID_SOCKET; SOCKET NetworkSocketLayer::s_hostConnectionSocket = INVALID_SOCKET; SOCKET NetworkSocketLayer::s_advertiseSock = INVALID_SOCKET; SOCKET NetworkSocketLayer::s_discoverySock = INVALID_SOCKET; -#elif defined __PS3__ || defined __ORBIS__ -SOCKET NetworkSocketLayer::s_listenSocket = -1; -SOCKET NetworkSocketLayer::s_hostConnectionSocket = -1; -SOCKET NetworkSocketLayer::s_advertiseSock = -1; -SOCKET NetworkSocketLayer::s_discoverySock = -1; -#if defined __PS3__ -#define LCE_NET_ERRNO sys_net_errno -int closesocket(int s) { return socketclose(s); }; +#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +void WSACleanup() {}; +#endif + +#ifdef __PS3__ void terminate_networking() { cellNetCtlTerm(); sys_net_finalize_network(); }; -#elif defined __ORBIS__ -#define LCE_NET_ERRNO errno -int closesocket(int s) { return sceNetSocketClose(s); }; -int socketclose(int s) { return sceNetSocketClose(s); }; +#else void terminate_networking() {}; #endif -void WSACleanup() {}; + +#if defined __PSVITA__ +int socket(int family, int type, int protocol) { return sceNetSocket(NULL, family, type, protocol); }; #endif C4JThread* NetworkSocketLayer::s_acceptThread = NULL; @@ -62,6 +57,9 @@ std::vector NetworkSocketLayer::s_disconnectedSmallIds; CRITICAL_SECTION NetworkSocketLayer::s_freeSmallIdLock; std::vector NetworkSocketLayer::s_freeSmallIds; +// only goes true on a successful Initialize(), and a failed one gets retried +static bool s_locksCreated = false; + bool g_MultiplayerHost = false; #if defined __ORBIS__ // Orbis has direct lan networking so it can bypass psn account checks @@ -77,6 +75,19 @@ char g_MultiplayerIP[256] = "127.0.0.1"; bool NetworkSocketLayer::Initialize() { if (s_initialized) return true; + + // Create the locks before touching the platform network stack. + if (!s_locksCreated) + { + InitializeCriticalSection(&s_sendLock); + InitializeCriticalSection(&s_connectionsLock); + InitializeCriticalSection(&s_advertiseLock); + InitializeCriticalSection(&s_discoveryLock); + InitializeCriticalSection(&s_disconnectLock); + InitializeCriticalSection(&s_freeSmallIdLock); + s_locksCreated = true; + } + #if defined _WINDOWS64 || defined _XBOX WSADATA wsaData; int result = WSAStartup(MAKEWORD(2, 2), &wsaData); @@ -98,14 +109,21 @@ bool NetworkSocketLayer::Initialize() sys_net_finalize_network(); return false; } -#endif +#elif defined __PSVITA__ + SceNetInitParam param; + static char memory[16 * 1024]; - InitializeCriticalSection(&s_sendLock); - InitializeCriticalSection(&s_connectionsLock); - InitializeCriticalSection(&s_advertiseLock); - InitializeCriticalSection(&s_discoveryLock); - InitializeCriticalSection(&s_disconnectLock); - InitializeCriticalSection(&s_freeSmallIdLock); + param.memory = memory; + param.size = sizeof(memory); + param.flags = 0; + + int result = sceNetInit(¶m); + // libnet is brought up before us by the platform layer, which reports EBUSY here. + if (result < 0 && result != SCE_NET_ERROR_EBUSY) { + app.DebugPrintf("sceNetInit failed: 0x%08x\n", result); + return false; + } +#endif s_initialized = true; @@ -134,7 +152,7 @@ void NetworkSocketLayer::Shutdown() closesocket(s_hostConnectionSocket); s_hostConnectionSocket = INVALID_SOCKET; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (s_listenSocket >= 0) { socketclose(s_listenSocket); @@ -155,7 +173,7 @@ void NetworkSocketLayer::Shutdown() s_connections[i].active = false; #if defined _WINDOWS64 || defined _XBOX if (s_connections[i].tcpSocket != INVALID_SOCKET) -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (s_connections[i].tcpSocket >= 0) #endif { @@ -189,6 +207,7 @@ void NetworkSocketLayer::Shutdown() s_disconnectedSmallIds.clear(); DeleteCriticalSection(&s_freeSmallIdLock); s_freeSmallIds.clear(); + s_locksCreated = false; WSACleanup(); s_initialized = false; } @@ -247,8 +266,12 @@ bool NetworkSocketLayer::HostGame(int port) app.DebugPrintf("socket() failed: %d\n", WSAGetLastError()); return false; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#ifdef __PSVITA__ + SceNetSockaddrIn addr = {}; +#else struct sockaddr_in addr = {}; +#endif addr.sin_family = AF_INET; addr.sin_addr.s_addr = htonl(INADDR_ANY); addr.sin_port = htons((uint16_t)port); @@ -301,8 +324,12 @@ bool NetworkSocketLayer::HostGame(int port) s_listenSocket = INVALID_SOCKET; return false; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#ifdef __PSVITA__ + iResult = ::bind(s_listenSocket, (const sockaddr*)&addr, sizeof(addr)); +#else iResult = ::bind(s_listenSocket, (struct sockaddr*)&addr, sizeof(addr)); +#endif if (iResult < 0) { app.DebugPrintf("bind() failed: %d\n", iResult); @@ -555,14 +582,18 @@ bool NetworkSocketLayer::JoinGame(const char *ip, int port) connected = true; break; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (s_hostConnectionSocket != -1) { socketclose(s_hostConnectionSocket); s_hostConnectionSocket = -1; } +#ifdef __PSVITA__ + SceNetSockaddrIn addr = {}; +#else struct sockaddr_in addr = {}; +#endif #if defined(__ORBIS__) addr.sin_len = sizeof(addr); @@ -602,41 +633,47 @@ bool NetworkSocketLayer::JoinGame(const char *ip, int port) setsockopt(s_hostConnectionSocket, IPPROTO_TCP, TCP_NODELAY, (const char *)&noDelay, sizeof(noDelay)); int nonBlocking = 1; -#ifdef __PS3__ setsockopt(s_hostConnectionSocket, SOL_SOCKET, SO_NBIO, &nonBlocking, sizeof(nonBlocking)); -#elif defined(__ORBIS__) - setsockopt(s_hostConnectionSocket, SOL_SOCKET, SCE_NET_SO_NBIO, &nonBlocking, sizeof(nonBlocking)); -#endif +#ifdef __PSVITA__ + iResult = connect(s_hostConnectionSocket, (const SceNetSockaddr*)&addr, sizeof(addr)); +#else iResult = connect(s_hostConnectionSocket, (struct sockaddr*)&addr, sizeof(addr)); - int connectError = iResult < 0 ? LCE_NET_ERRNO : 0; +#endif if (iResult < 0) { -#if defined(__PS3__) - int err = connectError; + int err = sys_net_errno; if (err == SYS_NET_EINPROGRESS) { -#elif defined(__ORBIS__) - int err = connectError; - if (err == EINPROGRESS) - { -#endif +#ifndef __PSVITA__ fd_set writeFds, exceptFds; FD_ZERO(&writeFds); FD_ZERO(&exceptFds); FD_SET(s_hostConnectionSocket, &writeFds); FD_SET(s_hostConnectionSocket, &exceptFds); - struct timeval tv; tv.tv_sec = connectTimeoutMs / 1000; tv.tv_usec = (connectTimeoutMs % 1000) * 1000; - -#if defined(__PS3__) - int selectResult = socketselect(s_hostConnectionSocket + 1, NULL, &writeFds, &exceptFds, &tv); -#elif defined(__ORBIS__) - int selectResult = select(s_hostConnectionSocket + 1, NULL, &writeFds, &exceptFds, &tv); +#else + SceNetId eid = sceNetEpollCreate(NULL, 0); + SceNetEpollEvent ev = {}; + ev.events = SCE_NET_EPOLLOUT; + ev.data.fd = s_hostConnectionSocket; + sceNetEpollControl(eid, SCE_NET_EPOLL_CTL_ADD, s_hostConnectionSocket, &ev); + int timeoutUsec = connectTimeoutMs * 1000; + SceNetEpollEvent outEvents[1]; + int selectResult = sceNetEpollWait(eid, outEvents, 1, timeoutUsec); + sceNetEpollControl(eid, SCE_NET_EPOLL_CTL_DEL, s_hostConnectionSocket, NULL); + sceNetEpollDestroy(eid); #endif + +#ifndef __PSVITA__ + int selectResult = socketselect(s_hostConnectionSocket + 1, NULL, &writeFds, &exceptFds, &tv); if (selectResult <= 0 || FD_ISSET(s_hostConnectionSocket, &exceptFds)) +#else + if (selectResult <= 0 || (selectResult > 0) && + (outEvents[0].events & (SCE_NET_EPOLLERR | SCE_NET_EPOLLHUP))) +#endif { app.DebugPrintf("connect() to %s:%d timed out or failed (attempt %d/%d)\n", ip, port, attempt + 1, maxAttempts); closesocket(s_hostConnectionSocket); @@ -667,7 +704,7 @@ bool NetworkSocketLayer::JoinGame(const char *ip, int port) int blocking = 0; #ifdef __PS3__ setsockopt(s_hostConnectionSocket, SOL_SOCKET, SO_NBIO, &blocking, sizeof(blocking)); -#elif defined(__ORBIS__) +#elif defined(__ORBIS__) || defined __PSVITA__ setsockopt(s_hostConnectionSocket, SOL_SOCKET, SCE_NET_SO_NBIO, &blocking, sizeof(blocking)); #endif @@ -721,7 +758,7 @@ bool NetworkSocketLayer::SendOnSocket(SOCKET sock, const void *data, int dataSiz { #if defined _WINDOWS64 || defined _XBOX if (sock == INVALID_SOCKET || dataSize <= 0) return false; -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (sock < 0 || dataSize <= 0) return false; #endif @@ -740,7 +777,7 @@ bool NetworkSocketLayer::SendOnSocket(SOCKET sock, const void *data, int dataSiz int sent = send(sock, (const char *)header + totalSent, toSend - totalSent, 0); #if defined _WINDOWS64 || defined _XBOX if (sent == SOCKET_ERROR || sent == 0) -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (sent < 0 || sent == 0) #endif { @@ -757,7 +794,7 @@ bool NetworkSocketLayer::SendOnSocket(SOCKET sock, const void *data, int dataSiz #if defined _WINDOWS64 || defined _XBOX if (sent == SOCKET_ERROR || sent == 0) -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (sent < 0 || sent == 0) #endif { @@ -780,7 +817,7 @@ bool NetworkSocketLayer::SendToSmallId(BYTE targetSmallId, const void *data, int SOCKET sock = GetSocketForSmallId(targetSmallId); #if defined _WINDOWS64 || defined _XBOX if (sock == INVALID_SOCKET) return false; -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (sock < 0) return false; #endif return SendOnSocket(sock, data, dataSize); @@ -806,7 +843,7 @@ SOCKET NetworkSocketLayer::GetSocketForSmallId(BYTE smallId) LeaveCriticalSection(&s_connectionsLock); #if defined _WINDOWS64 || defined _XBOX return INVALID_SOCKET; -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ return -1; #endif } @@ -848,7 +885,11 @@ int NetworkSocketLayer::AcceptThreadProc(LPVOID param) { while (s_active) { +#ifdef __PSVITA__ + SOCKET clientSocket = accept(s_listenSocket, (SceNetSockaddr *)NULL, NULL); +#else SOCKET clientSocket = accept(s_listenSocket, NULL, NULL); +#endif #if defined _WINDOWS64 || defined _XBOX if (clientSocket == INVALID_SOCKET) { @@ -856,7 +897,7 @@ int NetworkSocketLayer::AcceptThreadProc(LPVOID param) app.DebugPrintf("accept() failed: %d\n", WSAGetLastError()); break; } -#elif __PS3__ || defined __ORBIS__ +#elif __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (clientSocket < 0) { if (s_active) @@ -1063,7 +1104,7 @@ int NetworkSocketLayer::ClientRecvThreadProc(LPVOID param) #if defined _WINDOWS64 || defined _XBOX while (s_active && s_hostConnectionSocket != INVALID_SOCKET) -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ while (s_active && s_hostConnectionSocket >= 0) #endif { @@ -1128,7 +1169,7 @@ bool NetworkSocketLayer::StartAdvertising(int gamePort, const wchar_t *hostName, app.DebugPrintf("Win64 LAN: Failed to create advertise socket: %d\n", WSAGetLastError()); return false; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (s_advertiseSock < 0) { app.DebugPrintf("PS3 LAN: Failed to create advertise socket: %d\n", s_advertiseSock); @@ -1156,7 +1197,7 @@ void NetworkSocketLayer::StopAdvertising() closesocket(s_advertiseSock); s_advertiseSock = INVALID_SOCKET; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (s_advertiseSock >= 0) { closesocket(s_advertiseSock); @@ -1200,7 +1241,11 @@ void NetworkSocketLayer::UpdateAdvertiseJoinable(bool joinable) int NetworkSocketLayer::AdvertiseThreadProc(LPVOID param) { +#ifdef __PSVITA__ + SceNetSockaddrIn broadcastAddr; +#else struct sockaddr_in broadcastAddr; +#endif memset(&broadcastAddr, 0, sizeof(broadcastAddr)); broadcastAddr.sin_family = AF_INET; broadcastAddr.sin_port = htons(NETWORK_LAN_DISCOVERY_PORT); @@ -1218,15 +1263,20 @@ int NetworkSocketLayer::AdvertiseThreadProc(LPVOID param) data.gameHostSettings = htonl(data.gameHostSettings); data.texturePackParentId = htonl(data.texturePackParentId); +#ifdef __PSVITA__ + int sent = sendto(s_advertiseSock, (const char *)&data, sizeof(data), 0, + (const sockaddr *)&broadcastAddr, sizeof(broadcastAddr)); +#else int sent = sendto(s_advertiseSock, (const char *)&data, sizeof(data), 0, (struct sockaddr *)&broadcastAddr, sizeof(broadcastAddr)); +#endif #if defined _WINDOWS64 || defined _XBOX if (sent == SOCKET_ERROR && s_advertising) { app.DebugPrintf("Win64 LAN: Broadcast sendto failed: %d\n", WSAGetLastError()); } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (sent < 0 && s_advertising) { app.DebugPrintf("PS3 LAN: Broadcast sendto failed: %d\n", sent); @@ -1251,7 +1301,7 @@ bool NetworkSocketLayer::StartDiscovery() app.DebugPrintf("Win64 LAN: Failed to create discovery socket: %d\n", WSAGetLastError()); return false; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ app.DebugPrintf("Discovery socket: %d\n", s_discoverySock); if (s_discoverySock < 0) { @@ -1263,8 +1313,12 @@ bool NetworkSocketLayer::StartDiscovery() BOOL reuseAddr = TRUE; setsockopt(s_discoverySock, SOL_SOCKET, SO_REUSEADDR, (const char *)&reuseAddr, sizeof(reuseAddr)); - + +#ifdef __PSVITA__ + SceNetSockaddrIn bindAddr; +#else struct sockaddr_in bindAddr; +#endif memset(&bindAddr, 0, sizeof(bindAddr)); bindAddr.sin_family = AF_INET; bindAddr.sin_port = htons(NETWORK_LAN_DISCOVERY_PORT); @@ -1278,14 +1332,15 @@ bool NetworkSocketLayer::StartDiscovery() s_discoverySock = INVALID_SOCKET; return false; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ +#ifdef __PSVITA__ + if (::bind(s_discoverySock, (const sockaddr *)&bindAddr, sizeof(bindAddr)) < 0) + { +#else if (::bind(s_discoverySock, (struct sockaddr *)&bindAddr, sizeof(bindAddr)) < 0) { -#if defined(__PS3__) - app.DebugPrintf("PS3 LAN: Discovery bind failed: %d\n", sys_net_errno); -#elif defined(__ORBIS__) - app.DebugPrintf("PS3 LAN: Discovery bind failed: %d\n", sce_net_errno); #endif + app.DebugPrintf("PS3 LAN: Discovery bind failed: %d\n", sys_net_errno); socketclose(s_discoverySock); s_discoverySock = -1; return false; @@ -1319,7 +1374,7 @@ void NetworkSocketLayer::StopDiscovery() closesocket(s_discoverySock); s_discoverySock = INVALID_SOCKET; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (s_discoverySock >= 0) { socketclose(s_discoverySock); @@ -1357,22 +1412,31 @@ int NetworkSocketLayer::DiscoveryThreadProc(LPVOID param) while (s_discovering) { +#ifdef __PSVITA__ + SceNetSockaddrIn senderAddr; +#else struct sockaddr_in senderAddr; +#endif #if defined _WINDOWS64 || defined _XBOX int senderLen = sizeof(senderAddr); -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ socklen_t senderLen = sizeof(senderAddr); #endif +#ifdef __PSVITA__ + int recvLen = recvfrom(s_discoverySock, recvBuf, sizeof(recvBuf), 0, + (sockaddr *)&senderAddr, &senderLen); +#else int recvLen = recvfrom(s_discoverySock, recvBuf, sizeof(recvBuf), 0, (struct sockaddr *)&senderAddr, &senderLen); +#endif #ifdef _WINDOWS64 if (recvLen == SOCKET_ERROR) { continue; } -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if (recvLen < 0) { continue; diff --git a/Minecraft.Client/Common/Network/NetworkSocketLayer.h b/Minecraft.Client/Common/Network/NetworkSocketLayer.h index 823cfeee..62da1eb9 100644 --- a/Minecraft.Client/Common/Network/NetworkSocketLayer.h +++ b/Minecraft.Client/Common/Network/NetworkSocketLayer.h @@ -7,7 +7,7 @@ #include #include #include -#elif defined __PS3__ || defined __ORBIS__ +#elif defined __PS3__ || defined __ORBIS__ #include #include #include @@ -16,6 +16,8 @@ #include #include #include +#elif defined __PSVITA__ +#include #endif #ifdef __PS3__ @@ -37,8 +39,62 @@ #define NETWORK_LAN_DISCOVERY_PORT 25566 #define NETWORK_LAN_BROADCAST_MAGIC 0x4D434C4E -#if defined __PS3__ || defined __ORBIS__ +#ifdef __PS3__ typedef int SOCKET; +#define INVALID_SOCKET -1 +#define closesocket socketclose +#elif defined(__ORBIS__) +typedef int SOCKET; +#define INVALID_SOCKET -1 +#define SO_NBIO SCE_NET_SO_NBIO +#define sys_net_errno errno +#define SYS_NET_EINPROGRESS EINPROGRESS +#define socketselect select +#define closesocket sceNetSocketClose +#define socketclose sceNetSocketClose +#elif defined(__PSVITA__) +typedef SceNetId SOCKET; +typedef SceNetSockaddr sockaddr; +typedef SceNetSocklen_t socklen_t; + +#define getsockopt sceNetGetsockopt +#define setsockopt sceNetSetsockopt +#define recv sceNetRecv +#define send sceNetSend +#define bind sceNetBind +#define sendto sceNetSendto +#define recvfrom sceNetRecvfrom +#define listen sceNetListen +#define connect sceNetConnect +#define accept sceNetAccept +#define closesocket sceNetSocketClose +#define socketclose sceNetSocketClose +#define inet_ntop sceNetInetNtop + +#define SOL_SOCKET SCE_NET_SOL_SOCKET +#define AF_INET SCE_NET_AF_INET +#define SOCK_STREAM SCE_NET_SOCK_STREAM +#define sys_net_errno sce_net_errno +#define SYS_NET_EINPROGRESS SCE_NET_EINPROGRESS + +#define htonl sceNetHtonl +#define htons sceNetHtons +#define ntohl sceNetNtohl +#define ntohs sceNetNtohs + +#define SO_BROADCAST SCE_NET_SO_BROADCAST +#define SO_ERROR SCE_NET_SO_ERROR +#define SO_RCVTIMEO SCE_NET_SO_RCVTIMEO +#define SO_REUSEADDR SCE_NET_SO_REUSEADDR +#define SO_NBIO SCE_NET_SO_NBIO +#define SOCK_DGRAM SCE_NET_SOCK_DGRAM + +#define INADDR_ANY SCE_NET_INADDR_ANY +#define IPPROTO_TCP SCE_NET_IPPROTO_TCP +#define IPPROTO_UDP SCE_NET_IPPROTO_UDP +#define TCP_NODELAY SCE_NET_TCP_NODELAY +#define INADDR_BROADCAST SCE_NET_INADDR_BROADCAST + #define INVALID_SOCKET -1 #endif @@ -173,4 +229,4 @@ private: extern bool g_MultiplayerHost; extern bool g_MultiplayerJoin; extern int g_MultiplayerPort; -extern char g_MultiplayerIP[256]; \ No newline at end of file +extern char g_MultiplayerIP[256]; diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManager.cpp b/Minecraft.Client/Common/Network/PlatformNetworkManager.cpp index ce44a839..5f6d43e1 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManager.cpp +++ b/Minecraft.Client/Common/Network/PlatformNetworkManager.cpp @@ -770,7 +770,7 @@ void CPlatformNetworkManagerStub::SearchForGames() } } -#ifdef __ORBIS__ +#if defined(__ORBIS__) || defined(__PSVITA__) SceNetInAddr ip_addr = {}; sceNetInetPton(SCE_NET_AF_INET, lanSessions[i].hostIP, &ip_addr); info->sessionId = (ULONGLONG)((uint64_t)ip_addr.s_addr | ((uint64_t)lanSessions[i].hostPort << 32)); diff --git a/Minecraft.Client/Common/Network/SessionInfo.h b/Minecraft.Client/Common/Network/SessionInfo.h index b48ecbae..eb9a42a6 100644 --- a/Minecraft.Client/Common/Network/SessionInfo.h +++ b/Minecraft.Client/Common/Network/SessionInfo.h @@ -1,6 +1,6 @@ #pragma once -#if defined(__PS3__) || defined(__ORBIS__) +#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__)) #include "..\..\Common\Network\Sony\SQRNetworkManager.h" #endif diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp index 64bc1d67..ac1c4e9b 100644 --- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp +++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp @@ -56,7 +56,7 @@ void CPlatformNetworkManagerSony::HandleStateChange(SQRNetworkManager::eSQRNetwo // 4J Stu - We may be accepting an invite from the DLC menu, so hide the icon #ifdef __ORBIS__ sceNpCommerceHidePsStoreIcon(); -#elif defined __PSVITA__ +#elif defined(__PSVITA__) && !defined(DISABLE_PSN) app.GetCommerce()->HidePsStoreIcon(); #endif m_bLeavingGame = false; diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h index 5bb66875..9251da76 100644 --- a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h +++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h @@ -80,7 +80,6 @@ public: bool inviteOnly; }; - // Externally exposed state. All internal states are mapped to one of these broader states. typedef enum { @@ -324,4 +323,4 @@ public: virtual void HandleAddLocalPlayerFailed(int idx) = 0; virtual void HandleDisconnect(bool bLostRoomOnly,bool bPSNSignOut=false) = 0; virtual void HandleInviteReceived( int userIndex, const SQRNetworkManager::PresenceSyncInfo *pInviteInfo) = 0; -}; +}; \ No newline at end of file diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h index d1baab8c..1c1acc38 100644 --- a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h +++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h @@ -124,7 +124,7 @@ class SQRNetworkPlayer int GetTotalSendQueueMessages(); -#ifdef __PSVITA__ +#if !defined(DISABLE_PSN) && defined(__PSVITA__) void SendInternal_VitaAdhoc(const void *data, unsigned int dataSize, EAdhocDataTag tag = e_dataTag_Normal); void SendMoreInternal_VitaAdhoc(); #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/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp index ce0b56a8..9e8a6b92 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp @@ -13,7 +13,7 @@ #include "..\..\..\Minecraft.World\LevelType.h" #include "..\..\DLCTexturePack.h" -#ifdef __PSVITA__ +#if !defined(DISABLE_PSN) && defined(__PSVITA__) #include "PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" #endif @@ -1044,7 +1044,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD #endif bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame; -#ifdef __PSVITA__ +#if !defined DISABLE_PSN && defined __PSVITA__ if(CGameNetworkManager::usingAdhocMode()) { if(SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())// && pClass->m_MoreOptionsParams.bOnlineGame) diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp index b2147311..45794790 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp @@ -100,7 +100,7 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press { #ifdef __ORBIS__ sceNpCommerceHidePsStoreIcon(); -#elif defined __PSVITA__ +#elif defined(__PSVITA__) && !defined(DISABLE_PSN) app.GetCommerce()->HidePsStoreIcon(); #endif navigateBack(); @@ -174,7 +174,7 @@ int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMess #ifdef __ORBIS__ sceNpCommerceHidePsStoreIcon(); -#elif defined __PSVITA__ +#elif defined(__PSVITA__) && !defined(DISABLE_PSN) app.GetCommerce()->HidePsStoreIcon(); #endif pClass->navigateBack(); @@ -201,7 +201,7 @@ void UIScene_DLCMainMenu::tick() { UIScene::tick(); -#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) +#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)) if((m_bCategoriesShown==false) && (app.GetCommerceCategoriesRetrieved())) { // disable the timer display on this menu diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp index cf08371b..087faada 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp @@ -6,7 +6,7 @@ #include "Common\Network\Sony\SonyHttp.h" #endif -#ifdef __PSVITA__ +#if !defined(DISABLE_PSN) && defined(__PSVITA__) #include "PSVita\Network\SonyCommerce_Vita.h" #endif @@ -107,7 +107,7 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::E #ifdef __ORBIS__ sceNpCommerceHidePsStoreIcon(); -#elif defined __PSVITA__ +#elif defined(__PSVITA__) && !defined(DISABLE_PSN) app.GetCommerce()->HidePsStoreIcon(); #endif ui.NavigateToHomeMenu();//iPad,eUIScene_MainMenu); @@ -335,7 +335,7 @@ void UIScene_DLCOffersMenu::tick() { UIScene::tick(); -#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) +#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)) if(m_bAddAllDLCButtons) { @@ -506,7 +506,7 @@ void UIScene_DLCOffersMenu::tick() } else { -#ifdef __PSVITA__ +#if !defined(DISABLE_PSN) && defined(__PSVITA__) // MGH - fixes bug 5768 on Vita - should be extended properly to work for other platforms if((SonyCommerce_Vita::getPurchasabilityUpdated()) && app.GetCommerceProductListRetrieved()&& app.GetCommerceProductListInfoRetrieved() && m_iTotalDLC > 0) { diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp index b55ee5fc..ba8870e2 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp @@ -532,7 +532,7 @@ int UIScene_InGameInfoMenu::ViewInvites_SignInReturned(void *pParam,bool bContin #elif defined(__PS3__) int ret = sceNpBasicRecvMessageCustom(SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE, SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE, SYS_MEMORY_CONTAINER_ID_INVALID); app.DebugPrintf("sceNpBasicRecvMessageCustom return %d ( %08x )\n", ret, ret); -#else // __PSVITA__ +#elif !defined(DISABLE_PSN) // __PSVITA__ SQRNetworkManager_Vita::RecvInviteGUI(); #endif } diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp index 14654173..ec0fd459 100644 --- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp @@ -474,7 +474,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) #ifndef DISABLE_PSN isSignedInLive = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()); #endif -#ifdef __PSVITA__ +#if !defined DISABLE_PSN && defined __PSVITA__ if(CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) isSignedInLive = true; #endif diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp index cf5afce4..27c961af 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp @@ -1550,7 +1550,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal } bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame; -#ifdef __PSVITA__ +#if !defined DISABLE_PSN && defined __PSVITA__ if(CGameNetworkManager::usingAdhocMode()) { if(SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())// && pClass->m_MoreOptionsParams.bOnlineGame) diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp index cc7b74e0..aeeb871f 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -182,7 +182,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer Initialise(); -#ifdef __PSVITA__ +#if !defined DISABLE_PSN && defined __PSVITA__ if(CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { g_NetworkManager.startAdhocMatching(); // create the client matching context and clear out the friends list @@ -1559,7 +1559,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) return; } -#ifdef __PSVITA__ +#if !defined DISABLE_PSN && defined __PSVITA__ if(CGameNetworkManager::usingAdhocMode() && !SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { // not connected to adhoc anymore, must have connected back to PSN to buy texture pack so sign in again @@ -2232,6 +2232,9 @@ int UIScene_LoadOrJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStora { UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; +#ifdef DISABLE_PSN + UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(pClass, true, iPad); +#else if(result==C4JStorage::EMessage_ResultAccept) { SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack, pClass); @@ -2241,6 +2244,7 @@ int UIScene_LoadOrJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStora pClass->m_bIgnoreInput = false; } +#endif return 0; } diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp index d3508ef5..1a6f51d5 100644 --- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp @@ -750,7 +750,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in if(ProfileManager.IsFullVersion()) { bool bSignedInLive = ProfileManager.IsSignedInLive(iPad); -#ifdef __PSVITA__ +#if !defined DISABLE_PSN && defined __PSVITA__ if(CGameNetworkManager::usingAdhocMode()) { if(SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) @@ -1343,7 +1343,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { // are we offline? bool bSignedInLive = ProfileManager.IsSignedInLive(iPad); -#ifdef __PSVITA__ +#if !defined DISABLE_PSN && defined __PSVITA__ if(app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_PSVita_NetworkModeAdhoc) == true) { CGameNetworkManager::setAdhocMode(true); diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp index 151532a4..86f3b87a 100644 --- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp @@ -1703,12 +1703,16 @@ int UIScene_SkinSelectMenu::MustSignInReturned(void *pParam,int iPad,C4JStorage: { if(result==C4JStorage::EMessage_ResultAccept) { +#ifdef DISABLE_PSN + UIScene_SkinSelectMenu::PSNSignInReturned(pParam, true, iPad); +#else #ifdef __PS3__ SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_SkinSelectMenu::PSNSignInReturned, pParam,true); #elif defined __PSVITA__ SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_SkinSelectMenu::PSNSignInReturned, pParam,true); #elif defined __ORBIS__ SQRNetworkManager_Orbis::AttemptPSNSignIn(&UIScene_SkinSelectMenu::PSNSignInReturned, pParam,true); +#endif #endif } return 0; 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 0124434b..9eab3062 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -479,7 +479,7 @@ true - $(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)..\Minecraft.Client\PSVita\Assert;$(ProjectDir);$(ProjectDir)..\Minecraft.World\x64headers;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras + $(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)..\Minecraft.Client\PSVita\Assert;$(ProjectDir);$(ProjectDir)..\Minecraft.World\x64headers;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras;$(SCE_PSP2_SDK_DIR)\host_tools\build\include;$(SCE_PSP2_SDK_DIR)\target\include;$(SCE_PSP2_SDK_DIR)\target\include_common; true @@ -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,8 +1027,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)$(ProjectName).pch MultiThreaded - - _LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_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 @@ -1028,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 @@ -1341,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 + @@ -1432,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 + @@ -1531,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 + @@ -1607,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 @@ -1621,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 + @@ -1682,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 @@ -1695,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)/" @@ -1734,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 @@ -1768,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 @@ -1804,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 @@ -2231,7 +2267,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU true $(OutDir)$(ProjectName).pdb - -lSceDbg_stub;-lSceGxm_stub;-lSceAppUtil_stub;-lSceCommonDialog_stub;-lSceDisplay_stub;-lSceTouch_stub;-lSceCtrl_stub;-lSceAudio_stub;-lSceDbgFont;-lSceRazorCapture_stub_weak;-lSceSysmodule_stub;-lSceDeflt;-lScePng;$(OutDir)Minecraft.World.a;libSceRtc_stub.a;libSceFios2_stub_weak.a;libSceCes.a;libScePerf_stub.a;libScePerf_stub_weak.a;libSceUlt_stub.a;libSceUlt_stub_weak.a;libSceNpManager_stub_weak.a;libSceNpCommon_stub_weak.a;libSceHttp_stub.a;libSceNpTrophy_stub.a;libSceNpScore_stub.a;libSceRudp_stub_weak.a;libSceVoice_stub.a;libSceNetAdhocMatching_stub.a;libScePspnetAdhoc_stub.a;libScePower_stub.a;libSceAppUtil_stub.a;libSceAppMgr_stub.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2.a;..\Minecraft.Client\PSVita\Miles\lib\binkapsp2.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2midi.a;..\Minecraft.Client\PSVita\Miles\lib\fltpsp2.a;..\Minecraft.Client\Common\Network\Sony\sceRemoteStorage\psvita\lib\sceRemoteStorage.a + -lSceNet_stub;-lSceDbg_stub;-lSceGxm_stub;-lSceAppUtil_stub;-lSceCommonDialog_stub;-lSceDisplay_stub;-lSceTouch_stub;-lSceCtrl_stub;-lSceAudio_stub;-lSceDbgFont;-lSceNet_stub_weak;-lSceRazorCapture_stub_weak;-lSceSysmodule_stub;-lSceDeflt;-lScePng;$(OutDir)Minecraft.World.a;libSceNet_stub.a;libSceNet_stub_weak.a;libSceRtc_stub.a;libSceFios2_stub_weak.a;libSceCes.a;libScePerf_stub.a;libScePerf_stub_weak.a;libSceUlt_stub.a;libSceUlt_stub_weak.a;libSceNpManager_stub_weak.a;libSceNpCommon_stub_weak.a;libSceHttp_stub.a;libSceNpTrophy_stub.a;libSceNpScore_stub.a;libSceRudp_stub_weak.a;libSceVoice_stub.a;libSceNetAdhocMatching_stub.a;libScePspnetAdhoc_stub.a;libScePower_stub.a;libSceAppUtil_stub.a;libSceAppMgr_stub.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2.a;..\Minecraft.Client\PSVita\Miles\lib\binkapsp2.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2midi.a;..\Minecraft.Client\PSVita\Miles\lib\fltpsp2.a;..\Minecraft.Client\Common\Network\Sony\sceRemoteStorage\psvita\lib\sceRemoteStorage.a StripFuncsAndData --strip-duplicates None @@ -3836,6 +3872,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true @@ -3850,18 +3892,18 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse true true - true + false true - true + false true - true + false true - true + false true - true + false false true - true + false true true true @@ -3889,12 +3931,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false - false - false - false - false - false + true + true + true + true + true + true true @@ -3911,12 +3953,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false - false - false - false - false - false + true + true + true + true + true + true true true @@ -4006,12 +4048,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false - false - false - false - false - false + true + true + true + true + true + true true @@ -4028,12 +4070,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false - false - false - false - false - false + true + true + true + true + true + true false true true @@ -14027,6 +14069,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true true @@ -14145,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 @@ -14183,6 +14269,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true true @@ -14220,6 +14312,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true true @@ -14257,8 +14355,39 @@ 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 @@ -15599,18 +15728,18 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse false true - true + false true - true + false true - true + false true - true + false true true - true + false true - true + false true true true @@ -16480,12 +16609,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true - true - true - true - true - true + false + false + false + false + false + false false false false @@ -20928,6 +21057,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true @@ -20939,18 +21074,18 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse true true - true + false true - true + false true - true + false true - true + false true - true + false false true - true + false true true true @@ -20978,12 +21113,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false - false - false - false - false - false + true + true + true + true + true + true true @@ -21000,12 +21135,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false - false - false - false - false - false + true + true + true + true + true + true true true @@ -21082,12 +21217,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse false false - false - false - false - false - false - false + true + true + true + true + true + true true true true @@ -21118,12 +21253,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false - false - false - false - false - false + true + true + true + true + true + true false true true @@ -27456,6 +27591,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true true @@ -27493,6 +27634,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true true @@ -27647,6 +27794,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true true @@ -27684,6 +27837,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true true @@ -27721,8 +27880,39 @@ 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 @@ -28509,18 +28699,18 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse false true - true + false true - true + false true - true + false true - true + false true - true + false true true - true + false true true true @@ -28866,12 +29056,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true - true - true - true - true - true + false + false + false + false + false + false false false false @@ -33943,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 @@ -34023,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 @@ -34036,7 +34424,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true + false true false true @@ -34089,6 +34477,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true + true true @@ -34105,7 +34494,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true + false true false true @@ -34149,7 +34538,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - false + true false true false @@ -34192,7 +34581,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true + false true true true @@ -36127,4 +36516,4 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU - + \ No newline at end of file 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/4JLibs/inc/4J_Profile.h b/Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h index a3a487fe..d7df4413 100644 --- a/Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h +++ b/Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h @@ -24,6 +24,7 @@ class PlayerUID int m_userID; // user logged on to the XMB public: + ULONGLONG XUID; class Hash { @@ -34,6 +35,8 @@ public: PlayerUID(); PlayerUID(int userID, SceNpOnlineId& onlineID, bool bSignedInPSN, int quadrant); PlayerUID(std::wstring fromString); + PlayerUID(ULONGLONG xuid) { XUID = xuid; } + operator ULONGLONG() const { return XUID; } bool operator==(const PlayerUID& rhs) const; bool operator!=(const PlayerUID& rhs); @@ -56,6 +59,7 @@ private: typedef PlayerUID *PPlayerUID; +#ifndef DISABLE_PSN class GameSessionUID { char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH]; @@ -76,6 +80,7 @@ public: void setForAdhoc(); }; +#endif enum eAwardType { 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.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp index 790debd0..e1990801 100644 --- a/Minecraft.Client/PSVita/PSVita_App.cpp +++ b/Minecraft.Client/PSVita/PSVita_App.cpp @@ -14,13 +14,18 @@ #include "PSVita\Network\SonyRemoteStorage_Vita.h" #include "PSVita\Network\SonyCommerce_Vita.h" #include "..\..\Common\Network\Sony\SonyRemoteStorage.h" -#include "PSVita/Network/PSVita_NPToolkit.h" #include #include #include "Common\UI\UI.h" #include "PSVita\PSVitaExtras\PSVitaStrings.h" +#ifndef DISABLE_PSN +#include "PSVita/Network/PSVita_NPToolkit.h" +#endif + +#ifndef DISABLE_PSN #define VITA_COMMERCE_ENABLED +#endif CConsoleMinecraftApp app; CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp() @@ -41,6 +46,7 @@ CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp() m_pSaveToDelete = NULL; m_pCheckoutProductInfo = NULL; + m_pCommerce = NULL; } void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId) @@ -1021,6 +1027,7 @@ void CConsoleMinecraftApp::AppEventTick() res = sceAppUtilReceiveAppEvent(&eventParam); if (res == SCE_OK) { +#ifndef DISABLE_PSN if (SCE_APPUTIL_APPEVENT_TYPE_NP_APP_DATA_MESSAGE == eventParam.type) { PSVitaNPToolkit::getMessageData(&eventParam); @@ -1035,6 +1042,7 @@ void CConsoleMinecraftApp::AppEventTick() app.DebugPrintf("unknown app event : 0x%08x\n", eventParam.type); assert(0); } +#endif } } @@ -1073,6 +1081,7 @@ void CConsoleMinecraftApp::AppEventTick() bool CConsoleMinecraftApp::CheckForEmptyStore(int iPad) { +#ifdef VITA_COMMERCE_ENABLED SonyCommerce::CategoryInfo *pCategories=app.GetCategoryInfo(); bool bEmptyStore=true; @@ -1102,6 +1111,9 @@ bool CConsoleMinecraftApp::CheckForEmptyStore(int iPad) } return bEmptyStore; +#else + return true; +#endif } diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp index 7edc1687..ea26eb59 100644 --- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp +++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp @@ -3,7 +3,12 @@ #include "stdafx.h" +#ifndef DISABLE_PSN #include "Leaderboards\PSVitaLeaderboardManager.h" +#include "Common\Network\Sony\SQRNetworkManager.h" +#include "PSVita/Network/PSVita_NPToolkit.h" +#include "PSVita\Network\SonyVoiceChat_Vita.h" +#endif #include "PSVita\PSVitaExtras\ShutdownManager.h" //#define HEAPINSPECTOR_PS3 1 @@ -54,12 +59,10 @@ #include "..\..\Minecraft.World\OldChunkStorage.h" //#include "PS3\PS3Extras\EdgeZLib.h" #include "..\..\Minecraft.World\C4JThread.h" -#include "Common\Network\Sony\SQRNetworkManager.h" #include "Common\UI\IUIScene_PauseMenu.h" #include "Conf.h" -#include "PSVita/Network/PSVita_NPToolkit.h" -#include "PSVita\Network\SonyVoiceChat_Vita.h" #include "..\..\Minecraft.World\FireworksRecipe.h" +#include "..\..\Minecraft.Client\Common\Network\NetworkSocketLayer.h" #include #include @@ -376,7 +379,9 @@ void RegisterAwardsWithProfileManager() ProfileManager.RichPresenceInit(4,1); //Chris TODO +#ifndef DISABLE_PSN ProfileManager.SetRichPresenceSettingFn(SQRNetworkManager_Vita::SetRichPresence); +#endif char *pchRichPresenceString; pchRichPresenceString=(char *)AddRichPresenceString(IDS_RICHPRESENCE_GAMESTATE); @@ -517,7 +522,9 @@ int main() } app.InitTime(); +#ifndef DISABLE_PSN PSVitaNPToolkit::init(); +#endif // initialise the storage manager with a default save display name, a Minimum save size, and a callback for displaying the saving message StorageManager.Init( 0, L"savegame.dat", "savePackName", FIFTY_ONE_MB, &CConsoleMinecraftApp::DisplaySavingMessage, (LPVOID)&app, NULL); @@ -658,13 +665,22 @@ int main() app.CommerceInit(); // MGH - moved this here so GetCommerce isn't NULL // 4J-PB - Kick of the check for trial or full version - requires ui to be initialised +#ifndef DISABLE_PSN app.GetCommerce()->CheckForTrialUpgradeKey(); +#endif // debug switch to trial version //ProfileManager.SetDebugFullOverride(false); +#ifdef DISABLE_PSN + // Set full mode. on DISABLE_PSN we cannot check if its trial or not. + ProfileManager.SetFullVersion(true); + ProfileManager.SetDebugFullOverride(true); + StorageManager.SetSaveDisabled(false); +#endif + //ProfileManager.AddDLC(2); StorageManager.SetDLCPackageRoot("DLCDrive"); #if 0 @@ -759,6 +775,7 @@ int main() // XN_SYS_SIGNINCHANGED notifications. This does mean that we need to have a callback in the // ProfileManager for XN_LIVE_INVITE_ACCEPTED for QNet. g_NetworkManager.Initialise(); + NetworkSocketLayer::Initialize(); g_NetworkManager.SetLocalGame(true); // Set the default sound levels @@ -796,8 +813,9 @@ int main() #endif while( true ) { +#ifndef DISABLE_PSN SonyVoiceChat_Vita::tick(); - +#endif RenderManager.StartFrame(); #if 0 if(pMinecraft->soundEngine->isStreamingWavebankReady() && @@ -846,7 +864,9 @@ int main() g_NetworkManager.DoWork(); PIXEndNamedEvent(); +#ifndef DISABLE_PSN LeaderboardManager::Instance()->Tick(); +#endif // Render game graphics. if(app.GetGameStarted()) { diff --git a/Minecraft.World/Minecraft.World.vcxproj b/Minecraft.World/Minecraft.World.vcxproj index 534f32bf..5b74574e 100644 --- a/Minecraft.World/Minecraft.World.vcxproj +++ b/Minecraft.World/Minecraft.World.vcxproj @@ -858,7 +858,7 @@ false $(OutDir)$(ProjectName).pch MultiThreaded - _LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_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 @@ -1446,7 +1447,7 @@ true true Level2 - SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_DEBUG_MENUS_ENABLED + SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;DEBUG_MENUS_ENABLED 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/Minecraft.World/x64headers/extraX64.h b/Minecraft.World/x64headers/extraX64.h index 18f36335..d384cbe7 100644 --- a/Minecraft.World/x64headers/extraX64.h +++ b/Minecraft.World/x64headers/extraX64.h @@ -11,7 +11,7 @@ #define MULTITHREAD_ENABLE -#if defined(__PS3__) || defined(__ORBIS__) +#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) #define DISABLE_PSN #endif @@ -67,11 +67,18 @@ class INVITE_INFO; #include #include #include -#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_Vita.h" -#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" #include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h" + +#ifndef DISABLE_PSN +#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" +#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_Vita.h" typedef SQRNetworkManager_Vita::SessionID SessionID; typedef SQRNetworkManager_Vita::PresenceSyncInfo INVITE_INFO; +#else +typedef ULONGLONG GameSessionUID; +typedef ULONGLONG SessionID; +class INVITE_INFO; +#endif #elif defined _DURANGO #include "..\..\Minecraft.Client\Durango\4JLibs\inc\4J_Profile.h" 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