fix conflict

This commit is contained in:
dada513 2022-01-27 19:01:20 +01:00
commit 14a8ead6b4
No known key found for this signature in database
GPG Key ID: 403448C14FA4B33E

View File

@ -94,6 +94,25 @@ rpmbuild -bb polymc.spec
The path to the rpm packages will be printed when the build is complete. The path to the rpm packages will be printed when the build is complete.
### Building from command line
You need a source folder, a build folder and an install folder.
```
# make all the folders
mkdir ~/PolyMC && cd ~/PolyMC
mkdir build
mkdir install
# clone the complete source
git clone --recursive https://github.com/PolyMC/PolyMC.git src
# configure the project
cd build
cmake -DCMAKE_INSTALL_PREFIX=../install ../src
make -j$(nproc) install
```
The path to the rpm packages will be printed when the build is complete.
### Building a flatpak ### Building a flatpak
You only need to clone the flatpak sources You only need to clone the flatpak sources