Merge pull request #24 from DeepCodingInTuringAcademy/release-1.0.0

fix: Fix bug of path of assets

Author: FrozenLemonTee

CMakeLists.txt

@@ -29,7 +29,7 @@ file(GLOB LIB_SRC
         "${PROJECT_SOURCE_DIR}/lib/*.cpp"
 )
 
-add_executable(Minesweeper main.cpp config.h ${INCLUDE_SRC} ${LIB_SRC})
+add_executable(Minesweeper main.cpp ${INCLUDE_SRC} ${LIB_SRC})
 target_link_libraries(Minesweeper PRIVATE
         SFML::Audio
         SFML::System

config.h

@@ -7,6 +7,7 @@
 
 std::vector<std::string> split(const std::string &str, char delimiter = ' ');
 std::filesystem::path  getPath(const std::string& base_dir, const std::vector<std::string>& relative_path);
+std::string getExecutableDir();
 void clearScreen();
 void pauseScreen();
 void clearInputBuffer();

include/utility.h

@@ -1,8 +1,7 @@
 #include "soundPlay.h"
 #include "utility.h"
-#include "config.h"
 
 
-sf::Music main_music{getPath(cwd, {"assets", "Main.ogg"}).string()};
-sf::Music win_music{getPath(cwd, {"assets", "Win.wav"}).string()};
-sf::Music lose_music{getPath(cwd, {"assets", "Lose.ogg"}).string()};
+sf::Music main_music{getPath(getExecutableDir(), {"assets", "Main.ogg"}).string()};
+sf::Music win_music{getPath(getExecutableDir(), {"assets", "Win.wav"}).string()};
+sf::Music lose_music{getPath(getExecutableDir(), {"assets", "Lose.ogg"}).string()};

lib/soundPlay.cpp

@@ -17,13 +17,17 @@ std::vector<std::string> split(const std::string &str, char delimiter)
 
 std::filesystem::path getPath(const std::string &base_dir, const std::vector<std::string>& relative_path) {
     std::filesystem::path src_path = base_dir;
-    std::filesystem::path res = src_path.parent_path();
+    std::filesystem::path res = src_path;
     for (const auto& path: relative_path) {
         res /= path;
     }
     return res;
 }
 
+std::string getExecutableDir() {
+    return std::filesystem::current_path().string();
+}
+
 void clearScreen()
 {
 #if defined(_WIN32) || defined(_WIN64)