Recommend installing freetype

CMU462/CMakeLists.txt

@@ -161,8 +161,7 @@ endif(WIN32)
 # Required packages
 find_package(OpenGL REQUIRED)
 if(NOT WIN32)
-  #find_package(Freetype REQUIRED)
-  add_subdirectory("${CMU462_SOURCE_DIR}/deps/freetype")
+  find_package(Freetype REQUIRED)
 endif()
 
 # Use pkg-config for GLEW & GLFW if available

CMakeLists.txt

@@ -146,9 +146,9 @@ endif(WIN32)
 # Required packages
 find_package(OpenGL REQUIRED)
 find_package(Threads REQUIRED)
-#if (NOT WIN32)
-#  find_package(Freetype REQUIRED)
-#endif ()
+if (NOT WIN32)
+  find_package(Freetype REQUIRED)
+endif ()
 
 # CMU462
 if(BUILD_LIBCMU462)

README.md

@@ -20,7 +20,9 @@ In order to ease the process of running on different platforms, we will be using
 
 #### OS X/Linux Build Instructions
 
-If you are working on OS X and do not have CMake installed, we recommend installing it through [Homebrew](http://brew.sh/): `$ brew install cmake`. If you are working on Linux, you should be able to install dependencies with your system's package manager as needed.
+If you are working on OS X and do not have CMake installed, we recommend installing it through [Homebrew](http://brew.sh/): `$ brew install cmake`.  You may also need the freetype package `$ brew install freetype`.
+
+If you are working on Linux, you should be able to install dependencies with your system's package manager as needed (you may need cmake and freetype, and possibly others).
 
 To build your code for this assignment: