From 951e6620c26cb4eb3caa0fe2e14e0175fcd784d8 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 25 Oct 2014 19:47:02 +0200 Subject: [PATCH] Made music a submodule --- .gitmodules | 3 +++ CMakeLists.txt | 3 +-- music | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 music diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..3261b769 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "music"] + path = music + url = https://github.com/colobot/colobot-music.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 767abba9..50bf19de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,9 @@ install(DIRECTORY ai DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY fonts DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY icons DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY models DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) -#install(DIRECTORY models-new DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) -install(DIRECTORY music DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY sounds DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) install(DIRECTORY textures DESTINATION ${COLOBOT_INSTALL_DATA_DIR}) add_subdirectory(help) add_subdirectory(levels) +add_subdirectory(music) diff --git a/music b/music new file mode 160000 index 00000000..68744dcd --- /dev/null +++ b/music @@ -0,0 +1 @@ +Subproject commit 68744dcdb7aa9e10f471fe1cca4910a4fd594a2f