diff --git a/linux/Makefile b/linux/Makefile index 626f235..9d8a0f6 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -183,7 +183,7 @@ $(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile $(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure cd $(DOWNLOADS)/sdl2_image; \ - LIBPNG_LIBS=$(LIBDIR)/libpng.a \ + LIBPNG_LIBS="-L$(LIBDIR)/libpng.a -lpng" LIBPNG_CFLAGS="-I$(INCLUDEDIR) \ $(CONFIGURE) --enable-static=true --enable-shared=false \ --disable-imageio \ --enable-png=yes --enable-png-shared=no \ diff --git a/src/filesystem/filesystemImpl.cpp b/src/filesystem/filesystemImpl.cpp index 987e83b..79b7170 100644 --- a/src/filesystem/filesystemImpl.cpp +++ b/src/filesystem/filesystemImpl.cpp @@ -97,7 +97,7 @@ std::string filesystemImpl::normalizePath(const char *path, bool preferred, bool return ret; } -std::string filesystemImpl::getDefaultGamePath() { +std::string filesystemImpl::getDefaultGameRoot() { char *p = SDL_GetBasePath(); std::string ret(p); SDL_free(p); diff --git a/src/meson.build b/src/meson.build index 9b5a5e0..5768456 100755 --- a/src/meson.build +++ b/src/meson.build @@ -41,7 +41,6 @@ if host_system == 'windows' explicit_libs += 'libmsvcrt;libgcc;libmingwex;libgmp;' endif if build_static == true - global_link_args += ['-Wl,-Bstatic', '-lgcc', '-lstdc++', '-lpthread', '-Wl,-Bdynamic'] if host_system == 'windows' global_link_args += ['-Wl,-Bstatic', '-lgcc', '-lstdc++', '-lpthread', '-Wl,-Bdynamic'] else