diff --git a/CMakeLists.txt b/CMakeLists.txt index c06e293..65cab3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required (VERSION 2.8) cmake_policy(VERSION 2.8) - # cmake_policy(SET CMP0037 OLD) project (LearnOpenGL) @@ -18,9 +17,6 @@ link_directories(${CMAKE_SOURCE_DIR}/lib) list(APPEND CMAKE_CXX_FLAGS "-std=c++11") -# ADD_CUSTOM_TARGET(debug ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=Debug ${PROJECT_SOURCE_DIR}) -# ADD_CUSTOM_TARGET(release ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=Release ${PROJECT_SOURCE_DIR}) - # find the required packages find_package(GLM REQUIRED) message(STATUS "GLM included at ${GLM_INCLUDE_DIR}") @@ -135,7 +131,7 @@ foreach(CHAPTER ${CHAPTERS}) endif(WIN32) endforeach(SHADER) - # if compiling for visual studio, also use configure file for each project (specifically to setup working directory) + # if compiling for visual studio, also use configure file for each project (specifically to set up working directory) if(MSVC) configure_file(${CMAKE_SOURCE_DIR}/configuration/visualstudio.vcxproj.user.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO}.vcxproj.user @ONLY) endif(MSVC) diff --git a/README.md b/README.md index 937cd10..b361a30 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # learnopengl.com code repository Contains code samples for all tutorials of [http://learnopengl.com](http://learnopengl.com). -The CMakeLists.txt is not yet finished for Linux/OS X; for more info see http://learnopengl.com/#!Code-repository +The CMakeLists.txt is not yet tested/finished for OS X; for more info see http://learnopengl.com/#!Code-repository ## Windows building All relevant libraries are found in /libs and all DLLs found in /dlls (pre-)compiled for Windows.