mirror of
https://github.com/nicbarker/clay.git
synced 2025-04-20 21:28:03 +00:00
remove merge marker
This commit is contained in:
parent
24be9bcfc4
commit
ffdf22afc3
@ -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_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_RELEASE "-O3")
|
||||
|
Loading…
Reference in New Issue
Block a user