diff --git a/README.md b/README.md index f191d636..1715745a 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,7 @@ Your results will be in `~/src/mkxp-z/build` . You can type `open ~/src/mkxp-z/b sudo apt install build-essential git bison cmake meson autoconf libtool \ pkg-config xxd libsdl2* libvorbisfile3 libvorbis-dev libpixman-1* \ libboost-program-options1.65* libopenal1* libopenal-dev zlib1g* \ -fluidsynth libfluidsynth-dev libsigc++-2.0* libogg-dev libboost-filesystem1.65* +fluidsynth libfluidsynth-dev libsigc++-2.0* libogg-dev ``` 3. Build the rest from source: diff --git a/src/filesystem.cpp b/src/filesystem.cpp index 460e542b..8cae85e0 100644 --- a/src/filesystem.cpp +++ b/src/filesystem.cpp @@ -39,6 +39,7 @@ extern "C"{ #include +#include #include #include #include @@ -726,13 +727,16 @@ char* FileSystem::normalize(const char *pathname, bool preferred, bool absolute) if (cwk_path_is_relative(pathname) && absolute) { path_abs = new char[512]; - char *bp = SDL_GetBasePath(); + char bp[512] = {0}; + getcwd(bp, 512); cwk_path_join(bp, pathname, path_abs, 512); - SDL_free(bp); } + char test[512] = {0}; + getcwd(test, 512); + Debug() << test; cwk_path_normalize((path_abs) ? path_abs : (char*)pathname, path_nml, 512); - if (path_abs) delete path_abs; + if (path_abs) delete path_abs; return path_nml; } diff --git a/src/meson.build b/src/meson.build index bf9d2509..3c62f273 100644 --- a/src/meson.build +++ b/src/meson.build @@ -8,7 +8,7 @@ sdl2_image = dependency('SDL2_image') sdl_sound = dependency('SDL_sound') opengl = dependency('GL') -boost = dependency('boost', version: '>=1.49', modules: ['system', 'program_options', 'filesystem']) +boost = dependency('boost', version: '>=1.49', modules: 'program_options') openal = dependency('openal') zlib = dependency('zlib')