Author: cazfi Date: Tue Aug 23 19:02:27 2016 New Revision: 33687 URL: http://svn.gna.org/viewcvs/freeciv?rev=33687&view=rev Log: Updated msys2 environment to 160821 level.
See patch #7547 Modified: trunk/doc/README.msys2 trunk/windows/installer_msys2/Makefile Modified: trunk/doc/README.msys2 URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=33687&r1=33686&r2=33687&view=diff ============================================================================== --- trunk/doc/README.msys2 (original) +++ trunk/doc/README.msys2 Tue Aug 23 19:02:27 2016 @@ -14,6 +14,7 @@ - With very specific configure options (see Problems) and msys2 package selection freeciv can be built - Buildable clients are gtk3, gtk2, and Qt + - Official pre-made msys2 environment supports only gtk3-client build - Audio support cannot be built in - Both server, gtk3-client, and gtk2-client launch ok, Qt client does not - Most Installers cannot be built @@ -66,20 +67,11 @@ - make - gettext - - gcc - - libsqlite-devel - - libiconv-devel - - libreadline-devel - pkg-config - - libbz2-devel - - libcurl-devel - - liblzma-devel - - icu-devel 2.1.1.2) Arch independent packages needed for getting and extracting freeciv source tarball - - wget - tar 2.1.1.3) Arch independent packages needed for building freeciv from svn checkout @@ -94,7 +86,9 @@ 2.1.2) Arch-specific packages needed for building freeciv 2.1.2.1) Arch-specific packages for building common parts + - mingw-w64-i686-gcc / mingw-w64-x86_64-gcc - mingw-w64-i686-icu / mingw-w64-x86_64-icu + - mingw-w64-i686-curl / mingw-w64-x86_64-curl - mingw-w64-i686-bzip2 / mingw-w64-x64_64-bzip2 - mingw-w64-i686-readline / mingw-w64-x86_64-readline - mingw-w64-i686-SDL2_mixer / mingw-w64-x86_64-SDL2_mixer @@ -133,37 +127,31 @@ win32: ------ -msys2-freeciv-win32-160801.7z, based on +msys2-freeciv-win32-160821.7z, based on https://sourceforge.net/projects/msys2/files/Base/i686/msys2-i686-20160205.exe Replace <arch> with 'i686' in package names below win64: ------ -msys2-freeciv-win64-160801.7z, based on +msys2-freeciv-win64-160821.7z, based on https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20160205.exe Replace <arch> with 'x86_64' in package names below Following packages have been installed: - make -- gcc -- gettext-devel -- libsqlite-devel - pkg-config -- libcurl-devel -- libbz2-devel -- liblzma-devel -- icu-devel -- libreadline-devel - tar - subversion - patch -- wget +- nano - automake - libtool - autoconf - python +- mingw-w64-<arch>-gcc - mingw-w64-<arch>-icu +- mingw-w64-<arch>-curl - mingw-w64-<arch>-sqlite3 - mingw-w64-<arch>-gtk3 - mingw-w64-<arch>-nsis @@ -206,8 +194,7 @@ ==================================== - Freeciv linked against readline in msys2 does not work. - Either avoid installing libreadline-devel package to your msys2 - environment at all, or configure freeciv with --without-readline + Configure freeciv with --without-readline - Linking against SDL2, including audio support for any client, fails. Use configure option --disable-sdl-mixer to build without @@ -225,3 +212,13 @@ removing any dll's from the installer packages. Please review what related dlls are packaged and could be removed. + +- Audio support via SDL2_mixer + +- Qt program installers; qt-client and ruledit + +- sdl2-client installer + +- Both win32 and win64 packages built from a single build environment + +- Readline support Modified: trunk/windows/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=33687&r1=33686&r2=33687&view=diff ============================================================================== --- trunk/windows/installer_msys2/Makefile (original) +++ trunk/windows/installer_msys2/Makefile Tue Aug 23 19:02:27 2016 @@ -75,7 +75,7 @@ # create build directory mkdir -p build-$(WINARCH)-$(GUI) # configure - cd build-$(WINARCH)-$(GUI); ../../../configure FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-project-definition=../../../bootstrap/snapshot.project --enable-client=$(GUI) --with-followtag="windows-S3_0" --with-tinycthread --without-readline --disable-sdl-mixer --without-libbz2 --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG) + cd build-$(WINARCH)-$(GUI); ../../../configure FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-project-definition=../../../bootstrap/snapshot.project --enable-client=$(GUI) --with-followtag="windows-S3_0" --with-tinycthread --without-readline --disable-sdl-mixer --without-libbz2 --enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR) --enable-fcmp=$(FCMP) $(EXTRA_CONFIG) # make make -C build-$(WINARCH)-$(GUI) make -C build-$(WINARCH)-$(GUI)/translations/core update-po @@ -170,6 +170,19 @@ COMMON_DLLS := \ libstdc++-6.dll \ + libeay32.dll \ + ssleay32.dll \ + libidn-11.dll \ + libnghttp2-14.dll \ + librtmp-1.dll \ + libssh2-1.dll \ + libcurl-4.dll \ + libgmp-10.dll \ + libgnutls-30.dll \ + libhogweed-4-2.dll \ + libnettle-6-2.dll \ + libp11-kit-0.dll \ + libtasn1-6.dll \ libatk-1.0-0.dll \ libbz2-1.dll \ libcairo-2.dll \ @@ -199,38 +212,9 @@ libicudt57.dll \ libsqlite3-0.dll -COMMON_MSYS_DLLS := \ - stdc++-6.dll \ - 2.0.dll \ - curl-4.dll \ - idn-11.dll \ - sqlite3-0.dll \ - ssl-1.0.0.dll \ - $(GCCDLL) \ - z.dll \ - bz2-1.dll \ - crypto-1.0.0.dll \ - gssapi-3.dll \ - heimntlm-0.dll \ - krb5-26.dll \ - asn1-8.dll \ - com_err-1.dll \ - roken-18.dll \ - crypt-0.dll \ - wind-0.dll \ - hx509-5.dll \ - heimbase-1.dll \ - iconv-2.dll \ - intl-8.dll \ - ssh2-1.dll \ - lzma-5.dll \ - icuuc56.dll \ - icudata56.dll - install-env-common: # add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(WINARCH)-$(GUI)/ - cp -R $(addprefix /bin/msys-, $(COMMON_MSYS_DLLS)) install-$(WINARCH)-$(GUI)/ DEFAULT_FCMP_DLLS := \ libgdk-3-0.dll \ @@ -316,6 +300,9 @@ # COMMON_MSYS_DLLS with most obviously unnecessary things left out. RULEDIT_DLLS := \ libstdc++-6.dll \ + libidn-11.dll \ + libssh2-1.dll \ + libcurl-4.dll \ libatk-1.0-0.dll \ libbz2-1.dll \ libcairo-2.dll \ @@ -343,8 +330,6 @@ RULEDIT_MSYS_DLLS := \ 2.0.dll \ - curl-4.dll \ - idn-11.dll \ sqlite3-0.dll \ ssl-1.0.0.dll \ $(GCCDLL) \ @@ -363,7 +348,6 @@ heimbase-1.dll \ iconv-2.dll \ intl-8.dll \ - ssh2-1.dll \ lzma-5.dll install-env-ruledit: _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits