diff --git a/compileMacOS.md b/compileMacOS.md deleted file mode 100755 index b4b0c90..0000000 --- a/compileMacOS.md +++ /dev/null @@ -1,79 +0,0 @@ -# Intructions for compiling dsda-launcher for MacOS - -Tested with a M1 MacBookPro running MacOS 11.3 (Big Sur) - -___ - -### Tools needed: - -## Qt - https://www.qt.io/download -``` -Tested with Qt 6.2.2 - -You can install it with "brew" or the Qt online installer -``` -Screenshot 2021-06-09 at 12 44 33Screenshot 2021-06-09 at 12 46 06 -``` -When running the installer, I recommend that you install the "Qt for desktop environment" -``` -Screenshot 2021-06-09 at 10 56 12 - -## qmake -``` -This comes installed with Qt, no need to do anything -``` - -## make -``` -I don't think that Qt comes with "make" installed, if you have then you can start compiling, if not, run: - -xcode-select --install -``` -___ -## Compiling - -1. Download the .zip file from this repository - -2. Extract it & open the folder - -3. Put the **dsda-doom** executable and **dsda-doom.wad** (not included in this repo) inside the dsda-launcher folder - - ^^^ Very important - -4. Create a "build" folder -``` -mkdir build & cd build -``` - -Your dsda-launcher folder should look like this: - -![Screenshot 2021-07-07 at 10 22 17](https://user-images.githubusercontent.com/82064173/124734657-40395480-df0d-11eb-81c1-fd19231c5035.jpg) - - -5. Run qmake from inside of the build folder -``` -qmake .. - -If you installed Qt with the online installer, careful with qmake not being in the path - - -// qmake .. "CONFIG+=deploy" -// ^ this will compile for both x64 and arm64 archs - -``` -6. Run make -``` -make -``` -There you go! -You can now use this launcher - -7. (optional) macdeployqt - -This is only for the people that want to distribute this launcher. -macdeployqt is a tool to copy the required libraries into the .app - -It comes installed with Qt. Its in the same folder as qmake -``` -macdeployqt /path/to/dsda-launcher.app -``` diff --git a/guides/compileMac.md b/guides/compileMac.md new file mode 100755 index 0000000..359e481 --- /dev/null +++ b/guides/compileMac.md @@ -0,0 +1,40 @@ +# Intructions for compiling dsda-launcher for MacOS + + +## Qt - https://www.qt.io/download +``` +All commits tested using the qt6.2.0 + +You could also install qt using 'brew' +``` + +## Compiling + +1. Clone this repo +``` +git clone https://github.com/Pedro-Beirao/dsda-launcher.git +``` + +2. Create a "build" folder inside src/ +``` +cd dsda-launcher +cd src + +mkdir build +cd build +``` +3. Run qmake from the build folder +``` +qmake .. + +// qmake .. "CONFIG+=deploy" +// ^ this will compile for both x64 and arm64 archs +``` +4. Run make +``` +make +``` + +## Distributing + +For distribution of the binary, you can use `macdeployqt` which patches the final app bundle with everything the users will need to run in the system.