diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-01-09 20:29:52 +00:00
parent 53039d3785
commit 8dc3503eb7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -112,10 +112,6 @@ if (WIN32)
list (APPEND YLIBS $<TARGET_OBJECTS:YapC++>) list (APPEND YLIBS $<TARGET_OBJECTS:YapC++>)
endif() endif()
<<<<<<< HEAD
=======
>>>>>>> 6aaa32363c7e98297e48a79ea03ae55de59fbdb3
add_component (core add_component (core
${ENGINE_SOURCES} ${ENGINE_SOURCES}