diff --git a/.gitignore b/.gitignore index b231abf..8e8dab6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ build/ .cache bin .env +.idea \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 711f99b..48ed28c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_CXX_STANDARD 23) set(CMAKE_POLICY_VERSION_MINIMUM 3.5) +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + file(GLOB REQUIRED_CMAKE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/*.cmake.required" ) @@ -11,13 +13,20 @@ foreach(cmake_file ${REQUIRED_CMAKE_FILES}) include(${cmake_file}) endforeach() +include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/opus.cmake") file(GLOB CMAKE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/*.cmake") foreach(cmake_file ${CMAKE_FILES}) include(${cmake_file}) endforeach() +if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") + target_compile_options(dpp PRIVATE -fpermissive) +endif () + +set(CMAKE_FOLDER "00-project") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/00_project") +set(CMAKE_FOLDER "01-basics") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/01_basics/01_first_bot") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/01_basics/02_embeds") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/01_basics/03_private_messages") diff --git a/cmake/opus.cmake b/cmake/opus.cmake new file mode 100644 index 0000000..2640a75 --- /dev/null +++ b/cmake/opus.cmake @@ -0,0 +1,11 @@ +CPMAddPackage( + URI "gh:xiph/opus@1.5.2" +) + +if(opus_ADDED) + get_target_property(OPUS_INCLUDE_DIRS opus INTERFACE_INCLUDE_DIRECTORIES) + set(OPUS_LIBRARIES opus) + set(HAVE_OPUS_OPUS_H TRUE) + set(Opus_FOUND TRUE) + set(OPUS_FOUND TRUE) +endif() \ No newline at end of file diff --git a/src/00_project/src/main.cpp b/src/00_project/src/main.cpp index 339ef72..651cff5 100644 --- a/src/00_project/src/main.cpp +++ b/src/00_project/src/main.cpp @@ -6,9 +6,19 @@ int main() { dotenv::init(); + if (!std::getenv("DISCORD_TOKEN")) { + std::cout << "Failed to find DISCORD_TOKEN in .env or environment" << std::endl; + exit(EXIT_FAILURE); + } + if (!std::getenv("DISCORD_WEBHOOK")) { + std::cout << "Failed to find DISCORD_WEBHOOK in .env or environment" << std::endl; + exit(EXIT_FAILURE); + } + const std::string botToken = std::getenv("DISCORD_TOKEN"); + const std::string whURL = std::getenv("DISCORD_WEBHOOK"); std::cout << "Using dpp version: " << dpp::utility::version() << std::endl; - std::cout << "Loaded DISCORD_TOKEN: " << std::getenv("DISCORD_TOKEN") - << std::endl; + std::cout << "Loaded DISCORD_TOKEN: " << botToken << std::endl; + std::cout << "Loaded DISCORD_WEBHOOK: " << whURL << std::endl; return 0; }