From 8d8405daaba6d787e648713f74ebe4187bcfef5d Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Wed, 14 Oct 2020 21:03:20 +0900 Subject: [PATCH] For new build environment including 64bit version. --- Makefile | 138 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 64 deletions(-) diff --git a/Makefile b/Makefile index 13841f57c..039dfbb47 100644 --- a/Makefile +++ b/Makefile @@ -23,25 +23,34 @@ SYSNAME:=$(shell uname -s) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) OS:=windows GPERF:=/usr/bin/gperf + LIBGCC_S_DLL:=libgcc_s_dw2-1.dll + MINGW_DIR:=/mingw32 else - ifeq ($(SYSNAME),Darwin) - OS:=osx + ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) + OS:=windows GPERF:=/usr/bin/gperf + LIBGCC_S_DLL:=libgcc_s_seh-1.dll + MINGW_DIR:=/mingw64 else - ifeq ($(SYSNAME),BeOS) - OS:=beos - GPERF:=$(shell finddir B_USER_BIN_DIRECTORY)/gperf + ifeq ($(SYSNAME),Darwin) + OS:=osx + GPERF:=/usr/bin/gperf else - ifeq ($(SYSNAME),Haiku) + ifeq ($(SYSNAME),BeOS) OS:=beos - GPERF:=$(shell finddir B_SYSTEM_BIN_DIRECTORY)/gperf - STDC_LIB:=-lstdc++ - ifeq ($(shell gcc --version | cut -c 1-6),2.95.3) - STDC_LIB:=-lstdc++.r4 - endif + GPERF:=$(shell finddir B_USER_BIN_DIRECTORY)/gperf else - OS:=linux - GPERF:=/usr/bin/gperf + ifeq ($(SYSNAME),Haiku) + OS:=beos + GPERF:=$(shell finddir B_SYSTEM_BIN_DIRECTORY)/gperf + STDC_LIB:=-lstdc++ + ifeq ($(shell gcc --version | cut -c 1-6),2.95.3) + STDC_LIB:=-lstdc++.r4 + endif + else + OS:=linux + GPERF:=/usr/bin/gperf + endif endif endif endif @@ -115,7 +124,7 @@ PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,)) FRIBIDI_LIB:=$(shell $(PKG_CONFIG) --libs fribidi) FRIBIDI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags fribidi) -windows_ARCH_LINKS:=-lintl $(PNG) -lzdll -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv -limagequant +windows_ARCH_LINKS:=-lgdi32 -lcomdlg32 $(PNG) -lz -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv -limagequant osx_ARCH_LINKS:=$(FRIBIDI_LIB) -limagequant beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB) -limagequant linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) -limagequant @@ -870,62 +879,63 @@ install-dlls: @echo @echo "...Installing Windows DLLs..." @install -d $(BIN_PREFIX) - @cp `which tuxpaint-config.exe` $(BIN_PREFIX) - @cp `which libintl-8.dll` $(BIN_PREFIX) + @cp `which tuxpaint-config` $(BIN_PREFIX) + @cp `which imagequant.dll` $(BIN_PREFIX) + @cp `which libbrotlicommon.dll` $(BIN_PREFIX) + @cp `which libbrotlidec.dll` $(BIN_PREFIX) + @cp `which libbz2-1.dll` $(BIN_PREFIX) + @cp `which libcairo-2.dll` $(BIN_PREFIX) + @cp `which libcairo-gobject-2.dll` $(BIN_PREFIX) + @cp `which libdatrie-1.dll` $(BIN_PREFIX) + @cp `which libexpat-1.dll` $(BIN_PREFIX) + @cp `which libffi-7.dll` $(BIN_PREFIX) + @cp `which libfontconfig-1.dll` $(BIN_PREFIX) + @cp `which libfreetype-6.dll` $(BIN_PREFIX) + @cp `which libfribidi-0.dll` $(BIN_PREFIX) + @cp `which $(LIBGCC_S_DLL)` $(BIN_PREFIX) + @cp `which libgdk_pixbuf-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgio-2.0-0.dll` $(BIN_PREFIX) + @cp `which libglib-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgmodule-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgobject-2.0-0.dll` $(BIN_PREFIX) + @cp `which libgraphite2.dll` $(BIN_PREFIX) + @cp `which libharfbuzz-0.dll` $(BIN_PREFIX) @cp `which libiconv-2.dll` $(BIN_PREFIX) - @cp `which libpng12.dll` $(BIN_PREFIX) + @cp `which libintl-8.dll` $(BIN_PREFIX) + @cp `which libjpeg-8.dll` $(BIN_PREFIX) + @cp `which liblzma-5.dll` $(BIN_PREFIX) + @cp `which libmad-0.dll` $(BIN_PREFIX) + @cp `which libpango-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpangocairo-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpangoft2-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpangowin32-1.0-0.dll` $(BIN_PREFIX) + @cp `which libpcre-1.dll` $(BIN_PREFIX) + @cp `which libpixman-1-0.dll` $(BIN_PREFIX) + @cp `which libpng16-16.dll` $(BIN_PREFIX) + @cp `which librsvg-2-2.dll` $(BIN_PREFIX) + @cp `which libSDL_mixer-1-2-0.dll` $(BIN_PREFIX) + @cp `which libSDL_Pango-1.dll` $(BIN_PREFIX) + @cp `which libstdc++-6.dll` $(BIN_PREFIX) + @cp `which libthai-0.dll` $(BIN_PREFIX) + @cp `which libtiff-5.dll` $(BIN_PREFIX) + @cp `which libwebp-7.dll` $(BIN_PREFIX) + @cp `which libwinpthread-1.dll` $(BIN_PREFIX) + @cp `which libxml2-2.dll` $(BIN_PREFIX) + @cp `which libzstd.dll` $(BIN_PREFIX) + @cp `which mgwfltknox-1.3.dll` $(BIN_PREFIX) @cp `which SDL.dll` $(BIN_PREFIX) @cp `which SDL_image.dll` $(BIN_PREFIX) - @cp `which SDL_mixer.dll` $(BIN_PREFIX) @cp `which SDL_ttf.dll` $(BIN_PREFIX) - @cp `which libfreetype-6.dll` $(BIN_PREFIX) @cp `which zlib1.dll` $(BIN_PREFIX) - @cp `which libogg-0.dll` $(BIN_PREFIX) - @cp `which libvorbis-0.dll` $(BIN_PREFIX) - @cp `which libvorbisfile-3.dll` $(BIN_PREFIX) - @cp `which libjpeg-8.dll` $(BIN_PREFIX) - @cp `which libgcc_s_dw2-1.dll` $(BIN_PREFIX) - @cp `which libstdc++-6.dll` $(BIN_PREFIX) - @cp `which libfribidi-0.dll` $(BIN_PREFIX) - @cp `which libpthread-2.dll` $(BIN_PREFIX) - @if [ "x$(BDIST_WIN9X)" = "x" ]; then \ - cp `which libxml2-2.dll` $(BIN_PREFIX); \ - cp `which libcairo-2.dll` $(BIN_PREFIX); \ - cp `which libfontconfig-1.dll` $(BIN_PREFIX); \ - cp `which libSDL_Pango-1.dll` $(BIN_PREFIX); \ - cp `which libgobject-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libgthread-2.0-0.dll` $(BIN_PREFIX); \ - cp `which librsvg-2-2.dll` $(BIN_PREFIX); \ - cp `which libcroco-0.6-3.dll` $(BIN_PREFIX); \ - cp `which libgdk_pixbuf-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libglib-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libgsf-1-114.dll` $(BIN_PREFIX); \ - cp `which libpango-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libpangocairo-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libpangoft2-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libgmodule-2.0-0.dll` $(BIN_PREFIX); \ - cp `which libpangowin32-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libpixman-1-0.dll` $(BIN_PREFIX); \ - cp `which libgio-2.0-0.dll` $(BIN_PREFIX); \ - cp `which bz2-1.dll` $(BIN_PREFIX); \ - fi @strip -s $(BIN_PREFIX)/*.dll - @if [ "x$(BDIST_WIN9X)" = "x" ]; then \ - echo; \ - echo "...Installing Configuration Files..."; \ - cp -R win32/etc/ $(BIN_PREFIX); \ - echo; \ - echo "...Installing Library Modules..."; \ - mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - cp /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; \ - mkdir -p $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ - cp /usr/local/lib/gtk-2.0/loaders/*.dll $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ - strip -s $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders/*.dll; \ - 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; \ - fi + @echo + @echo "...Installing Configuration Files..." + @cp -R win32/etc/ $(BIN_PREFIX) + @echo + @echo "...Installing Library Modules..." + @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders + @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders + @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll # Install symlink: .PHONY: install-haiku