notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2020/12/02 Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2020-12-02 20:24:43 +01:00
commit 3b44b4929f
6 changed files with 88 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Makefile
View file

@ -23,7 +23,12 @@ SYSNAME:=$(shell uname -s)
ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32)
OS:=windows
GPERF:=/usr/bin/gperf
MINGW_DIR:=/mingw32
ifeq ($(findstring NT-6.2, $(SYSNAME)),NT-6.2)
BDIST_2KXP:=True
MINGW_DIR:=/usr/local
else
MINGW_DIR:=/mingw32
endif
else
ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64)
OS:=windows
@ -878,7 +883,50 @@ install-dlls:
@echo "...Installing Windows DLLs..."
@install -d $(BIN_PREFIX)
@cp $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX)
@src/install-dlls.sh tuxpaint.exe $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX)
@if [ "x$(BDIST_2KXP)" = "xTrue" ]; then \
cp $(MINGW_DIR)/bin/libintl-8.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libiconv-2.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libpng12.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/SDL.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/SDL_image.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/SDL_mixer.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/SDL_ttf.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libfreetype-6.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/zlib1.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libogg-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libvorbis-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libvorbisfile-3.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libjpeg-8.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libfribidi-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libxml2-2.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libcairo-2.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libfontconfig-1.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libSDL_Pango-1.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libgobject-2.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libgthread-2.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/librsvg-2-2.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libcroco-0.6-3.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libgdk_pixbuf-2.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libglib-2.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libgsf-1-114.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libpango-1.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libpangocairo-1.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libpangoft2-1.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libgmodule-2.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libpangowin32-1.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libpixman-1-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libgio-2.0-0.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/bz2-1.dll $(BIN_PREFIX); \
cp $(MINGW_DIR)/bin/libimagequant.dll $(BIN_PREFIX); \
cp `which libgcc_s_dw2-1.dll` $(BIN_PREFIX); \
cp `which libstdc++-6.dll` $(BIN_PREFIX); \
cp `which libpthread-2.dll` $(BIN_PREFIX); \
mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \
cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \
strip -s $(BIN_PREFIX)/lib/pango/1.6.0/modules/*.dll; \
else \
src/install-dlls.sh tuxpaint.exe $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX); \
fi
@strip -s $(BIN_PREFIX)/*.dll
@echo
@echo "...Installing Configuration Files..."