diff --git a/CMakeLists.txt b/CMakeLists.txt index c6145ca..d3fd5d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -Wpedantic -g") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build) +set(CMAKE_RESOURCE_DIRECTORY ${CMAKE_SOURCE_DIR}/resources) set(CMAKE_THREAD_LIBS_INIT "-lpthread") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") @@ -38,3 +39,5 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/impl/CMakeLists.txt") add_subdirectory(src/impl) target_link_libraries(project-kyoku impl) endif() + +file(COPY "${CMAKE_RESOURCE_DIRECTORY}" DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..c2dc836 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,7 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/resources/METEOR.flac b/resources/METEOR.flac new file mode 100644 index 0000000..58d8ccd Binary files /dev/null and b/resources/METEOR.flac differ diff --git a/resources/SourceCodePro-Regular.ttf b/resources/SourceCodePro-Regular.ttf new file mode 100644 index 0000000..c583003 Binary files /dev/null and b/resources/SourceCodePro-Regular.ttf differ diff --git a/src/application/src/editorstate.cpp b/src/application/src/editorstate.cpp index 004ba63..589d74f 100644 --- a/src/application/src/editorstate.cpp +++ b/src/application/src/editorstate.cpp @@ -38,7 +38,7 @@ void EditorState::display() const void EditorState::enter() { _music = _core_factory->getMusic(); - _music->open("METEOR.flac"); + _music->open("sources/METEOR.flac"); _music->setVolume(5.f); auto& group = _group; diff --git a/src/application/src/gamestate.cpp b/src/application/src/gamestate.cpp index 94c5edd..c3f945f 100644 --- a/src/application/src/gamestate.cpp +++ b/src/application/src/gamestate.cpp @@ -41,7 +41,7 @@ void GameState::enter() { _game->run(); - _music->open("METEOR.flac"); + _music->open("sources/METEOR.flac"); _music->setVolume(10); _music->play(); } diff --git a/src/impl/sfml/LICENSE.md b/src/impl/sfml/LICENSE.md new file mode 100644 index 0000000..1d05dfa --- /dev/null +++ b/src/impl/sfml/LICENSE.md @@ -0,0 +1,19 @@ +SFML (Simple and Fast Multimedia Library) - Copyright (c) Laurent Gomila + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 40a076a..c295739 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,8 @@ #include "application/applicationsfml.h" int main() -{ - sf::RenderWindow window(sf::VideoMode{1280, 720}, "Test", sf::Style::Fullscreen); +{ + sf::RenderWindow window(sf::VideoMode{1280, 720}, "Project Kyoku", sf::Style::Default); ApplicationSFML app(&window); if (app.init()) app.run();