mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-04-21 21:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build on Linux again

Browse source
This commit is contained in:
Struma 2021-02-21 23:54:00 -05:00 • committed by Roza
parent e428999044
commit b5ebed4391
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux/Makefile
View file

@ -183,7 +183,7 @@ $(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile
$(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure $(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure
cd $(DOWNLOADS)/sdl2_image; \ 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 \ $(CONFIGURE) --enable-static=true --enable-shared=false \
--disable-imageio \ --disable-imageio \
--enable-png=yes --enable-png-shared=no \ --enable-png=yes --enable-png-shared=no \

2
src/filesystem/filesystemImpl.cpp
View file

@ -97,7 +97,7 @@ std::string filesystemImpl::normalizePath(const char *path, bool preferred, bool
return ret; return ret;
} }
std::string filesystemImpl::getDefaultGamePath() { std::string filesystemImpl::getDefaultGameRoot() {
char *p = SDL_GetBasePath(); char *p = SDL_GetBasePath();
std::string ret(p); std::string ret(p);
SDL_free(p); SDL_free(p);

1
src/meson.build
View file

@ -41,7 +41,6 @@ if host_system == 'windows'
explicit_libs += 'libmsvcrt;libgcc;libmingwex;libgmp;' explicit_libs += 'libmsvcrt;libgcc;libmingwex;libgmp;'
endif endif
if build_static == true if build_static == true
global_link_args += ['-Wl,-Bstatic', '-lgcc', '-lstdc++', '-lpthread', '-Wl,-Bdynamic']
if host_system == 'windows' if host_system == 'windows'
global_link_args += ['-Wl,-Bstatic', '-lgcc', '-lstdc++', '-lpthread', '-Wl,-Bdynamic'] global_link_args += ['-Wl,-Bstatic', '-lgcc', '-lstdc++', '-lpthread', '-Wl,-Bdynamic']
else else