Merge pull request #10 from yvt/patch-macos-support

Add macOS support

CMakeLists.txt

@@ -21,7 +21,12 @@ target_link_libraries(client ${libs})
 file(GLOB libs2 libs/*a)
 target_link_libraries(client ${libs2})
 
-if(WIN32)
+if(APPLE)
+	target_link_libraries(client "-framework OpenGL")
+	target_link_libraries(client "-framework OpenAL")
+	target_link_libraries(client glfw)
+	target_link_libraries(client enet)
+elseif(WIN32)
 	target_link_libraries(client gdi32)
 	target_link_libraries(client opengl32)
 	target_link_libraries(client ws2_32)

README.md

@@ -88,6 +88,14 @@ Start the client with the following inside the `build/bin/` directory:
 ./client -aos://16777343:32887
 ```
 
+#### macOS
+
+The same instructions for Linux work on macOS aside from some minor differences. First, use Homebrew or MacPorts to grab dependencies:
+```
+brew install glfw enet
+```
+The development headers for OpenAL and OpenGL don't have to be installed since they come with macOS by default. libdeflate and lodepng should be installed and placed manually in a way similar to Linux. See _Wiki/Building_ for more details.
+
 ## Gallery
 
 | <img src="/docs/pic01.png" width="250px"> | <img src="/docs/pic02.png" width="250px"> | <img src="/docs/pic03.png" width="250px"> |

src/common.h

@@ -1,5 +1,10 @@
+#if __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +16,11 @@
 #include <unistd.h>
 #include <time.h>
 
+#if __APPLE__
+#include <OpenGL/glext.h>
+#else
 #include "GL/glext.h"
+#endif
 
 #include "GLFW/glfw3.h"
 

src/sound.h

@@ -1,5 +1,10 @@
+#if __APPLE__
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
 #include <AL/al.h>
 #include <AL/alc.h>
+#endif
 
 #define SOUND_SCALE         0.6F