Sara/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-09-18 20:46:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove merge marker

Browse source
This commit is contained in:
Nic Barker 2024-12-30 13:24:12 +13:00
parent 24be9bcfc4
commit ffdf22afc3
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/introducing-clay-video-demo/CMakeLists.txt
View file

@ -24,7 +24,6 @@ target_compile_options(clay_examples_introducing_clay_video_demo PUBLIC)
target_include_directories(clay_examples_introducing_clay_video_demo PUBLIC .) target_include_directories(clay_examples_introducing_clay_video_demo PUBLIC .)
target_link_libraries(clay_examples_introducing_clay_video_demo PUBLIC raylib) target_link_libraries(clay_examples_introducing_clay_video_demo PUBLIC raylib)
<<<<<<< HEAD
set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror -Wno-error=missing-braces -DCLAY_DEBUG") set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror -Wno-error=missing-braces -DCLAY_DEBUG")
set(CMAKE_C_FLAGS_RELEASE "-O3") set(CMAKE_C_FLAGS_RELEASE "-O3")