lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix macOS load shader failed.

Browse Source
This commit is contained in:
dotlive
2017-10-19 07:28:10 +08:00
parent 3a04c6f9f4
commit 922e127d0e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -63,7 +63,7 @@ set(CHAPTERS
7.in_practice 7.in_practice
) )
set(1.getting_started set(1.getting_started
1.1.hello_window 1.1.hello_window
1.2.hello_window_clear 1.2.hello_window_clear
2.1.hello_triangle 2.1.hello_triangle
@@ -191,7 +191,7 @@ foreach(CHAPTER ${CHAPTERS})
set_target_properties(${NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin/${CHAPTER}") set_target_properties(${NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin/${CHAPTER}")
endif(WIN32) endif(WIN32)
# copy shader files to build directory # copy shader files to build directory
file(GLOB SHADERS file(GLOB SHADERS
"src/${CHAPTER}/${DEMO}/*.vs" "src/${CHAPTER}/${DEMO}/*.vs"
# "src/${CHAPTER}/${DEMO}/*.frag" # "src/${CHAPTER}/${DEMO}/*.frag"
"src/${CHAPTER}/${DEMO}/*.fs" "src/${CHAPTER}/${DEMO}/*.fs"
@@ -202,7 +202,7 @@ foreach(CHAPTER ${CHAPTERS})
# configure_file(${SHADER} "test") # configure_file(${SHADER} "test")
add_custom_command(TARGET ${NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${SHADER} $<TARGET_FILE_DIR:${NAME}>) add_custom_command(TARGET ${NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${SHADER} $<TARGET_FILE_DIR:${NAME}>)
elseif(UNIX) elseif(UNIX)
file(COPY ${SHADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/${CHAPTER}) file(COPY ${SHADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/${CHAPTER}/${CMAKE_BUILD_TYPE})
endif(WIN32) endif(WIN32)
endforeach(SHADER) endforeach(SHADER)