lauchmelder/OpenGL-utility
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed macos build problems

Browse source
This commit is contained in:
Lauchmelder23 2021-01-25 02:33:21 +01:00
parent 265a7253cc
commit 3fdeb074c1
13 changed files with 73 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/movement/CMakeLists.txt
View file

@ -14,12 +14,26 @@ target_include_directories(movement PRIVATE
)
target_link_libraries(movement PRIVATE
"$<TARGET_FILE_DIR:openglu>/$<TARGET_FILE_BASE_NAME:openglu>.lib"
glfw
)
if(WIN32)
target_link_libraries(movement PRIVATE
"$<TARGET_FILE_DIR:openglu>/$<TARGET_FILE_BASE_NAME:openglu>.lib"
)
else()
target_link_libraries(movement PRIVATE
$<TARGET_FILE:openglu>
)
endif()
add_custom_command(TARGET movement POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:openglu> $<TARGET_FILE:glfw> $<TARGET_FILE_DIR:movement>
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/shaders $<TARGET_FILE_DIR:movement>/shaders
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/assets $<TARGET_FILE_DIR:movement>/assets
)
)
if(WIN32)
add_custom_command(TARGET movement POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:openglu> $<TARGET_FILE:glfw> $<TARGET_FILE_DIR:movementt>
)
endif()

4
examples/movement/main.cpp
View file

@ -220,8 +220,8 @@ int main(int argc, char** argv)
ImGui::NewFrame();
shader->Use();
shader->SetUniform("texture1", crate, 0);
shader->SetUniform("texture2", opengl, 1);
shader->SetUniformTexture("texture1", crate, 0);
shader->SetUniformTexture("texture2", opengl, 1);
shader->SetUniformMatrix4fv("view", 1, GL_FALSE, glm::value_ptr(camera.GetMatrix()));
shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, glm::value_ptr(camera.GetProjection()));