This commit is contained in:
NOTPIES 2026-04-21 01:27:06 -04:00
parent d87724c897
commit 3bad03f585
13 changed files with 56 additions and 3 deletions

View file

@ -123,11 +123,25 @@ jobs:
shell: pwsh shell: pwsh
run: | run: |
$outRoots = @( $outRoots = @(
".\\Minecraft.Client\\x64\\Release",
".\\Minecraft.Client\\x64_Release",
".\\x64\\Release", ".\\x64\\Release",
".\\x64_Release" ".\\x64_Release"
) )
$root = $outRoots | Where-Object { Test-Path $_ } | Select-Object -First 1 $root = $outRoots | Where-Object {
Test-Path (Join-Path $_ "Minecraft.Client.exe")
} | Select-Object -First 1
if (-not $root) {
$fallback = Get-ChildItem -Path . -Filter "Minecraft.Client.exe" -Recurse -File -ErrorAction SilentlyContinue |
Select-Object -First 1
if ($fallback) {
$root = $fallback.DirectoryName
}
}
if (-not $root) { if (-not $root) {
throw "Could not locate Windows client output directory." throw "Could not locate Windows client output directory."
} }
@ -379,11 +393,26 @@ jobs:
shell: pwsh shell: pwsh
run: | run: |
$outRoots = @( $outRoots = @(
".\\Minecraft.Server\\x64_Server_Release",
".\\Minecraft.Server\\x64\\Release",
".\\Minecraft.Server\\x64_Release",
".\\x64_Server_Release", ".\\x64_Server_Release",
".\\x64_Release" ".\\x64_Release"
) )
$root = $outRoots | Where-Object { Test-Path $_ } | Select-Object -First 1 $root = $outRoots | Where-Object {
Test-Path (Join-Path $_ "Minecraft.Server.exe")
} | Select-Object -First 1
if (-not $root) {
$fallback = Get-ChildItem -Path . -Filter "Minecraft.Server.exe" -Recurse -File -ErrorAction SilentlyContinue |
Select-Object -First 1
if ($fallback) {
$root = $fallback.DirectoryName
}
}
if (-not $root) { if (-not $root) {
throw "Could not locate Windows dedicated server output directory." throw "Could not locate Windows dedicated server output directory."
} }

View file

@ -46,7 +46,9 @@
#if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__) #if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__)
#ifdef _WINDOWS64 #ifdef _WINDOWS64
//C4JStorage StorageManager; //C4JStorage StorageManager;
//C_4JProfile ProfileManager; #if defined(__linux__)
C_4JProfile ProfileManager;
#endif
#endif #endif
#endif // __PS3__ #endif // __PS3__
CSentientManager SentientManager; CSentientManager SentientManager;

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "4J_Input.h" #include "4J_Input.h"
#include "INP_Keyboard.h" #include "INP_Keyboard.h"
#include "INP_Main.h" #include "INP_Main.h"

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "INP_ForceFeedback.h" #include "INP_ForceFeedback.h"
void CForceFeedback::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC) void CForceFeedback::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC)

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "INP_Keyboard.h" #include "INP_Keyboard.h"
void CKeyboard::Tick(void) {} void CKeyboard::Tick(void) {}

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "INP_Main.h" #include "INP_Main.h"
CInput InternalInputManager; CInput InternalInputManager;

View file

@ -22,5 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "INP_StringCheck.h" #include "INP_StringCheck.h"

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "LinkedList.h" #include "LinkedList.h"
LinkedList::LinkedList() LinkedList::LinkedList()

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "4J_Profile.h" #include "4J_Profile.h"
C_4JProfile ProfileManager; C_4JProfile ProfileManager;

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "4J_Storage.h" #include "4J_Storage.h"
#include "STO_Main.h" #include "STO_Main.h"

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "STO_DLC.h" #include "STO_DLC.h"
#include "STO_Main.h" #include "STO_Main.h"

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "STO_Main.h" #include "STO_Main.h"
#include "4J_Storage.h" #include "4J_Storage.h"

View file

@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#if !defined(__linux__)
#include "stdafx.h" #include "stdafx.h"
#endif
#include "STO_SaveGame.h" #include "STO_SaveGame.h"
#include <stdio.h> #include <stdio.h>