Skip to content

🐛 Fix macos build issues #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

🐛 Fix macos build issues #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ccfbd3
:bug: Fix macos build issues
yhs0602 Jan 20, 2025
32f9360
:bug: Fix patch schemas.index path
yhs0602 Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.8
2 changes: 1 addition & 1 deletion minerl/Malmo/Minecraft/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ task jaxb() {
description 'Generate source files for our XML schemas using JAXB'

// Create an index file listing all the schemas:
def schemaIndexFile = new File('src/main/resources/schemas.index')
def schemaIndexFile = new File("$projectDir/src/main/resources/schemas.index")
def contents = ""
def tree = copySchemas.source
tree.visit { fileDetails ->
Expand Down
44 changes: 22 additions & 22 deletions scripts/mcp_patch.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,33 +311,33 @@ diff -u1 -rN MCP-Reborn-vanilla/build.gradle MCP-Reborn/build.gradle
+
+ // specify lwjgl deps explicitly to force the download of natives for all
+ // platforms
+ compile group: 'org.lwjgl', name: 'lwjgl', version: '3.2.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl', version: '3.2.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl', version: '3.2.1', classifier: "natives-linux"
+ compile group: 'org.lwjgl', name: 'lwjgl', version: '3.3.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl', version: '3.3.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl', version: '3.3.1', classifier: "natives-linux"
+
+ compile group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.2.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.2.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.2.1', classifier: "natives-linux"
+ compile group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.3.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.3.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.3.1', classifier: "natives-linux"
+
+ compile group: 'org.lwjgl', name: 'lwjgl-jemalloc', version: '3.2.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-jemalloc', version: '3.2.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-jemalloc', version: '3.2.1', classifier: "natives-linux"
+ compile group: 'org.lwjgl', name: 'lwjgl-jemalloc', version: '3.3.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-jemalloc', version: '3.3.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-jemalloc', version: '3.3.1', classifier: "natives-linux"
+
+ compile group: 'org.lwjgl', name: 'lwjgl-openal', version: '3.2.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-openal', version: '3.2.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-openal', version: '3.2.1', classifier: "natives-linux"
+ compile group: 'org.lwjgl', name: 'lwjgl-openal', version: '3.3.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-openal', version: '3.3.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-openal', version: '3.3.1', classifier: "natives-linux"
+
+ compile group: 'org.lwjgl', name: 'lwjgl-opengl', version: '3.2.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-opengl', version: '3.2.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-opengl', version: '3.2.1', classifier: "natives-linux"
+ compile group: 'org.lwjgl', name: 'lwjgl-opengl', version: '3.3.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-opengl', version: '3.3.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-opengl', version: '3.3.1', classifier: "natives-linux"
+
+ compile group: 'org.lwjgl', name: 'lwjgl-stb', version: '3.2.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-stb', version: '3.2.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-stb', version: '3.2.1', classifier: "natives-linux"
+ compile group: 'org.lwjgl', name: 'lwjgl-stb', version: '3.3.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-stb', version: '3.3.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-stb', version: '3.3.1', classifier: "natives-linux"
+
+ compile group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: '3.2.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: '3.2.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: '3.2.1', classifier: "natives-linux"
+ compile group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: '3.3.1', classifier: "natives-windows"
+ // compile group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: '3.3.1', classifier: "natives-osx"
+ compile group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: '3.3.1', classifier: "natives-linux"
}

+
Expand Down Expand Up @@ -431,7 +431,7 @@ diff -u1 -rN MCP-Reborn-vanilla/build.gradle MCP-Reborn/build.gradle
+ description 'Generate source files for our XML schemas using JAXB'
+
+ // Create an index file listing all the schemas:
+ def schemaIndexFile = new File('src/main/resources/schemas.index')
+ def schemaIndexFile = new File("$projectDir/src/main/resources/schemas.index")
+ def contents = ""
+ def tree = copySchemas.source
+ tree.visit { fileDetails ->
Expand Down