edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged cmakelist

Browse source
This commit is contained in:
Jupeyy 2017-09-12 21:03:27 +02:00
parent 629bf2c5f9
commit de43d410fe
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -331,14 +331,12 @@ endif()
######################################################################## ########################################################################
file(COPY data DESTINATION .) file(COPY data DESTINATION .)
<<<<<<< HEAD
file(COPY shader DESTINATION .) file(COPY shader DESTINATION .)
file(COPY ${CURL_COPY_FILES} DESTINATION .) file(COPY ${CURL_COPY_FILES} DESTINATION .)
file(COPY ${FREETYPE_COPY_FILES} DESTINATION .) file(COPY ${FREETYPE_COPY_FILES} DESTINATION .)
file(COPY ${OPUSFILE_COPY_FILES} DESTINATION .) file(COPY ${OPUSFILE_COPY_FILES} DESTINATION .)
file(COPY ${SDL2_COPY_FILES} DESTINATION .) file(COPY ${SDL2_COPY_FILES} DESTINATION .)
file(COPY ${GLEW_COPY_FILES} DESTINATION .) file(COPY ${GLEW_COPY_FILES} DESTINATION .)
=======
set(COPY_FILES set(COPY_FILES
${CURL_COPY_FILES} ${CURL_COPY_FILES}
${FREETYPE_COPY_FILES} ${FREETYPE_COPY_FILES}
@ -346,7 +344,6 @@ set(COPY_FILES
${SDL2_COPY_FILES} ${SDL2_COPY_FILES}
) )
file(COPY ${COPY_FILES} DESTINATION .) file(COPY ${COPY_FILES} DESTINATION .)
>>>>>>> 73d9ad76151f8d3c0a77b3dc8c97999e5126a959
######################################################################## ########################################################################
# CODE GENERATION # CODE GENERATION