lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Edited/removed comments, changes readme

Browse Source 
Edited/removed comments, changes readme
This commit is contained in:
Joey de Vries
2015-04-04 13:33:31 +02:00
parent 949afc1e9c
commit 33dba66ea1
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -1,6 +1,5 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
cmake_policy(VERSION 2.8) cmake_policy(VERSION 2.8)
# cmake_policy(SET CMP0037 OLD)
project (LearnOpenGL) project (LearnOpenGL)
@@ -18,9 +17,6 @@ link_directories(${CMAKE_SOURCE_DIR}/lib)
list(APPEND CMAKE_CXX_FLAGS "-std=c++11") 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 the required packages
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
message(STATUS "GLM included at ${GLM_INCLUDE_DIR}") message(STATUS "GLM included at ${GLM_INCLUDE_DIR}")
@@ -135,7 +131,7 @@ foreach(CHAPTER ${CHAPTERS})
endif(WIN32) endif(WIN32)
endforeach(SHADER) 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) if(MSVC)
configure_file(${CMAKE_SOURCE_DIR}/configuration/visualstudio.vcxproj.user.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO}.vcxproj.user @ONLY) configure_file(${CMAKE_SOURCE_DIR}/configuration/visualstudio.vcxproj.user.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO}.vcxproj.user @ONLY)
endif(MSVC) endif(MSVC)

2
README.md
View File

@@ -1,7 +1,7 @@
# learnopengl.com code repository # learnopengl.com code repository
Contains code samples for all tutorials of [http://learnopengl.com](http://learnopengl.com). 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 ## Windows building
All relevant libraries are found in /libs and all DLLs found in /dlls (pre-)compiled for Windows. All relevant libraries are found in /libs and all DLLs found in /dlls (pre-)compiled for Windows.