From 177c10bb0fc2667b4103724c6cf8e7455a1b786b Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:12:04 +0100 Subject: fix MacOS build instructions --- BUILD.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index d14f2941..03f18563 100644 --- a/BUILD.md +++ b/BUILD.md @@ -234,7 +234,7 @@ Pick an installation path - this is where the final `.app` will be constructed w ``` git clone --recursive https://github.com/PolyMC/PolyMC.git -cd Launcher +cd PolyMC mkdir build cd build cmake \ @@ -248,6 +248,7 @@ cmake \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \ .. make install +mv jars/ polymc.app/Contents/MacOS ``` **Note:** The final app bundle may not run due to code signing issues, which -- cgit From d81e2bb0b0f60450cecfc1390e3a960f3b6e7bbb Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:14:00 +0100 Subject: extra refinements --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index 03f18563..4e2a284b 100644 --- a/BUILD.md +++ b/BUILD.md @@ -230,7 +230,7 @@ xcode-select --install ### Build -Pick an installation path - this is where the final `.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. +Pick an installation path - this is where the final `polymc.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. ``` git clone --recursive https://github.com/PolyMC/PolyMC.git -- cgit From b2bcdb9d9b61ef3244738f85b882aa96c880e932 Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:18:12 +0100 Subject: fix a typo+explain better --- BUILD.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.md b/BUILD.md index 4e2a284b..6062fed8 100644 --- a/BUILD.md +++ b/BUILD.md @@ -230,7 +230,7 @@ xcode-select --install ### Build -Pick an installation path - this is where the final `polymc.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. +Pick an installation path - this is where the final `polymc.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. By default, it's in the build/dist folder under PolyMC ``` git clone --recursive https://github.com/PolyMC/PolyMC.git @@ -248,7 +248,7 @@ cmake \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \ .. make install -mv jars/ polymc.app/Contents/MacOS +mv jars/ dist/polymc.app/Contents/MacOS ``` **Note:** The final app bundle may not run due to code signing issues, which -- cgit From 7f4fd04cfe2f7c6c826ecbdf1a25734c9de03303 Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:24:06 +0100 Subject: not needed actually --- BUILD.md | 1 - 1 file changed, 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index 6062fed8..5bf8050d 100644 --- a/BUILD.md +++ b/BUILD.md @@ -248,7 +248,6 @@ cmake \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \ .. make install -mv jars/ dist/polymc.app/Contents/MacOS ``` **Note:** The final app bundle may not run due to code signing issues, which -- cgit From 04be2404ce71f31ac5bf89aa0b41c1f63ce19166 Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:24:49 +0100 Subject: fix typo --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index 5bf8050d..8f45a21c 100644 --- a/BUILD.md +++ b/BUILD.md @@ -230,7 +230,7 @@ xcode-select --install ### Build -Pick an installation path - this is where the final `polymc.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. By default, it's in the build/dist folder under PolyMC +Pick an installation path - this is where the final `PolyMC.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. By default, it's in the build/dist folder under PolyMC ``` git clone --recursive https://github.com/PolyMC/PolyMC.git -- cgit From 9d36cf4b5a3d4b5c3d5fd836ce92de33ddbd8a27 Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:26:13 +0100 Subject: fix another typo (omg I'm doing too commits) --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index 8f45a21c..0f407716 100644 --- a/BUILD.md +++ b/BUILD.md @@ -230,7 +230,7 @@ xcode-select --install ### Build -Pick an installation path - this is where the final `PolyMC.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. By default, it's in the build/dist folder under PolyMC +Pick an installation path - this is where the final `PolyMC.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. By default, it's in the dist folder under PolyMC ``` git clone --recursive https://github.com/PolyMC/PolyMC.git -- cgit From 7ef6c586c5a1b1ee33f2beeb43d1aa84a61b219c Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:59:04 +0100 Subject: update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 778a2d96..67c11ae8 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Several source build packages are available, along with experimental pre-built g - [Debian (AMD64)](https://packages.polymc.org/latest/deb/polymc-amd64.deb) ([SHA256](https://packages.polymc.org/latest/deb/polymc-amd64.deb.sha256)) - this is intended to be installed with `dpkg -i`. Alternatively, you may build the `.deb` yourself, by going to `packages/debian` and running `./makedeb.sh`. - [AppImage (AMD64)](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage) ([SHA256](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage.sha256)) - `chmod +x` must be run on this file before usage. This should work on any distribution. - [Arch Linux (AMD64)](https://packages.polymc.org/latest/arch/polymc-bin-latest-1-x86_64.pkg.tar.zst) ([SHA256](https://packages.polymc.org/latest/arch/polymc-bin-latest-1-x86_64.pkg.tar.zst.sha256)) - this is intended to be installed with `pacman -U`. This is an alternative if building the AUR package is not desired. -- MacOS currently does not have any packages. We are still working on setting up MacOS packaging. +- MacOS currently does not have any packages. We are still working on setting up MacOS packaging. Meanwhile, you can [build](https://github.com/PolyMC/PolyMC/blob/develop/BUILD.md#macos) it for yourself. ## Development If you want to contribute to PolyMC you might find it useful to join [#development:polymc.org on Matrix](https://matrix.to/#/#development:polymc.org) or join [our Discord server](https://discord.gg/xq7fxrgtMP), which is bridged with the PolyMC Matrix rooms. Thank you! -- cgit From b34239ebc64c602ea5859996ef04fec505a6a104 Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 11:00:13 +0100 Subject: adoptium --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index 0f407716..bafd294c 100644 --- a/BUILD.md +++ b/BUILD.md @@ -217,7 +217,7 @@ zlib1.dll ### Install prerequisites: - Install XCode Command Line tools - Install the official build of CMake (https://cmake.org/download/) -- Install JDK 8 (https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html) +- Install JDK 8 (https://adoptium.net/releases.html?variant=openjdk8&jvmVariant=hotspot) - Get Qt 5.6 and install it (https://download.qt.io/new_archive/qt/5.6/5.6.3/) ### XCode Command Line tools -- cgit From 8ea1ebaf1b58c3b1f39b45f54fb8b2f87bf7b7b9 Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Sat, 29 Jan 2022 18:14:56 +0100 Subject: I haven't tested qt 5.6, i use 5.12 --- BUILD.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD.md b/BUILD.md index 1adb835b..84e5b34f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -257,7 +257,7 @@ zlib1.dll - Install XCode Command Line tools - Install the official build of CMake (https://cmake.org/download/) - Install JDK 8 (https://adoptium.net/releases.html?variant=openjdk8&jvmVariant=hotspot) -- Get Qt 5.6 and install it (https://download.qt.io/new_archive/qt/5.6/5.6.3/) +- Get Qt 5.6 and install it (https://download.qt.io/new_archive/qt/5.6/5.6.3/) or higher (tested) (https://www.qt.io/download-qt-installer?utm_referrer=https%3A%2F%2Fwww.qt.io%2Fdownload-open-source) You can use `homebrew` to simplify the installation of build dependencies @@ -281,15 +281,15 @@ cmake \ -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX:PATH="$(dirname $PWD)/dist/" \ - -DCMAKE_PREFIX_PATH="/path/to/Qt5.6/" \ - -DQt5_DIR="/path/to/Qt5.6/" \ + -DCMAKE_PREFIX_PATH="/path/to/Qt/" \ + -DQt5_DIR="/path/to/Qt/" \ -DLauncher_LAYOUT=mac-bundle \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \ .. make install ``` -Remember to replace `/path/to/Qt5.6/` with the actual path. For newer Qt installations, it is often in your home directory. +Remember to replace `/path/to/Qt/` with the actual path. For newer Qt installations, it is often in your home directory. **Note:** The final app bundle may not run due to code signing issues, which need to be fixed with `codesign -fs -`. -- cgit