From 68709279e84a2fa03e92f5bb2d38c0b2bc1e1b7d Mon Sep 17 00:00:00 2001 From: Aleksey Bykhun Date: Fri, 4 Jan 2019 16:03:32 +0300 Subject: [PATCH 1/5] Update COMPILE.md --- COMPILE.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/COMPILE.md b/COMPILE.md index c41c229b..6854173a 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -39,6 +39,13 @@ mkdir build && cd build cmake .. -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" ``` +#### Mac OS X +```bash +## install CMake +brew install Assimp SDL2 SDL2_mixer TinyXML2 Bullet +cmake ./; +``` + If you want to profile the source code pass `-DCMAKE_CXX_FLAGS=-pg` to cmake. @@ -58,6 +65,12 @@ make mingw32-make ``` +#### Mac OS X +```bash +make +``` + + ### Running If this produces no error you have built the binary and should be able to start GlPortal by typing in: #### Linux @@ -83,9 +96,16 @@ cp /mingw64/bin/{libLinearMath,SDL2{,_mixer},libtinyxml2,libgcc_s_seh-1,libstdc+ mingw32-make run ``` + +#### Mac OS X +```bash +make run +``` + If you get errors, try to build GlPortal again. If you don't manage to fix the error, use the bugtracker https://github.com/GlPortal/glPortal/issues or http://bugs.glportal.de to report what you did, and what error you got. + ## Build with docker Building with docker is still in early testing and not feature complete. It will make compiling easier in the future. ```bash From c069b2e7693dbe9935909409a2fad4b7b0a98ebd Mon Sep 17 00:00:00 2001 From: Aleksey Bykhun Date: Fri, 4 Jan 2019 16:06:22 +0300 Subject: [PATCH 2/5] Update COMPILE.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add freeimage – without it failed on `make` at 37% ``` [ 37%] Building CXX object external/RadixEngine/CMakeFiles/RadixEngine.dir/source/core/gl/Framebuffer.cpp.o /Users/caffeinum/glPortal/external/RadixEngine/source/core/gl/Framebuffer.cpp:4:10: fatal error: 'FreeImage.h' file not found #include ^~~~~~~~~~~~~ 1 error generated. make[3]: *** [external/RadixEngine/CMakeFiles/RadixEngine.dir/source/core/gl/Framebuffer.cpp.o] Error 1 make[2]: *** [external/RadixEngine/CMakeFiles/RadixEngine.dir/all] Error 2 make[1]: *** [source/CMakeFiles/run.dir/rule] Error 2 make: *** [run] Error 2 ``` --- COMPILE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COMPILE.md b/COMPILE.md index 6854173a..20efd05a 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -42,7 +42,7 @@ cmake .. -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" #### Mac OS X ```bash ## install CMake -brew install Assimp SDL2 SDL2_mixer TinyXML2 Bullet +brew install Assimp SDL2 SDL2_mixer TinyXML2 Bullet freeimage cmake ./; ``` From cda4740d4e2d90de7676e47cb6e323ad547f65ea Mon Sep 17 00:00:00 2001 From: Aleksey Bykhun Date: Fri, 4 Jan 2019 16:21:24 +0300 Subject: [PATCH 3/5] Update COMPILE.md --- COMPILE.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/COMPILE.md b/COMPILE.md index 20efd05a..0fc86ea6 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -39,14 +39,6 @@ mkdir build && cd build cmake .. -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" ``` -#### Mac OS X -```bash -## install CMake -brew install Assimp SDL2 SDL2_mixer TinyXML2 Bullet freeimage -cmake ./; -``` - - If you want to profile the source code pass `-DCMAKE_CXX_FLAGS=-pg` to cmake. If you encounter an error during this step use the @@ -54,6 +46,15 @@ bugtracker https://github.com/GlPortal/glPortal/issues to report an issue. If the command did not produce an error, you can build the binary by typing in: + +#### Mac OS X + +```bash +brew install Assimp SDL2 SDL2_mixer TinyXML2 Bullet freeimage +cmake ./; +``` + + ### Building #### Linux ```bash From 861a560fb26babcae9901bbc23407f688aaee1ca Mon Sep 17 00:00:00 2001 From: Aleksey Bykhun Date: Fri, 4 Jan 2019 16:22:56 +0300 Subject: [PATCH 4/5] Update COMPILE.md --- COMPILE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/COMPILE.md b/COMPILE.md index 0fc86ea6..c9941bd2 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -39,6 +39,7 @@ mkdir build && cd build cmake .. -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" ``` + If you want to profile the source code pass `-DCMAKE_CXX_FLAGS=-pg` to cmake. If you encounter an error during this step use the From 33e155c9634851daf4858ef8cd35eab866af0351 Mon Sep 17 00:00:00 2001 From: Aleksey Bykhun Date: Fri, 4 Jan 2019 16:24:08 +0300 Subject: [PATCH 5/5] Update COMPILE.md --- COMPILE.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/COMPILE.md b/COMPILE.md index c9941bd2..9f95a712 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -39,6 +39,12 @@ mkdir build && cd build cmake .. -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" ``` +#### Mac OS X + +```bash +brew install Assimp SDL2 SDL2_mixer TinyXML2 Bullet freeimage +cmake ./; +``` If you want to profile the source code pass `-DCMAKE_CXX_FLAGS=-pg` to cmake. @@ -48,13 +54,6 @@ bugtracker https://github.com/GlPortal/glPortal/issues to report an issue. If the command did not produce an error, you can build the binary by typing in: -#### Mac OS X - -```bash -brew install Assimp SDL2 SDL2_mixer TinyXML2 Bullet freeimage -cmake ./; -``` - ### Building #### Linux