Commit b2c1ae26 authored by ctrlaltca's avatar ctrlaltca
Browse files

Merge pull request #1832 from tooomm/restructure

move sounds+themes folder inside cockatrice
parents bc79d9e2 754e666e
...@@ -231,8 +231,6 @@ endif() ...@@ -231,8 +231,6 @@ endif()
option(WITH_CLIENT "build cockatrice" ON) option(WITH_CLIENT "build cockatrice" ON)
if(WITH_CLIENT) if(WITH_CLIENT)
add_subdirectory(cockatrice) add_subdirectory(cockatrice)
add_subdirectory(sounds)
add_subdirectory(themes)
SET(CPACK_INSTALL_CMAKE_PROJECTS "cockatrice;cockatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) SET(CPACK_INSTALL_CMAKE_PROJECTS "cockatrice;cockatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
endif() endif()
......
...@@ -114,6 +114,9 @@ SET(cockatrice_SOURCES ...@@ -114,6 +114,9 @@ SET(cockatrice_SOURCES
${VERSION_STRING_CPP} ${VERSION_STRING_CPP}
) )
add_subdirectory(sounds)
add_subdirectory(themes)
set(cockatrice_RESOURCES cockatrice.qrc) set(cockatrice_RESOURCES cockatrice.qrc)
IF(UPDATE_TRANSLATIONS) IF(UPDATE_TRANSLATIONS)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment