diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d74a94616..07e74e34b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,12 +6,6 @@ cache: paths: - _ccache/ -fedora-autotools: - image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v3 - stage: build - script: - - bash -x ./.gitlab-ci/test-docker-autotools.sh - fedora-distcheck: image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v3 variables: @@ -19,7 +13,7 @@ fedora-distcheck: when: manual stage: build script: - - bash -x ./.gitlab-ci/test-docker-autotools.sh + - bash -x ./.gitlab-ci/test-docker-meson.sh fedora-meson: image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v3 @@ -81,15 +75,3 @@ msys2-mingw64-meson: - "_build/meson-logs" - "_build/gdk/libgdk-3-0.dll" - "_build/gtk/libgtk-3-0.dll" - -msys2-mingw64-autotools: - when: manual - variables: - MSYSTEM: "MINGW64" - CHERE_INVOKING: "yes" - stage: build - tags: - - win32-ps - script: - - C:\msys64\usr\bin\pacman --noconfirm -Syyuu - - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh" diff --git a/.gitlab-ci/test-docker-autotools.sh b/.gitlab-ci/test-docker-autotools.sh deleted file mode 100755 index c685cc05a9..0000000000 --- a/.gitlab-ci/test-docker-autotools.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -set -e - -mkdir -p _ccache -export CCACHE_BASEDIR="$(pwd)" -export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" -export N_PROCS=$(($(nproc) - 1)) - -EXTRA_CONFIGURE_OPT="" - -# Only enable documentation when distchecking, since it's required -if [ -n "${DO_DISTCHECK-}" ]; then - EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-gtk-doc" -fi - -NOCONFIGURE=1 ./autogen.sh - -mkdir _build -cd _build - -../configure \ - --enable-cloudproviders \ - --enable-broadway-backend \ - --enable-wayland-backend \ - --enable-x11-backend \ - --enable-xinerama \ - ${EXTRA_CONFIGURE_OPTS} - -make -j${N_PROCS} - -if [ -n "${DO_DISTCHECK-}" ]; then - make -j${N_PROCS} check SKIP_GDKTARGET="echo Not actually running tests for now" - make -j${N_PROCS} distcheck SKIP_GDKTARGET="echo Not actually running tests for now" -fi diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh index 26abe0fd86..5ddf8c7e47 100755 --- a/.gitlab-ci/test-docker-meson.sh +++ b/.gitlab-ci/test-docker-meson.sh @@ -7,7 +7,7 @@ export CCACHE_BASEDIR="$(pwd)" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" export PATH="${HOME}/.local/bin:${PATH}" -python3 -m pip install --user meson==0.49.2 +python3 -m pip install --user meson==0.60 meson \ -Dinstalled_tests=true \ @@ -41,3 +41,7 @@ xvfb-run -a -s "-screen 0 1024x768x24" \ --suite=flaky \ --suite=failing \ || true + +if [ -n "${DO_DISTCHECK-}" ]; then + meson dist --no-tests +fi diff --git a/.gitlab-ci/test-msys2-autotools.sh b/.gitlab-ci/test-msys2-autotools.sh deleted file mode 100644 index 656bac26bd..0000000000 --- a/.gitlab-ci/test-msys2-autotools.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -set -e - -if [[ "$MSYSTEM" == "MINGW32" ]]; then - export MSYS2_ARCH="i686" -else - export MSYS2_ARCH="x86_64" -fi - -# Update everything -pacman --noconfirm -Suy - -# Install the required packages -pacman --noconfirm -S --needed \ - base-devel \ - mingw-w64-$MSYS2_ARCH-toolchain \ - mingw-w64-$MSYS2_ARCH-ccache \ - mingw-w64-$MSYS2_ARCH-pkg-config \ - mingw-w64-$MSYS2_ARCH-gobject-introspection \ - mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \ - mingw-w64-$MSYS2_ARCH-atk \ - mingw-w64-$MSYS2_ARCH-cairo \ - mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \ - mingw-w64-$MSYS2_ARCH-glib2 \ - mingw-w64-$MSYS2_ARCH-json-glib \ - mingw-w64-$MSYS2_ARCH-libepoxy \ - mingw-w64-$MSYS2_ARCH-pango \ - mingw-w64-$MSYS2_ARCH-shared-mime-info \ - mingw-w64-$MSYS2_ARCH-gtk-doc - -mkdir -p _ccache -export CCACHE_BASEDIR="$(pwd)" -export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" -export CC="ccache gcc" - -# Build -ccache --zero-stats -ccache --show-stats - -./autogen.sh -make -j4 - -ccache --show-stats diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 8a46c3fb4f..0000000000 --- a/AUTHORS +++ /dev/null @@ -1,65 +0,0 @@ -Please do not mail any of the authors listed here -asking questions about this version of GTK+. - -Original Authors ----------------- -Peter Mattis -Spencer Kimball -Josh MacDonald - -The GTK+ Team (in alphabetical order) -------------------------------------- -Shawn T. Amundson -Jerome Bolliet -Damon Chaplin -Tony Gale -Jeff Garzik -Lars Hamann -Raja R Harinath -Carsten Haitzler -Tim Janik -Stefan Jeske -Elliot Lee -Raph Levien -Ian Main -Federico Mena -Paolo Molaro -Jay Painter -Manish Singh -Owen Taylor - -There are many others who have contributed patches; we thank them, -GTK+ is much better because of them. - - -Over time, GTK+ has incorporated some pieces of software which -started as independent projects. We list the original authors here: - - -MS-Windows theme engine ------------------------ -Raymond Penners -Dom Lachowicz - - -Pixbuf theme engine -------------------- -Owen Taylor - - -IME input method ----------------- -Takuro Ashie -Kazuki IWAMOTO - - -Mac OS X backend ----------------- -Anders Carlsson - - -DirectFB backend ----------------- -Denis Oliver Kropp -Sven Neumann -Mike Emmel diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..8e9afc89c9 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,262 @@ +# Contribution guidelines + +Thank you for considering contributing to the GTK project! + +These guidelines are meant for new contributors, regardless of their level +of proficiency; following them allows the maintainers of the GTK project to +more effectively evaluate your contribution, and provide prompt feedback to +you. Additionally, by following these guidelines you clearly communicate +that you respect the time and effort that the people developing GTK put into +managing the project. + +GTK is a complex free software GUI toolkit, and it would not exist without +contributions from the free and open source software community. There are +many things that we value: + + - bug reporting and fixing + - documentation and examples + - tests + - new features + +Please, do not use the issue tracker for support questions. If you have +questions on how to use GTK effectively, you can use: + + - the `#gtk` IRC channel on irc.gnome.org + - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk) + +You can also look at the GTK tag on [Stack +Overflow](https://stackoverflow.com/questions/tagged/gtk). + +The issue tracker is meant to be used for actionable issues only. + +## How to report bugs + +### Security issues + +You should not open a new issue for security related questions. + +When in doubt, send an email to the [security](mailto:security@gnome.org) +mailing list. + +### Bug reports + +If you're reporting a bug make sure to list: + + 0. which version of GTK are you using? + 0. which operating system are you using? + 0. the necessary steps to reproduce the issue + 0. the expected outcome + 0. a description of the behavior; screenshots are also welcome + 0. a small, self-contained example exhibiting the behavior; if this + is not available, try reproducing the issue using the GTK examples + or interactive tests + +If the issue includes a crash, you should also include: + + 0. the eventual warnings printed on the terminal + 0. a backtrace, obtained with tools such as GDB or LLDB + +It is fine to include screenshots of screen recordings to demonstrate +an issue that is best to understand visually, but please don't just +dump screen recordings without further details into issues. It is +essential that the problem is described in enough detail to reproduce +it without watching a video. + +For small issues, such as: + + - spelling/grammar fixes in the documentation + - typo correction + - comment clean ups + - changes to metadata files (CI, `.gitignore`) + - build system changes + - source tree clean ups and reorganizations + +You should directly open a merge request instead of filing a new issue. + +### Features and enhancements + +Feature discussion can be open ended and require high bandwidth channels; if +you are proposing a new feature on the issue tracker, make sure to make +an actionable proposal, and list: + + 0. what you're trying to achieve + 0. prior art, in other toolkits or applications + 0. design and theming changes + +If you're proposing the integration of new features it helps to have +multiple applications using shared or similar code, especially if they have +iterated over it various times. + +Each feature should also come fully documented, and with tests. + +## Your first contribution + +### Prerequisites + +If you want to contribute to the GTK project, you will need to have the +development tools appropriate for your operating system, including: + + - Python 3.x + - Meson + - Ninja + - Gettext (19.7 or newer) + - a [C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements) + +Up-to-date instructions about developing GNOME applications and libraries +can be found on [the GNOME Developer Center](https://developer.gnome.org). + +The GTK project uses GitLab for code hosting and for tracking issues. More +information about using GitLab can be found [on the GNOME +wiki](https://wiki.gnome.org/GitLab). + +### Dependencies + +In order to get GTK from Git installed on your system, you need to have the +required versions of all the software dependencies required by GTK; typically, +this means a recent version of GLib, Cairo, Pango, and ATK, as well as the +platform-specific dependencies for the windowing system you are using (Wayland, +X11, Windows, or macOS). + +The core dependencies for GTK are: + + - [GLib, GObject, and GIO](https://gitlab.gnome.org/GNOME/glib) + - [Cairo](http://cairographics.org) + - [Pango](https://gitlab.gnome.org/GNOME/pango) + - [GdkPixbuf](https://gitlab.gnome.org/GNOME/gdk-pixbuf) + - [Epoxy](https://github.com/anholt/libepoxy) + - [ATK](https://gitlab.gnome.org/GNOME/atk) + - [Graphene](https://github.com/ebassi/graphene) + +GTK will attempt to download and build some of these dependencies if it +cannot find them on your system. + +Additionally, you may want to look at projects that create a development +environment for you, like [jhbuild](https://wiki.gnome.org/HowDoI/Jhbuild) +and [gvsbuild](https://github.com/wingtk/gvsbuild). + +### Getting started + +You should start by forking the GTK repository from the GitLab web UI, and +cloning from your fork: + +```sh +$ git clone --branch=gtk-3-24 https://gitlab.gnome.org/yourusername/gtk.git gtk-3 +$ cd gtk-3 +``` + +**Note**: if you plan to push changes to back to the main repository and +have a GNOME account, you can skip the fork, and use the following instead: + +```sh +$ git clone --branch=gtk-3-24 git@gitlab.gnome.org:GNOME/gtk.git gtk-3 +$ cd gtk-3 +``` + +To compile the Git version of GTK on your system, you will need to +configure your build using Meson: + +```sh +$ meson setup _builddir . +$ meson compile -C _builddir +``` + +Typically, you should work on your own branch: + +```sh +$ git switch -C your-branch +``` + +Once you've finished working on the bug fix or feature, push the branch +to the Git repository and open a new merge request, to let the GTK +maintainers review your contribution. + +### Code reviews + +Each contribution is reviewed by the core developers of the GTK project. + +### Commit messages + +The expected format for git commit messages is as follows: + +```plain +Short explanation of the commit + +Longer explanation explaining exactly what's changed, whether any +external or private interfaces changed, what bugs were fixed (with bug +tracker reference if applicable) and so forth. Be concise but not too +brief. + +Closes #1234 +``` + + - Always add a brief description of the commit to the _first_ line of + the commit and terminate by two newlines (it will work without the + second newline, but that is not nice for the interfaces). + + - First line (the brief description) must only be one sentence and + should start with a capital letter unless it starts with a lowercase + symbol or identifier. Don't use a trailing period either. Don't exceed + 72 characters. + + - The main description (the body) is normal prose and should use normal + punctuation and capital letters where appropriate. Consider the commit + message as an email sent to the developers (or yourself, six months + down the line) detailing **why** you changed something. There's no need + to specify the **how**: the changes can be inlined. + + - When committing code on behalf of others use the `--author` option, e.g. + `git commit -a --author "Joe Coder "` and `--signoff`. + + - If your commit is addressing an issue, use the + [GitLab syntax](https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html) + to automatically close the issue when merging the commit with the upstream + repository: + +```plain +Closes #1234 +Fixes #1234 +Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1234 +``` + + - If you have a merge request with multiple commits and none of them + completely fixes an issue, you should add a reference to the issue in + the commit message, e.g. `Bug: #1234`, and use the automatic issue + closing syntax in the description of the merge request. + +### Commit access to the GTK repository + +GTK is part of the GNOME infrastructure. At the current time, any +person with write access to the GNOME repository can merge changes to +GTK. This is a good thing, in that it encourages many people to work +on GTK, and progress can be made quickly. However, GTK is a fairly +large and complicated project on which many other things depend, so to +avoid unnecessary breakage, and to take advantage of the knowledge +about GTK that has been built up over the years, we'd like to ask +people committing to GTK to follow a few rules: + +0. Ask first. If your changes are major, or could possibly break existing + code, you should always ask. If your change is minor and you've been + working on GTK for a while it probably isn't necessary to ask. But when + in doubt, ask. Even if your change is correct, somebody may know a + better way to do things. If you are making changes to GTK, you should + be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list) + mailing list; this is a good place to ask about intended changes. + The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK + developers to discuss changes, but if you live outside of the EU/US time + zones, an email to the gtk-devel mailing list is the most certain and + preferred method. + +0. Ask _first_. + +0. Always write a meaningful commit message. Changes without a sufficient + commit message will be reverted. + +0. Never push to the `main` branch, or any stable branches, directly; you + should always go through a merge request, to ensure that the code is + tested on the CI infrastructure at the very least. A merge request is + also the proper place to get a comprehensive code review from the core + developers of GTK. + +If you have been contributing to GTK for a while and you don't have commit +access to the repository, you may ask to obtain it following the [GNOME account +process](https://wiki.gnome.org/AccountsTeam/NewAccounts). diff --git a/HACKING b/HACKING deleted file mode 100644 index 4b20c6b895..0000000000 --- a/HACKING +++ /dev/null @@ -1,64 +0,0 @@ -If you want to hack on the GTK+ project, you'll need to have -the following packages installed: - - - GNU autoconf 2.62 - - GNU automake 1.11 - - GNU libtool 2.2 - - indent (GNU indent 1.9.1 is known good) - - GNU gettext 10.40 - -These should be available by ftp from ftp.gnu.org or any of the -fine GNU mirrors. Beta software can be found at alpha.gnu.org. - -Up-to-date instructions about developing GNOME applications and libraries -can be found here: - - http://library.gnome.org/devel/ - -Information about using git with GNOME can be found here: - - https://wiki.gnome.org/Git - -In order to get GIT GTK+ installed on your system, you need to have -the most recent GIT versions of GLib, Pango, and ATK installed as well. -The installation process of these libraries is similar to that of GTK+, -but needs to be fulfilled prior to installation of GTK+. - -If at all possible, please use GIT to get the latest development version of -gtk+ and glib. You can do the following to get glib and gtk+ from GIT: - - $ git clone git://git.gnome.org/glib - $ git clone git://git.gnome.org/pango - $ git clone git://git.gnome.org/atk - $ git clone git://git.gnome.org/gtk+ - -Note: if you plan to push changes to back to the master repository and -have a gnome account, you want to use the following instead: - - $ git clone ssh://@git.gnome.org/git/gtk+ - -To compile the GIT version of GTK+ on your system, you will need to take -several steps to setup the tree for compilation. You can do all these -steps at once by running: - - gtk+$ ./autogen.sh - -Basically this does the following for you: - - gtk+$ aclocal; automake; autoconf - -The above commands create the `configure' script. Now you -run the `configure' script in `gtk+/' to create all Makefiles. -More information about that in `INSTALL'. - -Before running `autogen.sh' or `configure', make sure you have libtool -in your path. - -Note that autogen.sh runs configure for you. If you wish to pass -options like `--prefix=/usr' to `configure' you can give those options -to `autogen.sh' and they will be passed on to `configure'. - -For information about submitting patches and pushing changes -to GIT, see the `README' and `README.commits' files. In particular, -don't, under any circumstances, push anything to GIT before -reading and understanding `README.commmits'. diff --git a/INSTALL.in b/INSTALL.in deleted file mode 100644 index 7a1dcec01e..0000000000 --- a/INSTALL.in +++ /dev/null @@ -1,42 +0,0 @@ -Prerequisites -============= - -GTK+ requires the following packages: - - - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at - the same location as GTK+. GTK+ @GTK_VERSION@ requires at least - GLib @GLIB_REQUIRED_VERSION@, Pango @PANGO_REQUIRED_VERSION@, - GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@ - and cairo @CAIRO_REQUIRED_VERSION@. - - - libepoxy, for cross-platform OpenGL support. - It can be found here: https://github.com/anholt/libepoxy - - - Each GDK backend has its own backend-specific requirements. For - the X11 backend, X11 R6 and XInput version 2 (as well as a number - of other extensions) are required. The Wayland backend requires - (obviously) the Wayland libraries. - - - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer. - -Simple install procedure -======================== - - % tar xf gtk+-@GTK_VERSION@.tar.xz # unpack the sources - % cd gtk+-@GTK_VERSION@ # change to the toplevel directory - % ./configure # run the `configure' script - % make # build GTK+ - [ Become root if necessary ] - % make install # install GTK+ - -The Details -=========== - -Complete information about installing GTK+ and related libraries -can be found in the file: - - docs/reference/gtk/html/gtk-building.html - -Or online at: - - http://library.gnome.org/devel/gtk/stable/gtk-building.html diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 0000000000..86c35bceb4 --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,41 @@ +Prerequisites +============= + +GTK requires the following packages: + + - Autotools or Meson + + - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at + the same location as GTK. + + - libepoxy, for cross-platform OpenGL support. + It can be found here: https://github.com/anholt/libepoxy + + - Each GDK backend has its own backend-specific requirements. For + the X11 backend, X11 R6 and XInput version 2 (as well as a number + of other extensions) are required. The Wayland backend requires + (obviously) the Wayland libraries. + + - gobject-introspection + +Simple install procedure for Meson +================================== + + $ tar xf gtk+-3.24.46.tar.xz # unpack the sources + $ cd gtk+-3.24.46 # change to the toplevel directory + $ meson setup _build # configure GTK+ + $ meson compile -C _build # build GTK+ + [ Become root if necessary ] + # meson install -C _build # install GTK+ + +The Details +=========== + +Complete information about installing GTK+ and related libraries +can be found in the file: + +- [gtk-building.html](./docs/reference/gtk/html/gtk-building.html) + +Or online at: + +- http://developer-old.gnome.org/gtk/3.24/gtk-building.html diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index 0740dc9013..0000000000 --- a/MAINTAINERS +++ /dev/null @@ -1,12 +0,0 @@ -Matthias Clasen -E-mail: mclasen@redhat.com -Userid: matthiasc - -Tim Janik -E-mail: timj@gtk.org -Userid: timj - -Note that a lot of people are contributing to GTK+, and some parts of it -are technically maintained by other people. The people listed above are -meant as contacts for administrative questions such as cvs accounts. Other -questions are best directed to the mailing list gtk-devel-list@gnome.org. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 8c2a97ad37..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ -## Makefile.am for GTK+ -include $(top_srcdir)/Makefile.decl - -SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples -SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros win32 - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -EXTRA_DIST += \ - autogen.sh \ - HACKING \ - README \ - README.in \ - INSTALL \ - INSTALL.in \ - NEWS.pre-1-0 \ - README.commits \ - README.win32.md \ - check-version.py \ - config.h.win32 \ - makefile.msc \ - gtk-zip.sh.in \ - sanitize-la.sh \ - po/README.translators \ - po/po2tbl.sed.in \ - make-pot \ - meson_options.txt \ - meson.build \ - po/meson.build \ - po-properties/meson.build \ - build-aux/meson/post-install.py \ - config.h.meson \ - gtk.supp - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ - $(srcdir)/m4/gtk-doc.m4 \ - $(srcdir)/INSTALL \ - $(srcdir)/README \ - $(srcdir)/gtk-doc.make \ - $(srcdir)/ChangeLog - -if OS_UNIX -valgrinddir = $(datadir)/gtk-3.0/valgrind -valgrind_DATA = gtk.supp -endif - -## Copy .pc files to target-specific names -gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc - rm -f $@ && \ - cp gtk+-3.0.pc $@ - -gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc - rm -f $@ && \ - cp gdk-3.0.pc $@ - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc -pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc} -pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc} - -if OS_UNIX -pkgconfig_DATA += gtk+-unix-print-3.0.pc -endif - -DISTCLEANFILES = \ - gtk+-unix-print-3.0.pc \ - gtk+-3.0.pc \ - gtk+-x11-3.0.pc \ - gtk+-win32-3.0.pc \ - gtk+-quartz-3.0.pc \ - gtk+-broadway-3.0.pc \ - gtk+-wayland-3.0.pc \ - gdk-3.0.pc \ - gdk-x11-3.0.pc \ - gdk-win32-3.0.pc \ - gdk-quartz-3.0.pc \ - gdk-broadway-3.0.pc \ - gdk-wayland-3.0.pc \ - gail-3.0.pc \ - config.lt - -dist-hook: - mkdir $(distdir)/subprojects - cp -p $(srcdir)/subprojects/*.wrap $(distdir)/subprojects - $(top_srcdir)/check-version.py $(top_srcdir)/configure.ac $(top_srcdir)/meson.build - -distclean-local: - if test "$(srcdir)" = "."; then :; else \ - rm -f ChangeLog; \ - fi - -ChangeLog: - $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git $(top_builddir)/build-aux/missing git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \ - && mv -f $@.tmp $@ \ - || ($(RM) $@.tmp; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> $@)); \ - else \ - test -f $@ || \ - (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ - echo A git checkout and git-log is required to generate this file >> $@); \ - fi - -.PHONY: ChangeLog - -uninstall-local: - rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc - -AM_DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc \ - --disable-doc-cross-references \ - --enable-man \ - --disable-maintainer-mode \ - --enable-introspection \ - --enable-installed-tests - -GITIGNORE_TRANSLATION_DIRS = po-properties -GITIGNOREFILES = po-properties/gtk30-properties.pot - --include $(top_srcdir)/git.mk diff --git a/Makefile.decl b/Makefile.decl deleted file mode 100644 index 4bc7784b60..0000000000 --- a/Makefile.decl +++ /dev/null @@ -1,96 +0,0 @@ -# GTK+ - The GIMP Toolkit - -GTESTER = gtester -k # in $PATH for non-GLIB packages -GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -# initialize variables for unconditional += appending -EXTRA_DIST = -TEST_PROGS = - -### testing rules - -# Xvfb based test rules -XVFB = Xvfb -ac -noreset -screen 0 1024x768x16 -XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ - 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ - 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ - 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ - 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ - 9995 9996 9997 9998 9999 - -if USE_X11 -SKIP_GDKTARGET = \ - false -else -SKIP_GDKTARGET = \ - echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." -endif - -if PLATFORM_WIN32 -no_undefined = -no-undefined -endif - -XVFB_START = \ - ${XVFB} -help 2>/dev/null 1>&2 \ - && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ - && { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ - trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY -# call as: $(XVFB_START) && someprogram - -# test: run all tests in cwd and subdirs -test: test-cwd test-recurse -# test-cwd: run tests in cwd -test-cwd: ${TEST_PROGS} - @$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \ - $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose ${TEST_PROGS}; }; \ - } -# test-recurse: run tests in subdirs -test-recurse: - @ for subdir in $(SUBDIRS) ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \ - done -# test-report: run tests in subdirs and generate report -# perf-report: run tests in subdirs with -m perf and generate report -# full-report: like test-report: with -m perf and -m slow -test-report perf-report full-report: ${TEST_PROGS} - @ ignore_logdir=true ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ - ignore_logdir=false ; \ - fi ; \ - for subdir in $(SUBDIRS) ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ - done ; \ - $(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \ - case $@ in \ - test-report) test_options="-k";; \ - perf-report) test_options="-k -m=perf";; \ - full-report) test_options="-k -m=perf -m=slow";; \ - esac ; \ - $(XVFB_START) && { \ - set -e; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ - G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ - fi ; \ - }; \ - }; \ - $$ignore_logdir || { \ - echo '' > $@.xml ; \ - echo '' >> $@.xml ; \ - for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ - sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ - done ; \ - echo >> $@.xml ; \ - echo '' >> $@.xml ; \ - rm -rf "$$GTESTER_LOGDIR"/ ; \ - ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ - } -.PHONY: test test-cwd test-recurse test-report perf-report full-report -# run make test-cwd as part of make check -check-local: test-cwd diff --git a/NEWS.pre-1-0 b/NEWS.pre-1-0 deleted file mode 100644 index da865b5d17..0000000000 --- a/NEWS.pre-1-0 +++ /dev/null @@ -1,124 +0,0 @@ - -Overview of Changes in GTK+ 1.0.0: - -* A few bug fixes. - -Overview of Changes in GTK+ 0.99.10: - -* Lots of bug fixes -* Documentation improvements -* Better looking handlebox -* A few convenience functions - -Overview of Changes in GTK+ 0.99.9: - -* Added examples directory, even more examples soon -* Added optional word wrap to gtktext -* Changes to gtkhandlebox -* Lots of bug fixes - -Overview of Changes in GTK+ 0.99.8: - -* Compilation and configuration fixes -* DND Fixes -* New test in testgtk: cursors -* Tutorial updates/additions -* Few more FAQ additions -* More prep for 1.0 - -Overview of Changes in GTK+ 0.99.7: - -* This release is mainly because 0.99.6 did not compile completely - due to a missing file. -* Fixes to Gtk's quit handlers. - -Overview of Changes in GTK+ 0.99.6: - -* Intermediate release to become 1.0. -* More signedness corrections for handler functions in gtkmain.h. -* Semantics of GtkWidget::delete_event changed. -* Documentation updates. -* Inclusion of Gtk tutorial. -* Implementation of a new shutdown method for GtkObject's executed prior to - actual destruction. WARNING: this breaks binary compatibility, programs using - Gtk need to be recompiled. -* Clean ups due to compiler warnings. -* Various widget fixes. - -Overview of Fixes in GTK+ 0.99.5: - -* Signal signedness and naming corrections -* rc/style fixes -* text, entry widget fixes -* gtkeditable fixes -* scrollbar flickering fixed -* check casts are more descriptive -* DND fixes -* FAQ updates -* Bug fixes - -Overview of Changes in GTK+ 0.99.4: - -* Reference counting revolution integrated. - Refer to docs/refcounting.txt on this issue. -* Implementation of a decent debugging system, you would want - to export GTK_DEBUG=objects if you are going to develop gtk applications, - refer to docs/debugging.txt for further information. -* Additions on the signal code for querying information about certain signals, - and pending handlers of signals. -* Support for user signals, and major changes to internal signal handler - handling for proper signal removal and invokation of after signals. -* Additional signals for various widgets e.g, GtkHandleBox::child_attached, - GtkHandleBox::child_detached, GtkWidget::style_set, GtkWidget::parent_set. -* GtkTooltips became a true descendant of GtkObject via derivation from - GtkData and facilitates an extra tip string which can be used as e.g. an - index into context help. -* Split up of the widget/object flags into a private and a public portion, - consult docs/widget_system.txt on this. -* Support for hot keys on gtk programs via gtk_key_snooper_install(). -* Reimplementation of the *_interp functions as *_full functions to provide - simple callback functions as well. -* Idle functions are now prioritized. -* Many enhancements to GtkNotebook. -* New widget GtkSpinButton, check out testgtk. -* New widget GtkTipsQuery for letting the user query tooltips of widgets. -* Addition of GtkEditable base widget to encapsulate selection and - clipboard handling. (GtkEntry and GtkText use this) -* Text widget more complete. -* Additions to GtkStatusBar to make it complete. -* Gdk now supports regions. -* Access masks for widget arguments (GTK_ARG_READABLE/GTK_ARG_WRITABLE). -* Function replacements: - g_string_hash() -> g_str_hash() - g_string_equal() -> g_str_equal() - gtk_tooltips_set_tips() -> gtk_tooltips_set_tip() -* Support for quit handlers in gtk_main(). -* Motif window mangaer hints support. -* Widget arguments are now flagged for readability/writability. -* Additions to documentation. -* Various FAQ updates. (FAQ now included) -* Clean ups and many many bug fixes by a lot of people all over the place. -* New, long and descriptive ChangeLog entries for bored readers ;) - -Overview of Changes in GTK+ 0.99.3: - -* Filesel enhancement / stability changes -* New widget, gtkcombo -* Widgets in the toolbar do not get the focus -* New widget, gtkstatusbar (still in-progress) -* g_string_equal renamed g_str_equal -* g_string_hash renamed g_str_hash -* new gtkbox functions to allow modification of the child - linkage after the widget tree is setup -* gtk_*_get_arg() and gtk_*_set_arg() fixes and implementations -* DND changes/fixes -* Entry widget now has set_max_length function -* Handlebox widget changes/fixes -* Some work on text widget (still in-progress) -* Now the toolbar supports arbitrary widgets as well -* CList has resizable columns again -* CList now looks consistant with scrolled windows -* Remove flickering from entry widget -* Added switch_page signal to notebook widget -* Documentation additions -* Other bug fixes... diff --git a/README.commits b/README.commits deleted file mode 100644 index f6e830a2ce..0000000000 --- a/README.commits +++ /dev/null @@ -1,72 +0,0 @@ -GTK+ is part of the GNOME git repository. At the current time, any -person with write access to the GNOME repository, can make changes to -GTK+. This is a good thing, in that it encourages many people to work -on GTK+, and progress can be made quickly. However, GTK+ is a fairly -large and complicated package that many other things depend on, so to -avoid unnecessary breakage, and to take advantage of the knowledge -about GTK+ that has been built up over the years, we'd like to ask -people committing to GTK+ to follow a few rules: - -0) Ask first. If your changes are major, or could possibly break existing - code, you should always ask. If your change is minor and you've - been working on GTK+ for a while it probably isn't necessary - to ask. But when in doubt, ask. Even if your change is correct, - somebody may know a better way to do things. - - If you are making changes to GTK+, you should be subscribed - to gtk-devel-list@gnome.org. (Subscription address: - gtk-devel-list-request@gnome.org.) This is a good place to ask - about intended changes. - - #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...) - is also a good place to find GTK+ developers to discuss changes with, - however, email to gtk-devel-list is the most certain and preferred - method. - -1) Ask _first_. - -2) With git, we no longer maintain a ChangeLog file, but you are expected - to produce a meaningful commit message. Changes without a sufficient - commit message will be reverted. See below for the expected format - of commit messages. - -Notes: - -* When developing larger features or complicated bug fixes, it is - advisable to work in a branch in your own cloned GTK+ repository. - You may even consider making your repository publically available - so that others can easily test and review your changes. - -* The expected format for git commit messages is as follows: - -=== begin example commit === -Short explanation of the commit - -Longer explanation explaining exactly what's changed, whether any -external or private interfaces changed, what bugs were fixed (with bug -tracker reference if applicable) and so forth. Be concise but not too brief. -=== end example commit === - - - Always add a brief description of the commit to the _first_ line of - the commit and terminate by two newlines (it will work without the - second newline, but that is not nice for the interfaces). - - - First line (the brief description) must only be one sentence and - should start with a capital letter unless it starts with a lowercase - symbol or identifier. Don't use a trailing period either. Don't exceed - 72 characters. - - - The main description (the body) is normal prose and should use normal - punctuation and capital letters where appropriate. Normally, for patches - sent to a mailing list it's copied from there. - - - When committing code on behalf of others use the --author option, e.g. - git commit -a --author "Joe Coder " and --signoff. - - -Owen Taylor -13 Aug 1998 -17 Apr 2001 - -Matthias Clasen -31 Mar 2009 diff --git a/README.in b/README.in deleted file mode 100644 index 9315f92e17..0000000000 --- a/README.in +++ /dev/null @@ -1,82 +0,0 @@ -General Information -=================== - -This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for -creating graphical user interfaces. Offering a complete set of widgets, -GTK+ is suitable for projects ranging from small one-off projects to -complete application suites. - -GTK+ is free software and part of the GNU Project. However, the -licensing terms for GTK+, the GNU LGPL, allow it to be used by all -developers, including those developing proprietary software, without any -license fees or royalties. - -The official download locations are: - ftp://ftp.gtk.org/pub/gtk - http://download.gnome.org/sources/gtk+ - -The official web site is: - http://www.gtk.org/ - -Information about mailing lists can be found at - http://www.gtk.org/mailing-lists.php - - -Installation -============ - -See the file 'INSTALL' - - -How to report bugs -================== - -Bugs should be reported to the GNOME bug tracking system. -(http://bugzilla.gnome.org, product glib.) You will need -to create an account for yourself. - -In the bug report please include: - -* Information about your system. For instance: - - - What operating system and version - - For Linux, what version of the C library - - And anything else you think is relevant. - -* How to reproduce the bug. - - If you can reproduce it with one of the test programs that are built - in the tests/ subdirectory, that will be most convenient. Otherwise, - please include a short test program that exhibits the behavior. - As a last resort, you can also provide a pointer to a larger piece - of software that can be downloaded. - -* If the bug was a crash, the exact text that was printed out - when the crash occurred. - -* Further information such as stack traces may be useful, but - is not necessary. - - -Patches -======= - -Patches should also be submitted to bugzilla.gnome.org. If the -patch fixes an existing bug, add the patch as an attachment -to that bug report. - -Otherwise, enter a new bug report that describes the patch, -and attach the patch to that bug report. - -Patches should be in unified diff form. (The -up option to GNU diff) -Even better are git-formatted patches. (Use git format-patch) - - -Release notes -============= - -Release notes for releases of GTK+ 3.x are part of the migration -guide in the GTK+ documentation. See - -https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html diff --git a/README.md b/README.md new file mode 100644 index 0000000000..3b79950858 --- /dev/null +++ b/README.md @@ -0,0 +1,70 @@ +General Information +=================== + +GTK is a multi-platform toolkit for creating graphical user interfaces. +Offering a complete set of widgets, GTK is suitable for projects ranging +from small one-off projects to complete application suites. + +GTK is free software and part of the GNU Project. However, the licensing +terms for GTK, the GNU LGPL, allow it to be used by all developers, +including those developing proprietary software, without any license fees or +royalties. + +The official download locations are: + +- http://download.gnome.org/sources/gtk+ + +The official web site is: + +- http://www.gtk.org/ + +Installation +============ + +See the file [`INSTALL.md`](./INSTALL.md) + + +How to report bugs +================== + +Bugs should be reported to the [GTK issue +tracker](https://gitlab.gnome.org/GNOME/gtk/issues). You will need to create +an account for yourself. + +In the bug report please include: + +* Information about your system. For instance: + + - What operating system and version + - For Linux, what version of the C library + + And anything else you think is relevant. + +* How to reproduce the bug. + + If you can reproduce it with one of the test programs that are built + in the tests/ subdirectory, that will be most convenient. Otherwise, + please include a short test program that exhibits the behavior. + As a last resort, you can also provide a pointer to a larger piece + of software that can be downloaded. + +* If the bug was a crash, the exact text that was printed out + when the crash occurred. + +* Further information such as stack traces may be useful, but + is not necessary. + + +Bug fixes and improvements +========================== + +Changes should be submitted as merge request to the GTK project. If a merge +request fixes an issue, the description should mention the issue number. + +Release notes +============= + +Release notes for releases of GTK 3.x are part of the migration +guide in the GTK documentation. See + +- https://developer-old.gnome.org/gtk3/3.24/gtk-migrating-3-x-to-y.html diff --git a/README.win32.md b/README.win32.md index 9af8f24d6c..43c05f48e8 100644 --- a/README.win32.md +++ b/README.win32.md @@ -25,293 +25,134 @@ Building GTK+ on Win32 === First you obviously need developer packages for the compile-time -dependencies: GDK-Pixbuf, Pango, atk, glib, gettext-runtime, libiconv at least. -See http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies . +dependencies: `GDK-Pixbuf`, `Pango`*, `HarfBuzz`**, `atk`, `cairo`* and `glib`. +You will also need `libffi`, `gettext-runtime`, `libiconv` and PCRE (or PCRE2 +for glib-2.74.x and later) and `zlib` for GLib; Cairo with DirectWrite support +and/or FontConfig support for best font shaping and display supportin Pango*; +and `librsvg`, `libpng`, `libjpeg-turbo` and `libtiff` for loading the +various icons via GDK-Pixbuf that are common to GTK. You will need a Rust +installation with the appropriate toolchain installed as well, if building +librsvg-2.42.x or later. + +(MinGW users should also look at the following section on the dependencies +that are required, either built from source or installed using `pacman`. + +Notes on building with Visual Studio +=== + +You may wish to build the dependencies from the sources (all are required +for the best use experience unless noted). + +For Visual Studio, it is possible to build the following with CMake: + +* zlib +* libpng +* FreeType (used in FontConfig, optionally used in Cairo and HarfBuzz) +* libexpat (used in FontConfig) +* libxml2 (needed for GResource support during build time and librsvg/libcroco) +* libbrotlidec (optional, used in FreeType, requires Visual Studio 2013 or later) +* libjpeg-turbo (you also need NASM, unless building for ARM64) +* libtiff (requires libjpeg-turbo and zlib) +* HarfBuzz** (for pre-2.6.0, using Meson is recommended for 2.6.0 or later) +* PCRE (for glib-2.72.x and earlier), or PCRE2 (for glib-2.74.x or later) + +It is possible to build the following items using Meson: +* HarfBuzz** (2.6.0 and later) +* Cairo (1.17.x or later; for 1.16.x, you need mozilla-build to build from the MSVC Makefiles, + building cairo-gobject is required) +* FontConfig (needed if PangoFT2 is used. Note building Cairo with FontConfig is required, + requires Visual Studio 2015 or later) +* fribidi (required for Pango) +* GLib, ATK, Pango, GDK-Pixbuf +* gobject-introspection (recommended, if using language bindings or gedit is desired, requires GLib and libffi) +* pixman (required for Cairo) +* libepoxy*** + +For Visual Studio, Visual Studio projects or NMake Makefiles are provided with the following: +* librsvg (runtime, 2.42.x or later require Visual Studio 2013 or later with a Rust + MSVC toolchain installed; requires libxml2) +* libcroco (required for librsvg-2.40.x or earlier, requires libxml2) +* libbz2 (optional for FreeType) +* nasm (needed for building libjpeg-turbo on x86/x64) +* adwaita-icon-theme (run-time, after building GTK and librsvg) + +NMake Makefiles are provided as an add-on with patches to build the sources, +at https://github.com/fanc999/gtk-deps-msvc/, under $(dependency) / $(dep_version) +* libiconv (used by gettext-runtime) +* gettext-runtime (and gettext-tools; an alternative is to use proxy-intl during the GLib + build, at the cost of not having translations being built, VS2015 or later is required for + 0.21.1 and later) +* libffi (currently, manually adapting the pkg-config .pc.in template is needed; an older + x86/x64 version can be built in-place if building GLib without libffi installed) + +You also need a copy of stdint.h and inttypes.h from msinttypes for Visual Studio 2012 +or earlier (stdint.h is optional on VS2010 or later), as well as an implementation of +stdbool.h. + +Bleeding-edge versions of the dependencies may require Visual Studio 2015/2017 or later. + +ARM64 builds are supported in addition to x86 and x64 builds, albeit without SIMD optimizations +in pixman and libjpeg-turbo (SIMD support may need to be explicitly disabled). Please see +the Meson documentation on how to set up a cross-build from an x86-based Windows system. +Introspection support is not supported in this configuration. + +Building just using Meson without the dependencies installed may work if the following +conditions are met: + +* Visual Studio 2017 15.9.x or later is installed +* `git` is accessible in the `%PATH%`, to pull in the depedencies +* The CMake-built dependencies should be pre-built. +* Only building for x86/x64 is supported this way, ARM64 builds should at least have + pixman and libffi prebuilt. +* librsvg and adwaita-icon-theme must be built separately +* gettext-runtime and libiconv must also be prebuilt if translations support is desired. + +Notes on certain dependencies: +--- + +* (*)DirectWrite support in Pango requires pango-1.50.12 or later with Cairo + 1.17.6 or later. Visual Studio 2015 or later is required to build Pango + 1.50.x or later. +* (**)HarfBuzz is required if using Pango-1.44.x or later, or if building + PangoFT2. If using Visual Studio 2013 or earlier, only HarfBuzz 2.4.0 + or earlier is supported. Visual Studio 2017 15.9.x or later is required + for 3.3.0 or later. You may wish to build FreeType prior to building + HarfBuzz, and then building FreeType again linking to HarfBuzz for a + more comprehensive FreeType build. Font features support is only enabled + if PangoFT2 is built or Pango-1.44.x and HarfBuzz 2.2.0 or later are installed. +* (***)For building with GLES support (currently supported via libANGLE), you + will need to obtain libANGLE from its latest GIT checkout or from QT 5.10.x. + You will need to build libepoxy with EGL enabled using `-Degl=yes` when + configuring the build. + +Some outdated builds of the dependencies may be found at +http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies . For people compiling GTK+ with Visual C++, it is recommended that the same compiler is used for at least GDK-Pixbuf, Pango, atk and glib so that crashes and errors caused by different CRTs can be avoided. -Currently building with Visual Studio 2008 or later is supported, -either via Visual Studio project files or via the Meson build system, -as described in the below sections. - For Visual Studio 2008 and 2010, a special setup making use of the Windows 8.0 SDK is required, see at the bottom of this document for guidance. Interchanging between Visual Studio 2015, 2017, 2019 and 2022 builds should be fine as they use the same CRT (UCRT) DLLs. -After installing the dependencies, there are two ways to build GTK+ -for win32. - -GNU tools, ./configure && make install (info here may be out of date, -consider using Meson instead) ---- - -This requires you have mingw and MSYS. - -Use the configure script, and the resulting Makefiles (which use -libtool and gcc to do the compilation). I use this myself, but it can -be hard to setup correctly. - -The full script I run to build GTK+ 2.16 unpacked from a source -distribution is as below. This is from bulding GTK+ 2.16.5. I don't -use any script like this to build the development branch, as I don't -distribute any binaries from development branches. - -``` -# This is a shell script that calls functions and scripts from -# tml@iki.fi's personal work envíronment. It is not expected to be -# usable unmodified by others, and is included only for reference. - -MOD=gtk+ -VER=2.16.5 -REV=1 -ARCH=win32 - -THIS=${MOD}_${VER}-${REV}_${ARCH} - -RUNZIP=${MOD}_${VER}-${REV}_${ARCH}.zip -DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip - -HEX=`echo $THIS | md5sum | cut -d' ' -f1` -TARGET=c:/devel/target/$HEX - -usedev -usemsvs6 - -( - -set -x - -DEPS=`latest --arch=${ARCH} glib atk cairo pango libpng zlib libtiff jpeg` -PROXY_LIBINTL=`latest --arch=${ARCH} proxy-libintl` - -PKG_CONFIG_PATH= -for D in $DEPS; do - PATH=/devel/dist/${ARCH}/$D/bin:$PATH - [ -d /devel/dist/${ARCH}/$D/lib/pkgconfig ] && PKG_CONFIG_PATH=/devel/dist/${ARCH}/$D/lib/pkgconfig:$PKG_CONFIG_PATH -done - -LIBPNG=`latest --arch=${ARCH} libpng` -ZLIB=`latest --arch=${ARCH} zlib` -LIBTIFF=`latest --arch=${ARCH} libtiff` -JPEG=`latest --arch=${ARCH} jpeg` - -patch -p0 <<'EOF' -EOF - -lt_cv_deplibs_check_method='pass_all' \ -CC='gcc -mtune=pentium3 -mthreads' \ -CPPFLAGS="-I/devel/dist/${ARCH}/${LIBPNG}/include \ --I/devel/dist/${ARCH}/${ZLIB}/include \ --I/devel/dist/${ARCH}/${LIBTIFF}/include \ --I/devel/dist/${ARCH}/${JPEG}/include \ --I/devel/dist/${ARCH}/${PROXY_LIBINTL}/include" \ -LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \ --L/devel/dist/${ARCH}/${ZLIB}/lib \ --L/devel/dist/${ARCH}/${LIBTIFF}/lib \ --L/devel/dist/${ARCH}/${JPEG}/lib \ --L/devel/dist/${ARCH}/${PROXY_LIBINTL}/lib -Wl,--exclude-libs=libintl.a \ --Wl,--enable-auto-image-base" \ -LIBS=-lintl \ -CFLAGS=-O2 \ -./configure \ ---enable-win32-backend \ ---disable-gdiplus \ ---with-included-immodules \ ---without-libjasper \ ---enable-debug=yes \ ---enable-explicit-deps=no \ ---disable-gtk-doc \ ---disable-static \ ---prefix=$TARGET && - -libtoolcacheize && -rm gtk/gtk.def && -(PATH="$PWD/gdk-pixbuf/.libs:/devel/target/$HEX/bin:$PATH" make -j3 install || (rm .libtool-cache* && PATH="/devel/target/$HEX/bin:$PATH" make -j3 install)) && - -PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >/devel/target/$HEX/etc/gtk-2.0/gdk-pixbuf.loaders && - -grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp && - mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders && -grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp && - mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules && - -./gtk-zip.sh && - -mv /tmp/${MOD}-${VER}.zip /tmp/$RUNZIP && -mv /tmp/${MOD}-dev-${VER}.zip /tmp/$DEVZIP - -) 2>&1 | tee /devel/src/tml/packaging/$THIS.log - -(cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) && -manifestify /tmp/$RUNZIP /tmp/$DEVZIP -``` - -You should not just copy the above blindly. There are some things in -the script that are very specific to *my* build setup on *my* current -machine. For instance the "latest" command, the "usedev" and -"usemsvs6" shell functions, the `/devel/dist` folder. The above script -is really just meant for reference, to give an idea. You really need -to understand what things like `PKG_CONFIG_PATH` are and set them up -properly after installing the dependencies before building GTK+. - -As you see above, after running configure, one can just say "make -install", like on Unix. A post-build fix is needed, running -gdk-pixbuf-query-loaders once more to get a correct `gdk-pixbuf.loaders` -file. - -For a 64-bit build you need to remove the `gtk/gtk.def` file and let it -be regenerated by the makefilery. This is because the 64-bit GTK dll -has a slightly different list of exported function names. This is on -purpose and not a bug. The API is the same at the source level, and -the same #defines of some function names to actually have a _utf8 -suffix is used (just to keep the header simpler). But the -corresponding non-suffixed function to maintain ABI stability are not -needed in the 64-bit case (because there are no older EXEs around that -would require such for ABI stability). - - -Microsoft's tools ---- - -There are VS 2008~2022 solution and project files to build GTK+, which -are maintained by Chun-wei Fan. They should build GTK+ out of the box, -provided that the afore-mentioned dependencies are installed. They will -build GDK with the Win32 backend, GTK+ itself (with GAIL/a11y built in), -the GAIL-Util library and the gtk3-demo program. Please also refer to the -README_FEATURES_MSVC.md file that reside in win32 on how to enable -additional features that are not enabled by default, such as EGL support -via libANGLE, which emulate the GL/EGL calls using Direct3D 9/11. - -Please refer to the following GNOME Live! page for a more detailed ouline -on the process of building the GTK+ stack and its dependencies with Visual -C++: - -https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack - -Alternative 1 also generates Microsoft import libraries (.lib), if you -have lib.exe available. It might also work for cross-compilation from -Unix. - -I (Tor) use method 1 myself. Hans Breuer has been taking care of the MSVC -makefiles. At times, we disagree a bit about various issues, and for -instance the makefile.msc files might not produce identically named -DLLs and import libraries as the "autoconfiscated" makefiles and -libtool do. If this bothers you, you will have to fix the makefiles. - -You may need or wish to update `gtk3-build-defines.[vs]props` (under the -entry `GenerateRequiredSourcesBase` and/or `GtkIntrospectNMakeCmd` and/or -`InstallBuildsBase`) to pass in the variables if they are not in: - -* `$(PREFIX)\bin` (used for generating code for the build): - * `GLIB_MKENUMS` (path to your glib-mkenums script) - * `GLIB_GENMARSHAL` (path to your glib-genmarshal script) - * `GDBUS_CODEGEN` (path to your gdbus-codegen script) - * `GLIB_COMPILE_RESOURCES` (path to your glib-compile-resources program) - -* `%PATH%`: - * `PYTHON` (path to your Python interpreter, for generating code for - the build as well as for introspection; for introspection, this must - match the version series and architecture for the Python that is used - to build gobject-introspection) - * `PKG_CONFIG` (path to your pkg-config or compatible tool, for - building introspection files in the `gtk3-introspect` project) - * `MSGFMT` (path to your msgfmt program, if building translations - during install; append ` install-translations` to `InstallBuildsBase` - in `gtk3-build-defines.[vs]props]) - -`LIBDIR` and `INCLUDEDIR` can also be passed in if they are not under -`$(PREFIX)\lib` and `$(PREFIX)\include` respectively. Note that -`$(LIBDIR)` is architecture-dependent. - -If desiring to build binaries for ARM64 (`aarch64`), one needs to use the -Visual Studio 2017 or 2019 or 2022 solution files, or use Meson with a -cross-compilation file, with a Windows 10 SDK that supports ARM64 -builds. At this point, building the introspection files is not supported -for ARM64 builds, and you will need a Python 3.x interpreter and -glib-compile-resources binaries that run on the build machine. - -For Visual Studio 2017 ARM64 builds, do also check the -`Directory.Build.props` file in `$(srcroot)/win32/vs15` -indicates a Windows 10 SDK version that supports ARM64 builds -exists on the build machine. - -For building ARM64 binaries with the Visual Studio projects, prior to the -build, you may need to update `gtk3-build-defines.props` to pass in the variables as indicated earlier: - -* GLIB_MKENUMS -* GLIB_GENMARSHAL -* GDBUS_CODEGEN -* GLIB_COMPILE_RESOURCES -* PYTHON - -in the nmake command line indicated by `` so -that they point to the respective tools and scripts that will run on the -build machine. You may also need to update `gtk3-version-paths.props` to -update `` to the installation of the Python 3.x interpreter -that will run on the build machine (or just update `PYTHON=...` in the -command line in ``). To carry out the actual -build using the solution files, use the "Configuration Manager" to add the -ARM64 build configs by copying the settings from the x64 configs, and then -build the solution. -The build instructions for such builds otherwise follow the standard Win32 -(x86) and x64 builds, but you need to ensure that you have ARM64 builds of -the various dependencies. - -It may still be possible to carry out the build and build the -introspection files with Python 2.7.x using older versions of GLib and -GObject-Introspection, but please note that this is not recommended -and one is on his/her own by doing so. - -It is now supported to build with the Visual Studio projects directly -from a GIT checkout. Run in a Visual Studio command prompt, in -$(srcroot)/win32: - -`nmake /f bootstrap-msvc.mak [PYTHON=...] [PERL=...] [FONT_FEATURES_DEMO=1] [FONT_FEATURES_USE_PANGOFT2=1] [USE_EGL=1]` - -where `PYTHON` and `PERL` are the respective paths to the Python and PERL -interpreters, if they are not in your `%PATH%`-they are both required to -generate the full sets of project files, as well as the auxiliary build -files and headers that is not available in a GIT checkout and must be -generated prior to opening the project files. - -For `FONT_FEATURES_DEMO`, `FONT_FEATURES_USE_PANGOFT2` and `USE_EGL`, -please refer to `win32\README_FEATURES_MSVC.md` for more details, to -enable features that is optional and not enabled by default (i.e. in the -release tarballs). - -It is also possible to regenerate some or all of the visual studio -projects with the following, if necessary: - -`nmake /f generate-msvc.mak [PYTHON=...] [FONT_FEATURES_DEMO=1] [FONT_FEATURES_USE_PANGOFT2=1] [USE_EGL=1] ` - -Where target can be (they will update all related VS2008~2022 projects): - -* `regenerate-demos-h-win32`: Regenerate the `gtk3-demo` projects along - with `demos.h.win32`, useful to enable or disable the Font Features - demo. -* `regenerate-gdk-vsproj`: Regenerate all the GDK projects with - `broadwayd`, useful to enable or disable EGL on Windows. -* `regenerate-gtk-vsproj`: Regenerate the `gtk-3` and `gailutil-3` library - projects. -* `regenerate-all-msvc-projs`: Re-generate all project files, and re-copy - all the Visual Studio 2010 project files for VS 2012~2022. +The following describes how one can build GTK with MinGW or Visual Studio +2008 or later using Meson. Using Meson (for Visual Studio and MinGW builds) ---- +=== Meson can now be used to build GTK+-3.x with either MinGW or Visual Studio. You will need the following items in addition to all the dependencies listed above: -* Python 3.5 or later -* Meson build system, 0.48.0 or later +* Python 3.6.x or later (later Meson versions require Python 3.7.x) +* Meson build system, 0.60.0 or later * Ninja (if not using the Visual Studio project generator for Visual Studio 2010 or later) -* CMake (optional, used for dependency searching) -* pkg-config (optional, or some compatible tool, highly recommended) +* CMake (recommended for Visual Studio builds, used for dependency searching) +* pkg-config (or some compatible tool, highly recommended) For all Windows builds, note that unless `-Dbuiltin_immodules=no` is specified, the input modules (immodules) are built directly into the GTK @@ -324,14 +165,14 @@ For building with Meson using Visual Studio, do the following: matches the build configuration (Visual Studio version and architecture), and run the following: -* Ensure that both the installation directory of Python 3.5+ and its script +* Ensure that both the installation directory of Python 3.6+ and its script directory is in your `%PATH%`, as well as the Ninja, CMake and pkg-config executables (if used). If a pkg-config compatible drop-in replacement tool is being used, ensure that `PKG_CONFIG` is set to point to the executable of that tool as well. * For non-GNOME dependencies (such as Cairo and Harfbuzz), where pkg-config - files or CMake files could not be properly located, set `%INCLUDE%` and + files or CMake files may not be properly located, set `%INCLUDE%` and `%LIB%` to ensure that their header files and .lib files can be found respectively. The DLLs of those dependencies should also be in the `%PATH%` during the build as well, especially if introspection files ar @@ -439,10 +280,9 @@ configured (using the Windows 8.1 SDK is also possible for Visual Studio the DirectX SDK installed, you should remove its utility directory from your `%PATH%` as well. -* The Windows 8.0 SDK headers may contain an `roapi.h` that cannot be +* The Windows 8.0/8.1 SDK headers may contain an `roapi.h` that cannot be used under plain C, so to remedy that, change the following lines - (around lines 55-57) (this is not necessary for the Windows 8.1 or - later SDKs): + (around lines 55-57): ``` // RegisterActivationFactory/RevokeActivationFactory registration cookie diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index f6f719d427..0000000000 --- a/acinclude.m4 +++ /dev/null @@ -1,79 +0,0 @@ -# autoconf 2.13 / 2.50 compatibility macro - -# GLIB_AC_DIVERT_BEFORE_HELP(STUFF) -# --------------------------------- -# Put STUFF early enough so that they are available for $ac_help expansion. -# Handle both classic (<= v2.13) and modern autoconf -AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP], -[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], - [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -$1 -AC_DIVERT_POP()])])]) - -# GTK_ADD_LIB(VAR,LIBNAME) -# --------------------------------- -# Helper macro to add a -lBlah to a variable, avoiding repeats -# Note that this needs to be quoted when used in an enclosing macro -AC_DEFUN([GTK_ADD_LIB], -[ case "$$1 " in - *-l$2[[\ \ ]]*) ;; - *) $1="-l$2 $$1" ;; - esac -]) - - -# Checks the location of the XML Catalog -# Usage: -# JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# Defines XMLCATALOG and XML_CATALOG_FILE substitutions -AC_DEFUN([JH_PATH_XML_CATALOG], -[ - # check for the presence of the XML catalog - AC_ARG_WITH([xml-catalog], - AC_HELP_STRING([--with-xml-catalog=CATALOG], - [path to xml catalog to use]),, - [with_xml_catalog=/etc/xml/catalog]) - jh_found_xmlcatalog=true - XML_CATALOG_FILE="$with_xml_catalog" - AC_SUBST([XML_CATALOG_FILE]) - AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)]) - if test -f "$XML_CATALOG_FILE"; then - AC_MSG_RESULT([found]) - else - jh_found_xmlcatalog=false - AC_MSG_RESULT([not found]) - fi - - # check for the xmlcatalog program - AC_PATH_PROG(XMLCATALOG, xmlcatalog, no) - if test "x$XMLCATALOG" = xno; then - jh_found_xmlcatalog=false - fi - - if $jh_found_xmlcatalog; then - ifelse([$1],,[:],[$1]) - else - ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2]) - fi -]) - -# Checks if a particular URI appears in the XML catalog -# Usage: -# JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -AC_DEFUN([JH_CHECK_XML_CATALOG], -[ - AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl - AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) - if $jh_found_xmlcatalog && \ - AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then - AC_MSG_RESULT([found]) - ifelse([$3],,,[$3 -])dnl - else - AC_MSG_RESULT([not found]) - ifelse([$4],, - [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])], - [$4]) - fi -]) diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 250f80d25e..0000000000 --- a/autogen.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` -cd "$srcdir" - -mkdir -p m4 - -GTKDOCIZE=`which gtkdocize` -if test -z $GTKDOCIZE; then - echo "*** No GTK-Doc found, please install it ***" - exit 1 -else - gtkdocize || exit $? -fi - -PKGCONFIG=`which pkg-config` -if test -z "$PKGCONFIG"; then - echo "*** pkg-config not found, please install it ***" - exit 1 -fi - -pkg-config --print-errors gobject-introspection-1.0 -if [ $? != 0 ]; then - echo "You probably need to install 'libgirepository1.0-dev'" - exit 1 -fi - -# README and INSTALL are required by automake, but may be deleted by clean -# up rules. to get automake to work, simply touch these here, they will be -# regenerated from their corresponding *.in files by ./configure anyway. -touch README INSTALL - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please install it ***" - exit 1 -else - autoreconf --force --install --verbose || exit $? -fi - -cd "$olddir" -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/check-version.py b/check-version.py deleted file mode 100755 index 46bcc3ac4e..0000000000 --- a/check-version.py +++ /dev/null @@ -1,200 +0,0 @@ -#!/usr/bin/env python3 - -import re -import sys - -try: - configure_ac = sys.argv[1] -except Exception: - configure_ac = 'configure.ac' - -try: - meson_build = sys.argv[2] -except Exception: - meson_build = 'meson.build' - -CONFIGURE_MAJOR_VERSION_RE = re.compile( - r''' - ^ - \s* - m4_define\( - \s* - \[gtk_major_version\] - \s* - , - \s* - \[ - (?P[0-9]+) - \] - \s* - \) - $ - ''', - re.UNICODE | re.VERBOSE -) - -CONFIGURE_MINOR_VERSION_RE = re.compile( - r''' - ^ - \s* - m4_define\( - \s* - \[gtk_minor_version\] - \s* - , - \s* - \[ - (?P[0-9]+) - \] - \s* - \) - $ - ''', - re.UNICODE | re.VERBOSE -) - -CONFIGURE_MICRO_VERSION_RE = re.compile( - r''' - ^ - \s* - m4_define\( - \s* - \[gtk_micro_version\] - \s* - , - \s* - \[ - (?P[0-9]+) - \] - \s* - \) - $ - ''', - re.UNICODE | re.VERBOSE -) - -CONFIGURE_INTERFACE_AGE_RE = re.compile( - r''' - ^ - \s* - m4_define\( - \s* - \[gtk_interface_age\] - \s* - , - \s* - \[ - (?P[0-9]+) - \] - \s* - \) - $ - ''', - re.UNICODE | re.VERBOSE -) - -MESON_VERSION_RE = re.compile( - r''' - ^ - \s* - version - \s* - :{1} - \s* - \'{1} - (?P[0-9]+) - \.{1} - (?P[0-9]+) - \.{1} - (?P[0-9]+) - \'{1} - \s* - ,? - $ - ''', - re.UNICODE | re.VERBOSE -) - -MESON_INTERFACE_AGE_RE = re.compile( - r''' - ^\s*gtk_interface_age\s*={1}\s*(?P[0-9]+)\s*$ - ''', - re.UNICODE | re.VERBOSE -) - -version = {} - -with open(configure_ac, 'r') as f: - line = f.readline() - while line: - res = CONFIGURE_MAJOR_VERSION_RE.match(line) - if res: - if 'major' in version: - print(f'Redefinition of major version; version is already set to {version["major"]}') - sys.exit(1) - version['major'] = res.group('version') - line = f.readline() - continue - res = CONFIGURE_MINOR_VERSION_RE.match(line) - if res: - if 'minor' in version: - print(f'Redefinition of minor version; version is already set to {version["minor"]}') - sys.exit(1) - version['minor'] = res.group('version') - line = f.readline() - continue - res = CONFIGURE_MICRO_VERSION_RE.match(line) - if res: - if 'micro' in version: - print(f'Redefinition of micro version; version is already set to {version["micro"]}') - sys.exit(1) - version['micro'] = res.group('version') - line = f.readline() - continue - res = CONFIGURE_INTERFACE_AGE_RE.match(line) - if res: - if 'age' in version: - print(f'Redefinition of interface age; age is already set to {version["age"]}') - sys.exit(1) - version['age'] = res.group('age') - line = f.readline() - continue - if ('major', 'minor', 'micro', 'age') in version: - break - line = f.readline() - -print(f'GTK version defined in {configure_ac}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})') - -configure_version = version -version = {} - -with open(meson_build, 'r') as f: - line = f.readline() - inside_project = False - while line: - if line.startswith('project('): - inside_project = True - if inside_project: - res = MESON_VERSION_RE.match(line) - if res: - version['major'] = res.group('major') - version['minor'] = res.group('minor') - version['micro'] = res.group('micro') - if inside_project and line.endswith(')'): - inside_project = False - res = MESON_INTERFACE_AGE_RE.match(line) - if res: - version['age'] = res.group('age') - if ('major', 'minor', 'micro', 'age') in version: - break - line = f.readline() - -print(f'GTK version defined in {meson_build}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})') - -meson_version = version - -if configure_version != meson_version: - print('Version mismatch between Autotools and Meson builds') - sys.exit(1) - -sys.exit(0) diff --git a/config.h.meson b/config.h.meson deleted file mode 100644 index b502611cb7..0000000000 --- a/config.h.meson +++ /dev/null @@ -1,298 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#mesondefine ENABLE_NLS - -/* The prefix for our gettext translation domains. */ -#mesondefine GETTEXT_PACKAGE - -/* Disable deprecation warnings from glib */ -#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET - -/* Define if libcloudproviders is available */ -#mesondefine HAVE_CLOUDPROVIDERS - -/* define if we have colord */ -#mesondefine HAVE_COLORD - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#mesondefine HAVE_DCGETTEXT - -/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't. - */ -#mesondefine HAVE_DECL_ISINF - -/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't. - */ -#mesondefine HAVE_DECL_ISNAN - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_DEV_EVDEV_INPUT_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_DLFCN_H - -/* Define to 1 if you have the `exp2' function. */ -#mesondefine HAVE_EXP2 - -/* Define to 1 if you have the `flockfile' function. */ -#mesondefine HAVE_FLOCKFILE - -/* Define to 1 if you have the `fmin' function. */ -#mesondefine HAVE_FMIN - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_FTW_H - -/* Define to 1 if you have the `getpagesize' function. */ -#mesondefine HAVE_GETPAGESIZE - -/* Define to 1 if you have the `getresuid' function. */ -#mesondefine HAVE_GETRESUID - -/* Define if gio-unix is available */ -#mesondefine HAVE_GIO_UNIX - -/* defines whether we have HarfBuzz */ -#mesondefine HAVE_HARFBUZZ - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_INTTYPES_H - -/* Define to 1 if the system has the type `IPrintDialogCallback'. */ -#mesondefine HAVE_IPRINTDIALOGCALLBACK - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_LINUX_INPUT_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_LINUX_MEMFD_H - -/* Define to 1 if you have the `localtime_r' function. */ -#mesondefine HAVE_LOCALTIME_R - -/* Define to 1 if you have the `log2' function. */ -#mesondefine HAVE_LOG2 - -/* Define to 1 if you have the `lstat' function. */ -#mesondefine HAVE_LSTAT - -/* Define to 1 if you have the `mallinfo' function. */ -#mesondefine HAVE_MALLINFO - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_MEMORY_H - -/* Define to 1 if you have the `mkstemp' function. */ -#mesondefine HAVE_MKSTEMP - -/* Define to 1 if you have a working `mmap' system call. */ -#mesondefine HAVE_MMAP - -/* Define to 1 if you have the `nearbyint' function. */ -#mesondefine HAVE_NEARBYINT - -/* defines whether we have pangoft2 */ -#mesondefine HAVE_PANGOFT - -/* Define to 1 if libpapi available */ -#mesondefine HAVE_PAPI - -/* Define to 1 if you have the `posix_fallocate' function. */ -#mesondefine HAVE_POSIX_FALLOCATE - -/* Have the Xrandr extension library */ -#mesondefine HAVE_RANDR - -/* Have the Xrandr 1.5 extension library */ -#mesondefine HAVE_RANDR15 - -/* Define to 1 if you have the `rint' function. */ -#mesondefine HAVE_RINT - -/* Define to 1 if you have the `round' function. */ -#mesondefine HAVE_ROUND - -/* Define to 1 if SetupDiGetDevicePropertyW() is available */ -#mesondefine HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W - -/* Define to 1 if you have the `sincos' function. */ -#mesondefine HAVE_SINCOS - -/* Define to 1 if solaris xinerama is available */ -#mesondefine HAVE_SOLARIS_XINERAMA - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_SYS_MMAN_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_SYS_PARAM_H - -/* Have the sysprof-capture library */ -#mesondefine HAVE_SYSPROF_CAPTURE - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_SYS_STAT_H - -/* Define to 1 if sys/sysinfo.h is available */ -#mesondefine HAVE_SYS_SYSINFO_H - -/* Define to 1 if sys/systeminfo.h is available */ -#mesondefine HAVE_SYS_SYSTEMINFO_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_SYS_TYPES_H - -/* Define to 1 if you have the `trunc' function. */ -#mesondefine HAVE_TRUNC - -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_UNISTD_H - -/* Have the XCOMPOSITE X extension */ -#mesondefine HAVE_XCOMPOSITE - -/* Have the Xcursor library */ -#mesondefine HAVE_XCURSOR - -/* Have the XDAMAGE X extension */ -#mesondefine HAVE_XDAMAGE - -/* Have the XFIXES X extension */ -#mesondefine HAVE_XFIXES - -/* Define to 1 if XFree Xinerama is available */ -#mesondefine HAVE_XFREE_XINERAMA - -/* Have XGenericEvent */ -#mesondefine HAVE_XGENERICEVENTS - -/* Define to 1 if xinerama is available */ -#mesondefine HAVE_XINERAMA - -/* Define to use XKB extension */ -#mesondefine HAVE_XKB - -/* Have the SYNC extension library */ -#mesondefine HAVE_XSYNC - -/* Define to 1 if you have the `_lock_file' function. */ -#mesondefine HAVE__LOCK_FILE - -/* Define if _NL_MEASUREMENT_MEASUREMENT is available */ -#mesondefine HAVE__NL_MEASUREMENT_MEASUREMENT - -/* Define if _NL_PAPER_HEIGHT is available */ -#mesondefine HAVE__NL_PAPER_HEIGHT - -/* Define if _NL_PAPER_WIDTH is available */ -#mesondefine HAVE__NL_PAPER_WIDTH - -/* Define if _NL_TIME_FIRST_WEEKDAY is available */ -#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY - -/* Define to the address where bug reports for this package should be sent. */ -#mesondefine PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#mesondefine PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#mesondefine PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#mesondefine PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#mesondefine PACKAGE_URL - -/* Define to the version of this package. */ -#mesondefine PACKAGE_VERSION - -/* Define when building a shared library for Windows */ -#mesondefine DLL_EXPORT - -/* Use NSBundle functions to determine load paths for libraries, translations, - etc. */ -#mesondefine QUARTZ_RELOCATION - -/* The size of `DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY', as computed by sizeof. - */ -#mesondefine SIZEOF_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY - -/* Define to 1 if XInput 2.0 is available */ -#mesondefine XINPUT_2 - -/* Define to 1 if XInput 2.2 is available */ -#mesondefine XINPUT_2_2 - -/* Define to 1 if XInput 2.4 is available */ -#mesondefine XINPUT_2_4 - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -#mesondefine _FILE_OFFSET_BITS - -/* defines how to decorate public symbols while building */ -#mesondefine _GDK_EXTERN - -/* Define for large files, on AIX-style hosts. */ -#mesondefine _LARGE_FILES - -/* Define to 1 if on MINIX. */ -#mesondefine _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#mesondefine _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#mesondefine _POSIX_SOURCE - -/* Define to `int' if doesn't define. */ -#mesondefine gid_t - -/* Define to `int' if doesn't define. */ -#mesondefine uid_t - -#mesondefine GTK_DATADIR - -#mesondefine GTK_LIBDIR - -#mesondefine GTK_PRINT_BACKENDS - -/* Define the location where the catalogs will be installed */ -#mesondefine GTK_LOCALEDIR - -#mesondefine ISO_CODES_PREFIX - -/* Define if tracker3 is available */ -#mesondefine HAVE_TRACKER3 - -/* Define if xdg_activation's wl-protocols definition is available */ -#mesondefine HAVE_XDG_ACTIVATION \ No newline at end of file diff --git a/config.h.win32.in b/config.h.win32.in deleted file mode 100644 index a68a4f20a0..0000000000 --- a/config.h.win32.in +++ /dev/null @@ -1,336 +0,0 @@ -/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC. */ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* always defined to indicate that i18n is enabled */ -#define ENABLE_NLS 1 - -/* define to enable packagekit */ -/* #undef ENABLE_PACKAGEKIT */ - -/* The prefix for our gettext translation domains. */ -#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" - -/* Disable deprecation warnings from glib */ -/* #undef GLIB_DISABLE_DEPRECATION_WARNINGS */ - -/* Define if debugging is enabled */ -#define GTK_COMPILED_WITH_DEBUGGING "yes" - -/* Define the location where the catalogs will be installed */ -#define GTK_LOCALEDIR "NONE/share/locale" - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 - -/* define if we have colord */ -/* #undef HAVE_COLORD */ - -/* Define to 1 if you have the `dcgettext' function. */ -#define HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't. - */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_DECL_ISINF 1 -#endif - -/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't. - */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_DECL_ISNAN 1 -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the `exp2' function. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_EXP2 1 -#endif - -/* Define to 1 if you have the `flockfile' function. */ -#undef HAVE_FLOCKFILE - -/* Define to 1 if you have the `fmin' function. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -# define HAVE_FMIN 1 -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_FTW_H */ - -/* Define to 1 if you have the `getpagesize' function. */ -#ifndef _MSC_VER -#define HAVE_GETPAGESIZE 1 -#else -/* #undef HAVE_GETPAGESIZE */ -#endif - -/* Define to 1 if you have the `getresuid' function. */ -/* #undef HAVE_GETRESUID */ - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT 1 - -/* Define if gio-unix is available */ -/* #undef HAVE_GIO_UNIX */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_INTTYPES_H 1 -#else -/* #undef HAVE_INTTYPES_H */ -#endif - -/* Define to 1 if the system has the type `IPrintDialogCallback'. */ -#define HAVE_IPRINTDIALOGCALLBACK 1 - -/* Define if your file defines LC_MESSAGES. */ -/* #undef HAVE_LC_MESSAGES */ - -/* Define to 1 if you have the `m' library (-lm). */ -#ifndef _MSC_VER -#define HAVE_LIBM 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the `localtime_r' function. */ -/* #undef HAVE_LOCALTIME_R */ - -/* Define to 1 if you have the `log2' function. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_LOG2 1 -#endif - -/* Define to 1 if you have the `lstat' function. */ -/* #undef HAVE_LSTAT */ - -/* Define to 1 if you have the `mallinfo' function. */ -/* #undef HAVE_MALLINFO */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mkstemp' function. */ -/* #undef HAVE_MKSTEMP */ - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if nearbyint() is available */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_NEARBYINT 1 -#endif - -/* Define to 1 if libpapi available */ -/* #undef HAVE_PAPI */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PWD_H */ - -/* Have the Xrandr extension library */ -/* #undef HAVE_RANDR */ - -/* Define to 1 if rint() is available */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_RINT 1 -#endif - -/* Define to 1 if round() is available */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_ROUND 1 -#endif - -/* Define to 1 if SetupDiGetDevicePropertyW() is available */ -#ifdef _MSC_VER -#define HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W 1 -#endif - -/* Define to 1 if sincos() is available */ -/* #undef HAVE_SINCOS */ - -/* Define to 1 if solaris xinerama is available */ -/* #undef HAVE_SOLARIS_XINERAMA */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_STDINT_H 1 -#else -#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */ -#define HAVE_STDINT_H 1 -#endif -/* #undef HAVE_STDINT_H */ -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_STRINGS_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if sys/sysinfo.h is available */ -/* #undef HAVE_SYS_SYSINFO_H */ - -/* Define to 1 if sys/systeminfo.h is available */ -/* #undef HAVE_SYS_SYSTEMINFO_H */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_SYS_TIME_H 1 -#else /* _MSC_VER */ -/* #undef HAVE_SYS_TIME_H */ -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if trunc() is available */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -# define HAVE_TRUNC 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_UNISTD_H 1 -#else -/* #undef HAVE_UNISTD_H */ -#endif - -/* Have the XCOMPOSITE X extension */ -/* #undef HAVE_XCOMPOSITE */ - -/* Have the Xcursor library */ -/* #undef HAVE_XCURSOR */ - -/* Have the XDAMAGE X extension */ -/* #undef HAVE_XDAMAGE */ - -/* Have the XFIXES X extension */ -/* #undef HAVE_XFIXES */ - -/* Define to 1 if XFree Xinerama is available */ -/* #undef HAVE_XFREE_XINERAMA */ - -/* Have XGenericEvent */ -/* #undef HAVE_XGENERICEVENTS */ - -/* Define to 1 if xinerama is available */ -/* #undef HAVE_XINERAMA */ - -/* Define to use XKB extension */ -/* #undef HAVE_XKB */ - -/* Have the SYNC extension library */ -/* #undef HAVE_XSYNC */ - -/* Define to 1 if you have the `_lock_file' function. */ -#define HAVE__LOCK_FILE - -/* Define if _NL_MEASUREMENT_MEASUREMENT is available */ -/* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */ - -/* Define if _NL_PAPER_HEIGHT is available */ -/* #undef HAVE__NL_PAPER_HEIGHT */ - -/* Define if _NL_PAPER_WIDTH is available */ -/* #undef HAVE__NL_PAPER_WIDTH */ - -/* Define if _NL_TIME_FIRST_WEEKDAY is available */ -/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */ - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#ifndef _MSC_VER -/* #undef NO_MINUS_C_MINUS_O */ -#else -#define NO_MINUS_C_MINUS_O 1 -#endif - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "gtk+" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gtk+ @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "gtk+" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@" - -/* Use NSBundle functions to determine load paths for libraries, translations, - etc. */ -/* #undef QUARTZ_RELOCATION */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if gmodule works and should be used */ -#define USE_GMODULE 1 - -/* Define to 1 if XInput 2.0 is available */ -/* #undef XINPUT_2 */ - -/* Define to 1 if XInput 2.2 is available */ -/* #undef XINPUT_2_2 */ - -/* Define to 1 if XInput 2.4 is available */ -/* #undef XINPUT_2_4 */ - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -/* # define _DARWIN_USE_64_BIT_INODE 1 */ -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define when building a shared library for Windows */ -#define DLL_EXPORT 1 - -/* defines how to decorate public symbols while building */ -#ifdef DLL_EXPORT -# ifdef _MSC_VER -# define _GDK_EXTERN __declspec (dllexport) extern -# else -# define _GDK_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern -# endif -#endif - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to `int' if doesn't define. */ -#define gid_t int - -/* Define to `int' if doesn't define. */ -#define uid_t int diff --git a/configure.ac b/configure.ac deleted file mode 100644 index bba14d126e..0000000000 --- a/configure.ac +++ /dev/null @@ -1,2031 +0,0 @@ -# Process this file with autoconf to produce a configure script. - -# Making releases: -# GTK_MICRO_VERSION += 1; -# GTK_INTERFACE_AGE += 1; -# GTK_BINARY_AGE += 1; -# if any functions have been added, set GTK_INTERFACE_AGE to 0. -# if backwards compatibility has been broken, -# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. - -m4_define([gtk_major_version], [3]) -m4_define([gtk_minor_version], [24]) -m4_define([gtk_micro_version], [35]) -m4_define([gtk_interface_age], [31]) -m4_define([gtk_binary_age], - [m4_eval(100 * gtk_minor_version + gtk_micro_version)]) -m4_define([gtk_version], - [gtk_major_version.gtk_minor_version.gtk_micro_version]) -# This is the X.Y used in -lgtk-FOO-X.Y -m4_define([gtk_api_version], [3.0]) - -AC_PREREQ([2.62]) -AC_INIT([gtk+], [gtk_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B], - [gtk+]) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SRCDIR([gdk/gdktypes.h]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) - -AC_CANONICAL_HOST - -# Define a string for the earliest version that this release has -# backwards binary compatibility with for all interfaces a module -# might. Unless we add module-only API with lower stability -# guarantees, this should be unchanged until we break binary compat -# for GTK+. -# -#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT -m4_define([gtk_binary_version], [3.0.0]) - -# required versions of other packages -m4_define([glib_required_major], [2]) -m4_define([glib_required_minor], [57]) -m4_define([glib_required_micro], [2]) -m4_define([glib_required_version], - [glib_required_major.glib_required_minor.glib_required_micro]) -m4_define([glib_min_required_minor], - [m4_eval(glib_required_minor - (glib_required_minor % 2))]) -m4_define([glib_max_allowed_minor], - [m4_eval(glib_required_minor + (glib_required_minor % 2))]) -m4_define([glib_min_required_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_min_required_minor)) -m4_define([glib_max_allowed_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_max_allowed_minor)) -GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=glib_min_required_version -DGLIB_MAX_ALLOWED_VERSION=glib_max_allowed_version" - -m4_define([pango_required_version], [1.41.0]) -m4_define([fribidi_required_version], [0.19.7]) -m4_define([atk_required_version], [2.32.0]) -m4_define([cairo_required_version], [1.14.0]) -m4_define([gdk_pixbuf_required_version], [2.30.0]) -m4_define([introspection_required_version], [1.39.0]) -m4_define([wayland_required_version], [1.14.91]) -m4_define([wayland_protocols_required_version], [1.17]) -m4_define([epoxy_required_version], [1.4]) -m4_define([cloudproviders_required_version], [0.2.5]) -m4_define([sysprof_required_version], [3.33.2]) -GLIB_REQUIRED_VERSION=glib_required_version -PANGO_REQUIRED_VERSION=pango_required_version -ATK_REQUIRED_VERSION=atk_required_version -CAIRO_REQUIRED_VERSION=cairo_required_version -GDK_PIXBUF_REQUIRED_VERSION=gdk_pixbuf_required_version -INTROSPECTION_REQUIRED_VERSION=introspection_required_version - -AC_SUBST(GLIB_REQUIRED_VERSION) -AC_SUBST(PANGO_REQUIRED_VERSION) -AC_SUBST(ATK_REQUIRED_VERSION) -AC_SUBST(CAIRO_REQUIRED_VERSION) -AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION) -AC_SUBST(INTROSPECTION_REQUIRED_VERSION) - -# Save this value here, since automake will set cflags later -cflags_set=${CFLAGS+set} - -AM_INIT_AUTOMAKE([1.11 -Wall subdir-objects no-define -Wno-portability tar-ustar no-dist-gzip dist-xz]) -AM_MAINTAINER_MODE([enable]) - -# Support silent build rules. Disable -# by either passing --disable-silent-rules to configure or passing V=1 -# to make -AM_SILENT_RULES([yes]) - -# -# For each of the libraries we build, we define the following -# substituted variables: -# -# foo_PACKAGES: pkg-config packages this library requires -# foo_EXTRA_LIBS: Libraries this module requires not pulled in by pkg-config -# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config -# foo_DEP_LIBS: All libraries this module requires -# foo_DEP_CFLAGS: All cflags this module requires - - -GTK_MAJOR_VERSION=gtk_major_version -GTK_MINOR_VERSION=gtk_minor_version -GTK_MICRO_VERSION=gtk_micro_version -GTK_INTERFACE_AGE=gtk_interface_age -GTK_BINARY_AGE=gtk_binary_age -GTK_VERSION=gtk_version -GTK_API_VERSION=gtk_api_version -GTK_BINARY_VERSION=gtk_binary_version -AC_SUBST(GTK_MAJOR_VERSION) -AC_SUBST(GTK_MINOR_VERSION) -AC_SUBST(GTK_MICRO_VERSION) -AC_SUBST(GTK_INTERFACE_AGE) -AC_SUBST(GTK_BINARY_AGE) -AC_SUBST(GTK_API_VERSION) -AC_SUBST(GTK_VERSION) -AC_SUBST(GTK_BINARY_VERSION) - -# libtool versioning -#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION -#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE` -#LT_REVISION=$GTK_INTERFACE_AGE -#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE` -#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` - -m4_define([lt_current], [m4_eval(100 * gtk_minor_version + gtk_micro_version - gtk_interface_age)]) -m4_define([lt_revision], [gtk_interface_age]) -m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_interface_age)]) -LT_VERSION_INFO="lt_current:lt_revision:lt_age" -LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) -AC_SUBST(LT_VERSION_INFO) -AC_SUBST(LT_CURRENT_MINUS_AGE) - -m4_define([gail_lt_current],[0]) -m4_define([gail_lt_revision],[0]) -m4_define([gail_lt_age],[0]) -m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age]) -m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)]) -AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info]) -AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age]) - -# Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=721346 until fixed upstream in autoconf-archive -if test "$cross_compiling" = "no"; then - if test -n "$CFLAGS"; then - CFLAGS_FOR_BUILD=$CFLAGS - fi - if test -n "$CPPFLAGS"; then - CPPFLAGS_FOR_BUILD=$CPPFLAGS - fi - if test -n "$LDFLAGS"; then - LDFLAGS_FOR_BUILD=$LDFLAGS - fi -fi - -# Checks for programs. -AC_PROG_CC -AX_PROG_CC_FOR_BUILD -AC_PROG_CC_C_O -AC_PROG_MKDIR_P -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -# Define _GNU_SOURCE etc. where appropriate, e.g. for strptime() on glibc -AC_USE_SYSTEM_EXTENSIONS - -# i18n stuff -AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.19.7]) - -GETTEXT_PACKAGE=gtk30 -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [The prefix for our gettext translation domains.]) - -MATH_LIB=-lm -AC_MSG_CHECKING([for native Win32]) -LIB_EXE_MACHINE_FLAG=X86 -EXE_MANIFEST_ARCHITECTURE=X86 -DISABLE_ON_W32='' -case "$host" in - *-*-mingw*) - dnl Comment-out certain gtk3.types.in lines - DISABLE_ON_W32='%' - os_win32=yes - gio_can_sniff=no - MATH_LIB= - case "$host" in - x86_64-*-*) - LIB_EXE_MACHINE_FLAG=X64 - EXE_MANIFEST_ARCHITECTURE=AMD64 - ;; - esac - ;; - *) - os_win32=no - ;; -esac -AC_MSG_RESULT([$os_win32]) - -AC_SUBST(DISABLE_ON_W32) -AC_SUBST(LIB_EXE_MACHINE_FLAG) -AC_SUBST(EXE_MANIFEST_ARCHITECTURE) - -case $host in - *-*-linux*) - os_linux=yes - ;; - *-*-darwin*) - os_darwin=yes - ;; -esac - -dnl -dnl Check for a working C++ compiler, but do not bail out, if none is found. -dnl We use this for an automated test for C++ header correctness. -dnl -AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) -AC_LANG_PUSH([C++]) - -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], - [[class a { int b; } c;]])], - [],[CXX=]) -AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "") - -gtk_save_cxxflags="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS -x objective-c++" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@interface Foo @end]], - [[]])], - [OBJC=yes],[OBJC=no]) -AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes") -CXXFLAGS="$gtk_save_cxxflags" -AC_LANG_POP([C++]) - -if test "$os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) - enable_static=no - fi - if test x$enable_shared = xno; then - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) - fi - enable_shared=yes -fi - -dnl Initialize libtool -LT_PREREQ([2.2.6]) -LT_INIT([disable-static win32-dll]) -# Create libtool early, because it's used in configure -LT_OUTPUT - -# Make sure we use 64-bit versions of various file stuff. -AC_SYS_LARGEFILE - -AM_PROG_AS -AC_PATH_TOOL(NM, nm, nm) - -AC_MSG_CHECKING([for some Win32 platform]) -case "$host" in - *-*-mingw*|*-*-cygwin*) - platform_win32=yes - ;; - *) - platform_win32=no - ;; -esac -AC_MSG_RESULT([$platform_win32]) -AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") - -AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") -AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes") -AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes") -AM_CONDITIONAL(OS_DARWIN, test "$os_darwin" = "yes") - -if test "$os_win32" = "yes"; then - AC_CHECK_TOOL(WINDRES, windres, no) - if test "$WINDRES" = no; then - AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.]) - fi - AC_CHECK_PROG(ms_librarian, lib.exe, yes, no) -fi -AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes) - -m4_define([debug_default], - m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum])) - -dnl declare --enable-* args and collect ac_help strings -AC_ARG_ENABLE(debug, - [AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@], - [turn on debugging @<:@default=debug_default@:>@])],, - [enable_debug=debug_default]) - -AC_ARG_ENABLE(installed_tests, - AS_HELP_STRING([--enable-installed-tests], - [Install test programs (default: no)]),, - [enable_installed_tests=no]) -AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes) - -AC_ARG_ENABLE(xkb, - [AS_HELP_STRING([--enable-xkb], - [support XKB extension [default=maybe]])],, - [enable_xkb="maybe"]) -AC_ARG_ENABLE(xinerama, - [AS_HELP_STRING([--enable-xinerama], - [support Xinerama extension [default=maybe]])],, - [enable_xinerama="maybe"]) -AC_ARG_ENABLE(xrandr, - [AS_HELP_STRING([--enable-xrandr], - [support XRandR extension [default=maybe]])],, - [enable_xrandr="maybe"]) -AC_ARG_ENABLE(xfixes, - [AS_HELP_STRING([--enable-xfixes], - [support XFixes extension [default=maybe]])],, - [enable_xfixes="maybe"]) -AC_ARG_ENABLE(xcomposite, - [AS_HELP_STRING([--enable-xcomposite], - [support X Composite extension [default=maybe]])],, - [enable_xcomposite="maybe"]) -AC_ARG_ENABLE(xdamage, - [AS_HELP_STRING([--enable-xdamage], - [support X Damage extension [default=maybe]])],, - [enable_xdamage="maybe"]) - -AC_ARG_ENABLE(x11-backend, - [AS_HELP_STRING([--enable-x11-backend], - [enable the X11 gdk backend])], - [backend_set=yes]) -AC_ARG_ENABLE(win32-backend, - [AS_HELP_STRING([--enable-win32-backend], - [enable the Win32 gdk backend])], - [backend_set=yes]) -AC_ARG_ENABLE(quartz-backend, - [AS_HELP_STRING([--enable-quartz-backend], - [enable the quartz gdk backend])], - [backend_set=yes]) -AC_ARG_ENABLE(broadway-backend, - [AS_HELP_STRING([--enable-broadway-backend], - [enable the broadway (HTML5) gdk backend])], - [backend_set=yes]) -AC_ARG_ENABLE(wayland-backend, - [AS_HELP_STRING([--enable-wayland-backend], - [enable the wayland gdk backend])], - [backend_set=yes]) -AC_ARG_ENABLE(cloudproviders, - [AS_HELP_STRING([--enable-cloudproviders], - [enable libcloudproviders integration])], - [cloudproviders_set=yes]) - -AC_ARG_ENABLE(profiler, - [AS_HELP_STRING([--enable-profiler], - [enable profiler integration])], - [enable_profiler=$enableval], - [enable_profiler=no]) - -if test -z "$backend_set"; then - if test "$platform_win32" = yes; then - enable_win32_backend=yes - else - enable_x11_backend=yes - enable_wayland_backend=maybe - fi -fi - -AC_ARG_ENABLE(quartz-relocation, - [AS_HELP_STRING([--enable-quartz-relocation], - [enable bundle-based relocation functions])], - [quartz_relocation=yes]) - -cairo_backends= -backend_immodules= -have_gio_unix=no -GDK_BACKENDS= -GDK_EXTRA_LIBS= -GDK_EXTRA_CFLAGS= -GDK_WINDOWING= -PANGO_PACKAGES="pango pangocairo" - -ENABLE_ON_X11='%' -if test "$enable_x11_backend" = "yes"; then - # GDK calls the xlib backend "x11," cairo calls it "xlib." Other - # backend names are identical. - cairo_backends="$cairo_backends cairo-xlib" - GDK_BACKENDS="$GDK_BACKENDS x11" - backend_immodules="$backend_immodules,xim" - GDK_WINDOWING="$GDK_WINDOWING -#define GDK_WINDOWING_X11" - ENABLE_ON_X11='' -fi -AC_SUBST(ENABLE_ON_X11) - -if test "$enable_win32_backend" = "yes"; then - cairo_backends="$cairo_backends cairo-win32" - GDK_BACKENDS="$GDK_BACKENDS win32" - backend_immodules="$backend_immodules,ime" - GDK_WINDOWING="$GDK_WINDOWING -#define GDK_WINDOWING_WIN32" - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32 -lwinspool -lcomctl32 -lcomdlg32" - AM_CONDITIONAL(USE_WIN32, true) - PANGO_PACKAGES="pangowin32 pangocairo" -else - AM_CONDITIONAL(USE_WIN32, false) -fi - -DISABLE_ON_QUARTZ='' -if test "x$enable_quartz_backend" = xyes; then - cairo_backends="$cairo_backends cairo-quartz" - GDK_BACKENDS="$GDK_BACKENDS quartz" - backend_immodules="$backend_immodules,quartz" - GDK_WINDOWING="$GDK_WINDOWING -#define GDK_WINDOWING_QUARTZ" - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -Wl,-framework,Cocoa" - DISABLE_ON_QUARTZ='%' - AM_CONDITIONAL(USE_QUARTZ, true) - if test "x$quartz_relocation" = xyes; then - AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.]) - fi -else - AM_CONDITIONAL(USE_QUARTZ, false) -fi -AC_SUBST(DISABLE_ON_QUARTZ) - -AC_CHECK_LIB([rt], [shm_open], [SHM_LIBS="-lrt"], [SHM_LIBS=""]) -AC_SUBST(SHM_LIBS) - -AC_CHECK_FUNCS(posix_fallocate flockfile _lock_file) - -if test "x$enable_broadway_backend" = xyes; then - GDK_BACKENDS="$GDK_BACKENDS broadway" - cairo_backends="$cairo_backends cairo" - backend_immodules="$backend_immodules,broadway" - GDK_WINDOWING="$GDK_WINDOWING -#define GDK_WINDOWING_BROADWAY" - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz" - AM_CONDITIONAL(USE_BROADWAY, true) -else - AM_CONDITIONAL(USE_BROADWAY, false) -fi - -PKG_PROG_PKG_CONFIG - -WAYLAND_RUNTIME_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-egl" -WAYLAND_DEPENDENCIES="wayland-protocols >= wayland_protocols_required_version $WAYLAND_RUNTIME_DEPENDENCIES" -if test "$enable_wayland_backend" = "maybe" ; then - AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no]) - PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no]) - AC_MSG_CHECKING([for WAYLAND_DEPENDENCIES]) - if test "$WAYLAND_SCANNER" = "no" -o "$have_wayland_deps" = "no" ; then - enable_wayland_backend=no - else - enable_wayland_backend=yes - fi - AC_MSG_RESULT($enable_wayland_backend) -fi - -if test "$enable_wayland_backend" = "yes"; then - # For the cairo image backend - cairo_backends="$cairo_backends cairo" - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - GDK_BACKENDS="$GDK_BACKENDS wayland" - GDK_WINDOWING="$GDK_WINDOWING -#define GDK_WINDOWING_WAYLAND" - backend_immodules="$backend_immodules,wayland" - WAYLAND_PACKAGES="$WAYLAND_RUNTIME_DEPENDENCIES" - AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no]) - AS_IF([test "x$WAYLAND_SCANNER" = "xno"], - [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])]) - AC_SUBST([WAYLAND_SCANNER]) - - # For xdg-activation support - XDG_ACTIVATION_DEPENDENCIES="wayland-protocols >= 1.21" - PKG_CHECK_EXISTS($XDG_ACTIVATION_DEPENDENCIES, [have_xdg_activation_deps=yes], [have_xdg_activation_deps=no]) - AC_MSG_CHECKING([for XDG_ACTIVATION_DEPENDENCIES]) - AM_CONDITIONAL(USE_XDG_ACTIVATION, test "$have_xdg_activation_deps" = "yes") - if test "$have_xdg_activation_deps" = "yes" ; then - AC_DEFINE([HAVE_XDG_ACTIVATION], [1], - [Define if xdg_activation's wl-protocols definition is available]) - fi - - AM_CONDITIONAL(USE_WAYLAND, true) -else - AM_CONDITIONAL(USE_WAYLAND, false) - AM_CONDITIONAL(USE_XDG_ACTIVATION, false) -fi - -# strip leading space -GDK_BACKENDS=${GDK_BACKENDS#* } - -AC_SUBST(GDK_BACKENDS) - -if test -z "$GDK_BACKENDS"; then - AC_MSG_ERROR([No GDK backends selected.]) -fi - -if test "x$enable_debug" = "xyes"; then - test "$cflags_set" = set || CFLAGS="$CFLAGS -g" - GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ENABLE_CONSISTENCY_CHECKS" -else - if test "x$enable_debug" = "xno"; then - GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" - else - GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS" - fi -fi -GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS $GLIB_VERSION_CFLAGS" - -# Build time sanity check... -AM_SANITY_CHECK - -changequote(,)dnl -if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wall" ;; - esac - - if test "x$enable_ansi" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -ansi" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -pedantic" ;; - esac - fi -fi -changequote([,])dnl - -# Ensure MSVC-compatible struct packing convention is used when -# compiling for Win32 with gcc. -# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while -# gcc2 uses "-fnative-struct". -if test x"$os_win32" = xyes; then - if test x"$GCC" = xyes; then - msnative_struct='' - AC_MSG_CHECKING([how to get MSVC-compatible struct packing]) - if test -z "$ac_cv_prog_CC"; then - our_gcc="$CC" - else - our_gcc="$ac_cv_prog_CC" - fi - case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in - 2.) - if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then - msnative_struct='-fnative-struct' - fi - ;; - *) - if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then - msnative_struct='-mms-bitfields' - fi - ;; - esac - if test x"$msnative_struct" = x ; then - AC_MSG_RESULT([no way]) - AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code]) - else - CFLAGS="$CFLAGS $msnative_struct" - AC_MSG_RESULT([${msnative_struct}]) - fi - fi -fi - -## Initial sanity check, done here so that users get told they -## have the wrong dependencies as early in the process as possible. -## Later on we actually use the cflags/libs from separate pkg-config -## calls. Oh, also the later pkg-config calls don't include -## the version requirements since those make the module lists -## annoying to construct -PKG_CHECK_MODULES(BASE_DEPENDENCIES, - [glib-2.0 >= glib_required_version dnl - atk >= atk_required_version dnl - pango >= pango_required_version dnl - fribidi >= fribidi_required_version dnl - cairo >= cairo_required_version dnl - cairo-gobject >= cairo_required_version dnl - gdk-pixbuf-2.0 >= gdk_pixbuf_required_version]) - -PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends]) - -# Remove this check once cairo_required_version reaches at least 1.16.0 -AS_CASE([$host_os], - [mingw*], - [ - PKG_CHECK_MODULES(CAIRO, [cairo >= cairo_required_version]) - gtk_save_LIBS="$LIBS" - LIBS="$CAIRO_LIBS $LIBS" - AC_CHECK_LIB([cairo], [cairo_win32_surface_create_with_format], - [AC_MSG_RESULT([found])], - [AC_MSG_ERROR( -[cairo_win32_surface_create_with_format is not found in cairo library -You need a cairo snapshot 1.15.x or 1.16.x release or newer])]) - LIBS="$gtk_save_LIBS" - ], - [] -) - - -PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) - -dnl ****************************************************** -dnl * See whether to include shared library dependencies * -dnl ****************************************************** - -AC_ARG_ENABLE(explicit-deps, - [AS_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@], - [use explicit dependencies in .pc files [default=auto]])],, - [enable_explicit_deps=auto]) - -AC_MSG_CHECKING([whether to write dependencies into .pc files]) -case $enable_explicit_deps in - auto) - export SED - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else - enable_explicit_deps=no - fi - ;; - yes|no) - ;; - *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto]) - ;; -esac -AC_MSG_RESULT($enable_explicit_deps) - -AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no) - -# define a MAINT-like variable REBUILD which is set if Perl -# and awk are found, so autogenerated sources can be rebuilt - -AC_PATH_PROGS(PERL, perl5 perl) - -AC_CHECK_FUNCS(lstat mkstemp) -AC_CHECK_FUNCS(localtime_r) - -# _NL_TIME_FIRST_WEEKDAY is an enum and not a define -AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[char c; - c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY));]])], - [gtk_ok=yes], [gtk_ok=no]) -AC_MSG_RESULT($gtk_ok) -if test "$gtk_ok" = "yes"; then - AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1], - [Define if _NL_TIME_FIRST_WEEKDAY is available]) -fi - -# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define -AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[char c; - c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));]])], - [gtk_ok=yes], [gtk_ok=no]) -AC_MSG_RESULT($gtk_ok) -if test "$gtk_ok" = "yes"; then - AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1], - [Define if _NL_MEASUREMENT_MEASUREMENT is available]) -fi - -# _NL_PAPER_HEIGHT is an enum and not a define -AC_MSG_CHECKING([for _NL_PAPER_HEIGHT]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[char c; - c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT));]])], - [gtk_ok=yes], [gtk_ok=no]) -AC_MSG_RESULT($gtk_ok) -if test "$gtk_ok" = "yes"; then - AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1], - [Define if _NL_PAPER_HEIGHT is available]) -fi - -# _NL_PAPER_WIDTH is an enum and not a define -AC_MSG_CHECKING([for _NL_PAPER_WIDTH]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[char c; - c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH));]])], - [gtk_ok=yes], [gtk_ok=no]) -AC_MSG_RESULT($gtk_ok) -if test "$gtk_ok" = "yes"; then - AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1], - [Define if _NL_PAPER_WIDTH is available]) -fi - -LIBS="$LIBS $INTLLIBS" - -dnl The DU4 header files don't provide library prototypes unless -dnl -std1 is given to the native cc. -AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) - -gtk_save_LIBS=$LIBS -LIBS="$LIBS -lm" -AC_RUN_IFELSE([AC_LANG_SOURCE([[#include - int main (void) { return (log(1) != log(1.)); }]])], - [AC_MSG_RESULT(none needed)], - [gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -std1" - AC_RUN_IFELSE([AC_LANG_SOURCE([[#include - int main (void) { return (log(1) != log(1.)); }]])], - [AC_MSG_RESULT(-std1)], - [AC_MSG_RESULT() - CFLAGS="$gtk_save_CFLAGS" - AC_MSG_WARN([No ANSI prototypes found in library. (-std1 did not work.)])], - [true])], - [AC_MSG_RESULT(none needed)]) - -LIBS=$gtk_save_LIBS - -AC_MSG_CHECKING(for the BeOS) -case $host in - *-*-beos*) - AC_MSG_RESULT(yes) - MATH_LIB= - ;; - *) - AC_MSG_RESULT(no) - ;; -esac - -AS_CASE([$host_os], - [mingw*], - [ - AC_CHECK_SIZEOF( - [DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY], - [], - [ -#define _WIN32_WINNT 0x601 -#include - ] - ) - AS_IF( - [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x4], - [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is OK])], - [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x0], - [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])], - [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])] - ) - AC_MSG_CHECKING([for SetupDiGetDevicePropertyW]) - gtk_save_LIBS="$LIBS" - LIBS="-lsetupapi $LIBS" - AC_TRY_LINK( - [ -#define _WIN32_WINNT 0x0600 -#include -#include -#include - ], - [return SetupDiGetDevicePropertyW(NULL, NULL, NULL, NULL, NULL, 0, NULL, 0);], - [have_SetupDiGetDevicePropertyW=yes], - [have_SetupDiGetDevicePropertyW=no] - ) - AS_IF( - [test x$have_SetupDiGetDevicePropertyW = xyes], - [ - AC_DEFINE( - [HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W], - [1], - [Define to 1 if SetupDiGetDevicePropertyW() is available] - ) - ] - ) - AC_MSG_RESULT([$have_SetupDiGetDevicePropertyW]) - LIBS="$gtk_save_LIBS" - ], - [] -) - -AC_SUBST(MATH_LIB) -# -# see bug 162979 -# -AC_MSG_CHECKING(for HP-UX) -case $host_os in - hpux9* | hpux10* | hpux11*) - AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" - ;; - *) - AC_MSG_RESULT(no) - ;; -esac - -# -# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working -# - -AM_PATH_GLIB_2_0(glib_required_version, :, - AC_MSG_ERROR([ -*** GLIB glib_required_version or better is required. The latest version of -*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), - gobject gmodule-no-export) - -PKG_PROG_PKG_CONFIG_FOR_BUILD -GLIB_CFLAGS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --cflags glib-2.0 gobject-2.0 gmodule-no-export-2.0` -GLIB_LIBS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --libs glib-2.0 gobject-2.0 gmodule-no-export-2.0` -AC_SUBST(GLIB_CFLAGS_FOR_BUILD) -AC_SUBST(GLIB_LIBS_FOR_BUILD) - -dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. -dnl -gtk_save_LIBS=$LIBS -LIBS="$LIBS $GLIB_LIBS" -AC_CHECK_FUNCS(bind_textdomain_codeset) -LIBS=$gtk_save_LIBS - -AC_CHECK_HEADERS(linux/memfd.h, - AC_DEFINE(HAVE_LINUX_MEMFD_H, 1, - [Define to 1 if linux/memfd.h is available])) -AC_CHECK_HEADERS(linux/input.h, - AC_DEFINE(HAVE_LINUX_INPUT_H, 1, - [Define to 1 if linux/input.h is available])) -AC_CHECK_HEADERS(dev/evdev/input.h, - AC_DEFINE(HAVE_DEV_EVDEV_INPUT_H, 1, - [Define to 1 if dev/evdev/input.h is available])) -AC_CHECK_HEADERS(sys/mman.h, - AC_DEFINE(HAVE_SYS_MMAN_H, 1, - [Define to 1 if mman.h is available])) -AC_CHECK_HEADERS(sys/time.h, - AC_DEFINE(HAVE_SYS_TIME_H, 1, - [Define to 1 if time.h is available])) -AC_CHECK_HEADERS(unistd.h, - AC_DEFINE(HAVE_UNISTD_H, 1, - [Define to 1 if unistd.h is available])) -AC_CHECK_HEADERS(ftw.h, - AC_DEFINE(HAVE_FTW_H, 1, - [Define to 1 if ftw.h is available])) - -# -# Disable deprecation checks for all libraries we depend on on stable branches. -# This is so newer versions of those libraries don't cause more warnings with -# a stable GTK version. -# We don't ever want to turn off deprecation warnings for master however, because -# that's where we get rid of deprecated API we use. -# -if test m4_eval(gtk_minor_version % 2) = 0 ; then - AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, - [Disable deprecation warnings from glib]) -fi - -dnl -saved_cflags="$CFLAGS" -saved_ldflags="$LDFLAGS" - - -# Checks for library functions. -AC_FUNC_MMAP - -AC_CHECK_FUNCS(mallinfo) -AC_CHECK_FUNCS(getresuid) -AC_TYPE_UID_T - -# Check for round(), rint(), isnan() and isinf() -# Check for log2(), exp2(), nearbyint() and trunc() -AC_CHECK_LIB(m,round,,) -AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc fmin) -AC_CHECK_DECLS([isnan, isinf], [], [], [[#include ]]) - -AC_MSG_CHECKING(whether to build dynamic modules) - -AC_ARG_ENABLE(modules, - [AS_HELP_STRING([--disable-modules], - [disable dynamic module loading])]) - -dynworks=false -build_dynamic_modules=no -deps= -if test x$enable_modules = xno; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - AC_MSG_CHECKING(whether dynamic modules work) - ## for loop is to strip newline - tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` - for I in $tmp; do - dynworks=$I - done - - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then - module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" - module_deplibs_check=`$module_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` - if test "x$module_deplibs_check" = "xnone" || \ - test "x$module_deplibs_check" = "xunknown" || \ - test "x$module_deplibs_check" = "x"; then - dynworks=false - fi - fi - - if $dynworks; then - build_dynamic_modules=yes - AC_DEFINE(USE_GMODULE, 1, - [Define to 1 if gmodule works and should be used]) - AC_MSG_RESULT(yes) - else - build_dynamic_modules=no - AC_MSG_RESULT(no) - fi -fi - -AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks) - -# -# Allow building some or all immodules included -# -AC_MSG_CHECKING(immodules to build) - -AC_ARG_WITH(included_immodules, - [AS_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...], - [build the specified input methods into gtk])]) - -if $dynworks; then - : -else - ## if the option was specified, leave it; otherwise disable included immodules - if test x$with_included_immodules = xno; then - with_included_immodules=yes - fi -fi - -all_immodules="am-et,cedilla,cyrillic-translit,inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr$backend_immodules" - -included_immodules="" -# If the switch specified without listing any specific ones, include all -if test "x$with_included_immodules" = xyes ; then - included_immodules="$all_immodules" -else - included_immodules="$with_included_immodules" -fi - -AC_MSG_RESULT($included_immodules) -AM_CONDITIONAL(HAVE_INCLUDED_IMMMODULES, test "x$included_immodules" != x) - -INCLUDED_IMMODULE_OBJ= -INCLUDED_IMMODULE_DEFINE= - -IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," -for immodule in $included_immodules; do - immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` - if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then - : - else - AC_MSG_ERROR([the specified input method $immodule does not exist]) - fi - - INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" - INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" - eval INCLUDE_$immodule_underscores=yes -done -IFS="$gtk_save_ifs" -AC_SUBST(INCLUDED_IMMODULE_OBJ) -AC_SUBST(INCLUDED_IMMODULE_DEFINE) - -AM_CONDITIONAL(INCLUDE_IM_AM_ET, [test x"$INCLUDE_am_et" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_CEDILLA, [test x"$INCLUDE_cedilla" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_CYRILLIC_TRANSLIT, [test x"$INCLUDE_cyrillic_translit" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_QUARTZ, [test x"$INCLUDE_quartz" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_BROADWAY, [test x"$INCLUDE_broadway" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes]) -AM_CONDITIONAL(INCLUDE_IM_WAYLAND, [test x"$INCLUDE_wayland" = xyes]) - -# Checks to see whether we should include mediaLib -# support. -# -AC_CHECK_HEADER(sys/systeminfo.h, - AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1, - [Define to 1 if sys/systeminfo.h is available])) -AC_CHECK_HEADER(sys/sysinfo.h, - AC_DEFINE(HAVE_SYS_SYSINFO_H, 1, - [Define to 1 if sys/sysinfo.h is available])) - -dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling - -AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) - -######################################## -# Windowing system checks -######################################## - -# GTK+ uses some X calls, so needs to link against X directly -GTK_DEP_PACKAGES_FOR_X= -GTK_DEP_LIBS_FOR_X= -X_EXTENSIONS= - -if test "x$enable_x11_backend" = xyes; then - X_PACKAGES=fontconfig - - # - # We use fontconfig very peripherally when decoding the default - # settings. - # - if $PKG_CONFIG --exists fontconfig; then : ; else - AC_MSG_ERROR([ -*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.]) - fi - - # - # Check for basic X packages; we use pkg-config if available - # - if $PKG_CONFIG --exists x11 xext; then - have_base_x_pc=true - X_PACKAGES="$X_PACKAGES x11 xext" - x_libs="`$PKG_CONFIG --libs x11 xext`" - X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`" - - # Strip out any .la files that pkg-config might give us (this happens - # with -uninstalled.pc files) - x_libs_for_checks= - for I in $x_libs ; do - case $I in - *.la) ;; - *) x_libs_for_checks="$x_libs_for_checks $I" ;; - esac - done - - GTK_PACKAGES_FOR_X="x11" - else - have_base_x_pc=false - AC_PATH_XTRA - if test x$no_x = xyes ; then - AC_MSG_ERROR([X development libraries not found]) - fi - - x_cflags="$X_CFLAGS" - x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS" - - GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS" - fi - - # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. - x_extra_libs= - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - gtk_save_LIBS=$LIBS - LIBS="$x_libs_for_checks $LIBS" - - # Sanity check for the X11 and Xext libraries. While everything we need from - # Xext is optional, the chances a system has *none* of these things is so - # small that we just unconditionally require it. - AC_CHECK_FUNC(XOpenDisplay, :, - AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.])) - AC_CHECK_FUNC(XextFindDisplay, :, - AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.])) - - # Check for XKB support. - - if test "x$enable_xkb" = "xyes"; then - AC_CHECK_FUNC(XkbQueryExtension, - X_EXTENSIONS="$X_EXTENSIONS XKB" - AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]), - AC_MSG_ERROR([*** XKB extension not found. Check 'config.log' for more details.])) - elif test "x$enable_xkb" = "xmaybe"; then - AC_CHECK_FUNC(XkbQueryExtension, - X_EXTENSIONS="$X_EXTENSIONS XKB" - AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])) - else - AC_MSG_WARN(XKB support explicitly disabled) - fi - - # Check for shaped window extension - - AC_CHECK_FUNC(XShapeCombineMask, :, - [AC_MSG_ERROR([Shape extension not found, check your development headers])]) - - # X SYNC check - gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $x_cflags" - - AC_CHECK_FUNC(XSyncQueryExtension, - [AC_CHECK_HEADER(X11/extensions/sync.h, - AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]), - :, [#include ])]) - - CFLAGS="$gtk_save_CFLAGS" - - if test "x$enable_xinerama" != "xno"; then - # Check for Xinerama extension (Solaris impl or Xfree impl) - have_xfree_xinerama=false - have_solaris_xinerama=false - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $x_cflags" - - # Check for XFree - AC_MSG_CHECKING(for Xinerama packages) - - if $PKG_CONFIG --exists xinerama ; then - AC_MSG_RESULT(yes) - have_xfree_xinerama=true - X_PACKAGES="$X_PACKAGES xinerama" - else - AC_MSG_RESULT(no) - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, - [AC_CHECK_HEADER(X11/extensions/Xinerama.h, - [GTK_ADD_LIB(x_extra_libs,Xinerama) - have_xfree_xinerama=true], :, - [#include ])]) - fi - - if $have_xfree_xinerama ; then - X_EXTENSIONS="$X_EXTENSIONS Xinerama" - AC_DEFINE(HAVE_XFREE_XINERAMA, 1, - [Define to 1 if XFree Xinerama is available]) - AC_DEFINE(HAVE_XINERAMA, 1, - [Define to 1 is Xinerama is available]) - else - case "$host" in - *-*-solaris*) - # Check for solaris - - have_solaris_xinerama=false - AC_CHECK_FUNC(XineramaGetInfo, - [AC_CHECK_HEADER(X11/extensions/xinerama.h, - [have_solaris_xinerama=true], :, - [#include ])]) - - AC_MSG_CHECKING(for Xinerama support on Solaris) - - if $have_solaris_xinerama ; then - X_EXTENSIONS="$X_EXTENSIONS Xinerama" - AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1, - [Define to 1 if solaris xinerama is available]) - AC_DEFINE(HAVE_XINERAMA, 1, - [Define to 1 if xinerama is available]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - ;; - *) - ;; - esac - fi - fi - if test "x$enable_xinerama" = "xyes" ; then - if test "x$have_xfree_xinerama" != "xtrue" -a "x$have_solaris_xinerama" != "xtrue" ; then - AC_MSG_ERROR([*** Xinerama extension not found. Check 'config.log' for more details.]) - fi - fi - - # Check for XGetEventData for GenericEvents - AC_CHECK_FUNC(XGetEventData, - AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent])) - - # set up things for XInput - if $PKG_CONFIG --exists "xi" ; then - - X_PACKAGES="$X_PACKAGES xi" - GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi" - - AC_CHECK_HEADER(X11/extensions/XInput2.h, - have_xinput2=yes - AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available])) - - gtk_save_LIBS="$LIBS" - LIBS="$LIBS -lXi" - - # Note that we also check that the XIScrollClassInfo struct is defined, - # because at least Ubuntu Oneiric seems to have XIAllowTouchEvents(), but not the XIScrollClassInfo struct. - AC_CHECK_FUNC([XIAllowTouchEvents], - [AC_CHECK_MEMBER([XIScrollClassInfo.number], - have_xinput2_2=yes - AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]), - have_xinput2_2=no, - [[#include ]])]) - - if test "x$have_xinput2_2" = "xyes"; then - X_EXTENSIONS="$X_EXTENSIONS XI2.2" - else - X_EXTENSIONS="$X_EXTENSIONS XI2" - fi - - AC_CHECK_MEMBER([XIGesturePinchEvent.type], - have_xinput2_4=yes - AC_DEFINE(XINPUT_2_4, 1, [Define to 1 if XInput 2.4 is available]), - have_xinput2_4=no, - [[#include ]]) - - if test "x$have_xinput2_4" = "xyes"; then - X_EXTENSIONS="$X_EXTENSIONS XI2.4" - fi - LIBS="$gtk_save_LIBS" - fi - - AS_IF([test "x$have_xinput2" != "xyes"], - [AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])]) - - # Check for the RANDR extension - if test x"$enable_xrandr" != xno; then - if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then - AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) - - if $PKG_CONFIG --exists "xrandr >= 1.5.0" ; then - AC_DEFINE(HAVE_RANDR15, 1, [Have the Xrandr 1.5 extension library]) - fi - X_PACKAGES="$X_PACKAGES xrandr" - X_EXTENSIONS="$X_EXTENSIONS XRANDR" - elif test x"$enable_xrandr" = xyes; then - AC_MSG_ERROR([RANDR support requested but xrandr not found]) - fi - fi - - # Checks for Xcursor library - - if $PKG_CONFIG --exists xcursor ; then - AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library]) - - X_PACKAGES="$X_PACKAGES xcursor" - fi - - # Checks for XFixes extension - - if test x"$enable_xfixes" != xno; then - if $PKG_CONFIG --exists xfixes ; then - AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) - - X_PACKAGES="$X_PACKAGES xfixes" - X_EXTENSIONS="$X_EXTENSIONS XFIXES" - GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" - elif test x"$enable_xfixes" = xyes; then - AC_MSG_ERROR([XFixes support requested but xfixes not found]) - fi - fi - - # Checks for Xcomposite extension - - if test x"$enable_xcomposite" != xno; then - if $PKG_CONFIG --exists xcomposite ; then - AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension]) - - X_PACKAGES="$X_PACKAGES xcomposite" - X_EXTENSIONS="$X_EXTENSIONS Composite" - GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" - elif test x"$enable_xcomposite" = xyes; then - AC_MSG_ERROR([Xcomposite support requested but xcomposite not found]) - fi - fi - - # Checks for Xdamage extension - - if test x"$enable_xdamage" != xno; then - if $PKG_CONFIG --exists xdamage ; then - AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension]) - - X_PACKAGES="$X_PACKAGES xdamage" - X_EXTENSIONS="$X_EXTENSIONS DAMAGE" - GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" - elif test x"$enable_xdamage" = xyes; then - AC_MSG_ERROR([Xdamage support requested but xdamage not found]) - fi - fi - - if $have_base_x_pc ; then - GDK_EXTRA_LIBS="$x_extra_libs" - else - GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" - fi - - CPPFLAGS="$gtk_save_cppflags" - LIBS="$gtk_save_libs" - - AM_CONDITIONAL(USE_X11, true) - - # strip leading space - X_EXTENSIONS=${X_EXTENSIONS#* } - -else - XPACKAGES= - - AM_CONDITIONAL(USE_X11, false) -fi - -# Check for gio-unix -if test "$os_win32" != "yes"; then - # Pull in gio-unix for gtk-launch usage, see at least - # gtk-launch.c - have_gio_unix=yes -fi -if test "$have_gio_unix" = "yes"; then - GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version" - AC_DEFINE([HAVE_GIO_UNIX], [1], - [Define if gio-unix is available]) -else - GDK_GIO_PACKAGE="gio-2.0 >= glib_required_version" -fi - -# Check for Pango flags - -AC_MSG_CHECKING(Pango flags) -if $PKG_CONFIG --exists $PANGO_PACKAGES ; then - PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` - PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` - - AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS) -else - AC_MSG_ERROR([ -*** Pango not found. Pango built with Cairo support is required -*** to build GTK+. See http://www.pango.org for Pango information. -]) -fi - -CFLAGS="$CFLAGS $PANGO_CFLAGS" - -if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then - : -else - gtk_save_LIBS="$LIBS" - LIBS="$PANGO_LIBS $LIBS" - AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([ -*** Can't link to Pango. Pango is required to build -*** GTK+. For more information see http://www.pango.org])) - LIBS="$gtk_save_LIBS" -fi - -# Check for libcloudproviders - -CLOUDPROVIDER_PACKAGES="" -if test "x$cloudproviders_set" = "xyes"; then - CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version" - if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then - AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], - [Define if libcloudproviders is available] - ) - else - AC_MSG_ERROR([ -*** libcloudproviders not found.]) - fi -fi - -# Check for profiler support - -PROFILER_PACKAGES="" -if test "x$enable_profiler" = "xyes"; then - PROFILER_PACKAGES="sysprof-capture-3 >= sysprof_required_version" - if $PKG_CONFIG --exists $PROFILER_PACKAGES; then - AC_DEFINE(HAVE_SYSPROF_CAPTURE, [1], - [Define if sysprof-capture-3 is available] - ) - else - AC_MSG_ERROR([ -*** sysprof-capture-3 not found.]) - fi -fi - -CFLAGS="$saved_cflags" -LDFLAGS="$saved_ldflags" - -GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" -GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version" - -PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) -GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" -GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS $GDK_EXTRA_CFLAGS" -# -# If we aren't writing explicit dependencies, then don't put the extra libraries we need -# into the pkg-config files -# -if test $enable_explicit_deps != yes ; then - GDK_EXTRA_LIBS= -fi - -AC_SUBST(GDK_PACKAGES) -AC_SUBST(GDK_PRIVATE_PACKAGES) -AC_SUBST(GDK_EXTRA_LIBS) -AC_SUBST(GDK_EXTRA_CFLAGS) -AC_SUBST(GDK_DEP_LIBS) -AC_SUBST(GDK_DEP_CFLAGS) - - -######################################## -# Check for Accessibility Toolkit flags -######################################## - -if test x$enable_x11_backend = xyes; then - ATK_PACKAGES="atk atk-bridge-2.0" -else - ATK_PACKAGES="atk" -fi - -PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - -GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" -GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version" -if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then - GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" -fi -if test "$have_gio_unix" = "yes"; then - GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= glib_required_version" -fi -GTK_EXTRA_LIBS= - -GTK_EXTRA_CFLAGS= -PKG_CHECK_MODULES(GTK_DEP, $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES) -GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X $GTK_DEP_LIBS $GTK_EXTRA_LIBS $MATH_LIB" -GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" - -if test x"$os_win32" = xyes; then - GTK_EXTRA_CFLAGS="$msnative_struct" -fi - -################################################## -# Check for harfbuzz and pangoft2 -################################################## -PKG_CHECK_MODULES(GTK_FONT_CHOOSER_WIDGET, - harfbuzz >= 2.2.0 pango >= 1.44.0, - build_font_demo=yes, - build_font_demo=no) - -PKG_CHECK_MODULES(GTK_FONT_CHOOSER_WIDGET_FT, - harfbuzz >= 0.9 pangoft2, - build_font_demo_ft=yes, - build_font_demo_ft=no) - -if test "x$build_font_demo" = xno; then - if test "x$build_font_demo_ft" = xyes; then - build_font_demo=yes - else - build_font_demo=no - fi -fi - -AM_CONDITIONAL(BUILD_FONT_DEMO, [ test "x$build_font_demo" = xyes ]) -if test "x$build_font_demo" = xyes; then - AC_DEFINE([HAVE_HARFBUZZ], 1, [defines whether we have HarfBuzz]) - if test "x$build_font_demo_ft" = xyes; then - AC_DEFINE([HAVE_PANGOFT], 1, [defines whether we have pangoft2]) - GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GTK_FONT_CHOOSER_WIDGET_FT_CFLAGS" - GTK_DEP_LIBS="$GTK_DEP_LIBS $GTK_FONT_CHOOSER_WIDGET_FT_LIBS" - else - GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GTK_FONT_CHOOSER_WIDGET_CFLAGS" - GTK_DEP_LIBS="$GTK_DEP_LIBS $GTK_FONT_CHOOSER_WIDGET_LIBS" - fi -fi - -if $PKG_CONFIG --exists x11; then - X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" -elif test x"$prefix" != xNONE; then - X11_PREFIX="$prefix" -else - X11_PREFIX="$ac_default_prefix" -fi - -AC_ARG_ENABLE(win32-gles, - [AS_HELP_STRING([--enable-win32-gles], - [enable OpenGL ES rendering in Win32 backend, disabled by default])], - [win32_gles=yes], - [win32_gles=no]) - -if test x"$enable_win32_backend" = xyes; then - AC_MSG_CHECKING(WGL support in epoxy) - WGL_SUPPORT="`$PKG_CONFIG --variable=epoxy_has_wgl epoxy`" - if test x"$WGL_SUPPORT" = x1; then - AC_MSG_RESULT([supported]) - else - AC_MSG_ERROR([ -*** epoxy was not built with WGL support or epoxy version is too old. -*** WGL support in epoxy is enabled by default for all Windows builds, -*** and is used by GTK+ uncondititonally. If it is not there, then -*** something is very wrong. -]) - fi - if test x"$win32_gles" = xyes; then - AC_MSG_CHECKING(EGL support in epoxy) - EGL_SUPPORT="`$PKG_CONFIG --variable=epoxy_has_egl epoxy`" - if test x"$EGL_SUPPORT" = x1; then - AC_MSG_RESULT([supported]) - else - AC_MSG_ERROR([ -*** epoxy was not built with EGL support or epoxy version is too old. -*** EGL support in epoxy is disabled by default in Windows builds, -*** you might need to rebuild epoxy with explicit --enable-egl=yes. -*** EGL support is needed for OpenGL ES rendering. -]) - fi - fi -fi - -AM_CONDITIONAL(WIN32_GLES, test x"$platform_win32" = xyes -a x"$win32_gles" = xyes) - -GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" -ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" -PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" -CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`" -ISO_CODES_PREFIX="`$PKG_CONFIG --variable=prefix iso-codes`" - -AC_SUBST(GTK_PACKAGES) -AC_SUBST(GTK_PRIVATE_PACKAGES) -AC_SUBST(GTK_EXTRA_LIBS) -AC_SUBST(GTK_EXTRA_CFLAGS) -AC_SUBST(GTK_DEP_LIBS) -AC_SUBST(GTK_DEP_CFLAGS) - -AC_SUBST(X11_PREFIX) -AC_SUBST(GLIB_PREFIX) -AC_SUBST(ATK_PREFIX) -AC_SUBST(PANGO_PREFIX) -AC_SUBST(CAIRO_PREFIX) -AC_SUBST(ISO_CODES_PREFIX) - -AC_SUBST(GTK_DEBUG_FLAGS) -AC_SUBST(GTK_XIM_FLAGS) - -GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0` -AC_SUBST(GDK_PIXBUF_LIBS) - -################################################################ -# Printing system checks -################################################################ - -PRINT_BACKENDS="file lpr" - -AC_ARG_ENABLE(cups, - [AS_HELP_STRING([--disable-cups], - [disable cups print backend])],, - [enable_cups=auto]) - -if test "x$enable_cups" = "xno"; then - AM_CONDITIONAL(HAVE_CUPS, false) -else - AC_PATH_TOOL(CUPS_CONFIG, cups-config, no) - if test "x$CUPS_CONFIG" = "xno"; then - if test "x$enable_cups" = "xauto"; then - AM_CONDITIONAL(HAVE_CUPS, false) - else - AC_MSG_ERROR([ -*** cups not found. -]) - fi - else - CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` - CUPS_LIBS=`$CUPS_CONFIG --libs` - - CUPS_API_VERSION=`$CUPS_CONFIG --version` - CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` - CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` - - if test $CUPS_API_MAJOR -lt 1 -o \ - $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 7; then - AC_MSG_ERROR([CUPS >= 1.7 not found]) - fi - - AC_SUBST(CUPS_API_MAJOR) - AC_SUBST(CUPS_API_MINOR) - AC_SUBST(CUPS_CFLAGS) - AC_SUBST(CUPS_LIBS) - - AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]])) - - PRINT_BACKENDS="$PRINT_BACKENDS cups" - AM_CONDITIONAL(HAVE_CUPS, true) - have_cups=yes - fi -fi - -# Checks to see if we should compile with PAPI backend for GTK+ -# - -AC_ARG_ENABLE(papi, - [AS_HELP_STRING([--disable-papi], - [disable papi print backend])],, - [enable_papi=auto]) - -if test "x$enable_papi" = "xno"; then - AM_CONDITIONAL(HAVE_PAPI, false) -else - AC_MSG_CHECKING(libpapi) - AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no) - if test $have_papi = yes; then - PRINT_BACKENDS="$PRINT_BACKENDS papi" - AC_DEFINE([HAVE_PAPI], [], [Define to 1 if libpapi available]) - fi - AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes) - if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then - AC_MSG_ERROR([ -*** papi not found. -]) - fi -fi - -# Checks to see if we should compile with tracker3 search engine -# - -AC_ARG_ENABLE(tracker3, - [AS_HELP_STRING([--enable-tracker3], - [enable tracker3 search engine])], - [enable_tracker3=yes], - [enable_tracker3=no]) - -if test "x$enable_tracker3" = "xyes"; then - PKG_CHECK_MODULES(TRACKER3, [tracker-sparql-3.0], have_tracker3=yes, have_tracker3=no) - GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $TRACKER3_CFLAGS" - GTK_DEP_LIBS="$GTK_DEP_LIBS $TRACKER3_LIBS" - if test "x$have_tracker3" = "xyes"; then - AC_DEFINE([HAVE_TRACKER3], [], [Define if tracker3 is available]) - else - AC_MSG_ERROR([ -*** tracker3 not found. -]) - fi -fi - -AM_CONDITIONAL(HAVE_TRACKER3, test "x$have_tracker3" = "xyes") - -gtk_save_cppflags="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" - -AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ -*** Can't find cairo-pdf.h. You must build Cairo with the pdf -*** backend enabled.])) - -if test "$os_win32" != "yes"; then - AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([ -*** Can't find cairo-ps.h. You must build Cairo with the -*** postscript backend enabled.])) - - AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([ -*** Cannot find cairo-svg.h. You must build Cairo with the -*** svg backend enabled.])) -fi - -CPPFLAGS="$gtk_save_cppflags" - -AC_ARG_ENABLE(test-print-backend, - [AS_HELP_STRING([--enable-test-print-backend], - [build test print backend])],, - [enable_test_print_backend=no]) -if test "x$enable_test_print_backend" != "xno" ; then - PRINT_BACKENDS="$PRINT_BACKENDS test" -fi -AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno") - -if test "$os_win32" = "yes"; then - AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include ]]) -fi - -GTK_PRINT_BACKENDS="file" -if test "$have_papi" = "yes"; then - GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,papi" -fi -if test "$have_cups" = "yes"; then - GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups" -fi -if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then - GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr" -fi -AC_SUBST(GTK_PRINT_BACKENDS) - -################################################################ -# Strip -export-dynamic from the link lines of various libraries -################################################################ - -# -# pkg-config --libs gmodule includes the "export_dynamic" flag, -# but this flag is only meaningful for executables. For libraries -# the effect is undefined; what it causes on Linux is that the -# export list from -export-symbols-regex is ignored and everything -# is exported -# -# We are using gmodule-no-export now, but I'm leaving the stripping -# code in place for now, since pango and atk still require gmodule. -export SED -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -if test -n "$export_dynamic"; then - GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` - GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` -fi - -############# -# GSettings # -############# - -GLIB_GSETTINGS - -################################################## -# GObject introspection -################################################## - -GOBJECT_INTROSPECTION_CHECK(introspection_required_version) - -################################################## -# colord module -################################################# - -AC_ARG_ENABLE(colord, - [AS_HELP_STRING([--enable-colord=@<:@yes/no/auto@:>@], - [build colord support code [default=auto]])], - [enable_colord="$enableval"], - [enable_colord=auto]) - -AC_MSG_CHECKING([whether to use colord]) -if test "$enable_colord" = "auto"; then - if test "$os_win32" = "yes"; then - enable_colord=no - fi -fi -if test "$enable_colord" != "no"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -have_colord=no -if test "$enable_colord" != "no"; then - if test "$os_win32" != "yes"; then - PKG_CHECK_MODULES(COLORD, colord >= 0.1.9, - have_colord=yes, have_colord=no) - if test "$enable_colord" = "yes"; then - if test "$have_colord" = "no"; then - AC_MSG_ERROR([--enable-colord specified, but not available]) - fi - fi - else - AC_MSG_ERROR([colord support is not available on win32]) - fi -fi - -if test "$have_colord" = "yes"; then - AC_DEFINE(HAVE_COLORD, 1, [define if we have colord]) -fi -AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes") - -################################################## -# Checks for gtk-doc and docbook-tools -################################################## - -GTK_DOC_CHECK([1.20],[--flavour no-tmpl]) - -AC_ARG_ENABLE(man, - [AS_HELP_STRING([--enable-man], - [generate man pages [default=auto]])],, - enable_man=maybe) - -if test "$enable_man" != no; then - AC_PATH_PROG([XSLTPROC], [xsltproc]) - if test -z "$XSLTPROC"; then - if test "$enable_man" = yes ; then - AC_MSG_ERROR([xsltproc is required for --enable-man]) - fi - enable_man=no - fi -fi - -if test "$enable_man" != no; then - dnl check for DocBook DTD in the local catalog - JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], - [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no]) - if test "$have_docbook_dtd" != yes; then - if test "$enable_man" = yes ; then - AC_MSG_ERROR([DocBook DTD is required for --enable-man]) - fi - enable_man=no - fi -fi - -if test "$enable_man" != no; then - dnl check for DocBook XSL stylesheets in the local catalog - JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], - [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no]) - if test "$have_docbook_style" != yes; then - if test "$enable_man" = yes ; then - AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man]) - fi - enable_man=no - fi -fi - -AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no) - -AC_MSG_CHECKING([whether to generate man pages]) -if test "$enable_man" != no; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -AC_ARG_ENABLE(doc-cross-references, - AC_HELP_STRING([--disable-doc-cross-references], - [cross reference symbols from other libraries @<:@default=yes@:>@]), - enable_doc_cross_references=$enableval, - enable_doc_cross_references=yes) - -AM_CONDITIONAL(ENABLE_DOC_CROSS_REFERENCES, test x$enable_doc_cross_references != xno) - - - -################################################## -# Visibility handling -################################################## - -GDK_HIDDEN_VISIBILITY_CFLAGS="" -case "$host" in - *-*-mingw*) - dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport) - AC_DEFINE([_GDK_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern], - [defines how to decorate public symbols while building]) - CFLAGS="${CFLAGS} -fvisibility=hidden" - ;; - *) - dnl on other compilers, check if we can do -fvisibility=hidden - SAVED_CFLAGS="${CFLAGS}" - CFLAGS="-fvisibility=hidden" - AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) - AC_TRY_COMPILE([], [return 0], - AC_MSG_RESULT(yes) - enable_fvisibility_hidden=yes, - AC_MSG_RESULT(no) - enable_fvisibility_hidden=no) - CFLAGS="${SAVED_CFLAGS}" - - AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [ - AC_DEFINE([_GDK_EXTERN], [__attribute__((visibility("default"))) extern], - [defines how to decorate public symbols while building]) - GDK_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" - ]) - ;; -esac -AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS) - -################################################## -# Theming -################################################## - -AC_PATH_PROG([SASSC], [sassc]) -AC_ARG_VAR(SASSC) -AM_CONDITIONAL([REBUILD_SCSS], [test "x$SASSC" != x]) - -################################################## -# Output commands -################################################## - -AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [ - outfile=gdkconfig.h-tmp - cat > $outfile <<\_______EOF -/* gdkconfig.h - * - * This is a generated file. Please modify `configure.ac' - */ - -#ifndef __GDKCONFIG_H__ -#define __GDKCONFIG_H__ - -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -_______EOF - - cat >>$outfile <<_______EOF -$gdk_windowing -_______EOF - - cat >>$outfile <<_______EOF - -G_END_DECLS - -#endif /* __GDKCONFIG_H__ */ -_______EOF - - - if cmp -s $outfile gdk/gdkconfig.h; then - AC_MSG_NOTICE([gdk/gdkconfig.h is unchanged]) - rm -f $outfile - else - mv $outfile gdk/gdkconfig.h - fi -],[ -gdk_windowing='$GDK_WINDOWING' -]) - -dnl -dnl Check for -Bsymbolic-functions linker flag used to avoid -dnl intra-library PLT jumps, if available. -dnl -AC_ARG_ENABLE(Bsymbolic, - [AS_HELP_STRING([--disable-Bsymbolic], - [avoid linking with -Bsymbolic])],, - [SAVED_LDFLAGS="${LDFLAGS}" - AC_MSG_CHECKING([for -Bsymbolic-functions linker flag]) - LDFLAGS=-Wl,-Bsymbolic-functions - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0]])], - [AC_MSG_RESULT(yes) - enable_Bsymbolic=yes], - [AC_MSG_RESULT(no) - enable_Bsymbolic=no]) - LDFLAGS="${SAVED_LDFLAGS}"]) - -if test "x${enable_Bsymbolic}" = "xyes" ; then - GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions -fi -AC_SUBST(GTK_LINK_FLAGS) - -dnl -dnl Check whether MSVC toolset is explicitly set -dnl - -AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) -AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) - -AC_CONFIG_FILES([ -README -INSTALL -config.h.win32 -gtk-zip.sh -Makefile -gdk-3.0.pc -gtk+-3.0.pc -gtk+-unix-print-3.0.pc -gail-3.0.pc -m4macros/Makefile -po/Makefile.in -po-properties/Makefile.in -demos/Makefile -demos/gtk-demo/Makefile -demos/gtk-demo/geninclude.pl -demos/widget-factory/Makefile -demos/icon-browser/Makefile -examples/Makefile -examples/bp/Makefile -examples/application1/Makefile -examples/application2/Makefile -examples/application3/Makefile -examples/application4/Makefile -examples/application5/Makefile -examples/application6/Makefile -examples/application7/Makefile -examples/application8/Makefile -examples/application9/Makefile -examples/application10/Makefile -tests/Makefile -tests/visuals/Makefile -testsuite/Makefile -testsuite/a11y/Makefile -testsuite/a11y/state/Makefile -testsuite/css/Makefile -testsuite/css/parser/Makefile -testsuite/css/nodes/Makefile -testsuite/css/style/Makefile -testsuite/gdk/Makefile -testsuite/gtk/Makefile -testsuite/reftests/Makefile -testsuite/tools/Makefile -docs/Makefile -docs/reference/Makefile -docs/reference/gdk/Makefile -docs/reference/gdk/version.xml -docs/reference/gtk/Makefile -docs/reference/gtk/gtk3.types -docs/reference/gtk/version.xml -docs/reference/gtk/getting_started.xml -docs/reference/libgail-util/Makefile -docs/reference/libgail-util/version.xml -docs/tools/Makefile -win32/Makefile -win32/config-msvc.mak -win32/vs9/Makefile -win32/vs9/gtk3-version-paths.vsprops -win32/vs10/Makefile -win32/vs11/Makefile -win32/vs12/Makefile -win32/vs14/Makefile -win32/vs15/Makefile -win32/vs16/Makefile -win32/vs17/Makefile -win32/vs1x-props/Makefile -win32/vs1x-props/gtk3-version-paths.props -gdk/Makefile -gdk/broadway/Makefile -gdk/x11/Makefile -gdk/win32/Makefile -gdk/win32/rc/Makefile -gdk/win32/rc/gdk.rc -gdk/quartz/Makefile -gdk/wayland/Makefile -gdk/gdkversionmacros.h -gtk/Makefile -gtk/makefile.msc -gtk/gtkversion.h -gtk/gtk-win32.rc.body -gtk/libgtk3.manifest -libgail-util/Makefile -modules/Makefile -modules/input/Makefile -modules/printbackends/Makefile -modules/printbackends/cups/Makefile -modules/printbackends/lpr/Makefile -modules/printbackends/file/Makefile -modules/printbackends/papi/Makefile -modules/printbackends/test/Makefile -]) - -AC_OUTPUT - -# beautify the immodule list a bit -included_immodules=$(echo "${included_immodules}" | $SED 's/,/ /g') -if test -z "${included_immodules}"; then included_immodules="none"; fi - -echo "" -echo " GTK+ $GTK_VERSION" -echo " ===========" -echo "" -echo " GDK backends: $GDK_BACKENDS" -if test "$enable_x11_backend" = "yes"; then -echo " X11 extensions: $X_EXTENSIONS" -fi -echo " Print backends: $PRINT_BACKENDS" -echo " Dynamic modules: $build_dynamic_modules" -echo " Included immodules: $included_immodules" -echo " colord support: $have_colord" -echo " Introspection: $found_introspection" -echo " Debugging: $enable_debug" -echo " Documentation: $enable_gtk_doc" -echo " Profiler: $enable_profiler" diff --git a/demos/Makefile.am b/demos/Makefile.am deleted file mode 100644 index 024fcb3a75..0000000000 --- a/demos/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## Makefile.am for gtk+/demos -include $(top_srcdir)/Makefile.decl - -SUBDIRS = gtk-demo widget-factory icon-browser - -EXTRA_DIST += \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/demos/gtk-demo/.gitignore b/demos/gtk-demo/.gitignore deleted file mode 100644 index c1a0550f3f..0000000000 --- a/demos/gtk-demo/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -demos.h.win32 -demos.h diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am deleted file mode 100644 index 6862a4bf88..0000000000 --- a/demos/gtk-demo/Makefile.am +++ /dev/null @@ -1,130 +0,0 @@ -## Makefile.am for gtk+/demos -include $(top_srcdir)/Makefile.decl -include $(srcdir)/demos-sources.mak - -demos_opt = - -if BUILD_FONT_DEMO -demos_opt += $(font_features_demo) -endif - -if OS_UNIX -demos_opt += $(page_setup_demo) -endif - -demos = $(demos_base) $(demos_opt) - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -DEPS = \ - $(top_builddir)/gtk/libgtk-3.la - -LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) \ - $(GDK_DEP_LIBS) \ - -lm - -bin_PROGRAMS = gtk3-demo gtk3-demo-application - -desktopdir = $(datadir)/applications -dist_desktop_DATA = gtk3-demo.desktop - -BUILT_SOURCES = demos.h demo_resources.c - -EXTRA_DIST += \ - data/source.svg \ - data/symbolic-source.svg \ - demo.gresource.xml \ - $(resource_files) \ - makefile.msc.in \ - org.gtk.Demo.gschema.xml \ - demos.h.win32 \ - meson.build \ - geninclude.py - -gsettings_SCHEMAS = \ - org.gtk.Demo.gschema.xml - -@GSETTINGS_RULES@ - -demos.h: $(demos) geninclude.pl - $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h - -demos.h.win32: $(demos_base) geninclude.pl - $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32 - -nodist_gtk3_demo_SOURCES = demos.h demo_resources.c - -gtk3_demo_SOURCES = \ - $(demos) \ - gtkfishbowl.c \ - gtkfishbowl.h \ - main.c - -gtk3_demo_DEPENDENCIES = $(DEPS) -gtk3_demo_LDADD = $(LDADDS) -gtk3_demo_LDFLAGS = -export-dynamic - -nodist_gtk3_demo_application_SOURCES = demo_resources.c - -gtk3_demo_application_SOURCES = application.c - -gtk3_demo_application_LDADD = $(LDADDS) - -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/demo.gresource.xml) - -demo_resources.c: demo.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml - -iconthemedir = $(datadir)/icons/hicolor - -appsicon16dir = $(iconthemedir)/16x16/apps -appsicon22dir = $(iconthemedir)/22x22/apps -appsicon24dir = $(iconthemedir)/24x24/apps -appsicon32dir = $(iconthemedir)/32x32/apps -appsicon48dir = $(iconthemedir)/48x48/apps -appsicon256dir = $(iconthemedir)/256x256/apps -appsiconscalabledir = $(iconthemedir)/scalable/apps - -dist_appsicon16_DATA = data/16x16/gtk3-demo.png data/16x16/gtk3-demo-symbolic.symbolic.png -dist_appsicon22_DATA = data/22x22/gtk3-demo.png data/22x22/gtk3-demo-symbolic.symbolic.png -dist_appsicon24_DATA = data/24x24/gtk3-demo.png data/24x24/gtk3-demo-symbolic.symbolic.png -dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.symbolic.png -dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png -dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png - -update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force - -install-data-hook: install-update-icon-cache -uninstall-hook: uninstall-update-icon-cache - -install-update-icon-cache: - $(AM_V_at)$(POST_INSTALL) - test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" - -uninstall-update-icon-cache: - $(AM_V_at)$(POST_UNINSTALL) - test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" - -# ------------------- MSVC Build Items ---------------- -MSVCPROJS = gtk3-demo - -gtk3_demo_FILES = $(gtk3_demo_SOURCES) -gtk3_demo_EXCLUDES = font_features.c|pagesetup.c - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: \ - $(top_builddir)/win32/vs9/gtk3-demo.vcproj - -DISTCLEANFILES = demos.h demos.h.win32 demo_resources.c - --include $(top_srcdir)/git.mk diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am deleted file mode 100644 index a969d72954..0000000000 --- a/demos/icon-browser/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -bin_PROGRAMS = gtk3-icon-browser - -desktopdir = $(datadir)/applications -dist_desktop_DATA = gtk3-icon-browser.desktop - -nodist_gtk3_icon_browser_SOURCES = resources.c - -gtk3_icon_browser_SOURCES = \ - main.c \ - iconbrowserapp.c iconbrowserapp.h \ - iconbrowserwin.c iconbrowserwin.h \ - iconstore.c iconstore.h - -BUILT_SOURCES = \ - resources.c - -DISTCLEANFILES = resources.c - -resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -EXTRA_DIST = \ - menus.ui \ - iconbrowser.gresource.xml \ - window.ui \ - icon.list \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am deleted file mode 100644 index 5faacb00fd..0000000000 --- a/demos/widget-factory/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -bin_PROGRAMS = gtk3-widget-factory - -desktopdir = $(datadir)/applications -dist_desktop_DATA = gtk3-widget-factory.desktop - -nodist_gtk3_widget_factory_SOURCES = widget_factory_resources.c - -gtk3_widget_factory_SOURCES = widget-factory.c - -BUILT_SOURCES = \ - widget_factory_resources.c - -gtk3_widget_factory_DEPENDENCIES = \ - $(top_builddir)/gtk/libgtk-3.la - -gtk3_widget_factory_CPPFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(NULL) - -gtk3_widget_factory_LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) \ - $(NULL) - -widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/widget-factory.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< - - -iconthemedir = $(datadir)/icons/hicolor - -appsicon16dir = $(iconthemedir)/16x16/apps -appsicon22dir = $(iconthemedir)/22x22/apps -appsicon24dir = $(iconthemedir)/24x24/apps -appsicon32dir = $(iconthemedir)/32x32/apps -appsicon48dir = $(iconthemedir)/48x48/apps -appsicon256dir = $(iconthemedir)/256x256/apps - -dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png data/16x16/gtk3-widget-factory-symbolic.symbolic.png -dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png data/22x22/gtk3-widget-factory-symbolic.symbolic.png -dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png data/24x24/gtk3-widget-factory-symbolic.symbolic.png -dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget-factory-symbolic.symbolic.png -dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png -dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png - -update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force - -install-data-hook: install-update-icon-cache -uninstall-hook: uninstall-update-icon-cache - -install-update-icon-cache: - $(AM_V_at)$(POST_INSTALL) - test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" - -uninstall-update-icon-cache: - $(AM_V_at)$(POST_UNINSTALL) - test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" - -EXTRA_DIST += \ - widget-factory.ui \ - widget-factory.css \ - help-overlay.ui \ - widget-factory.gresource.xml \ - data/source.svg \ - data/symbolic-source.svg \ - meson.build - -DISTCLEANFILES = widget_factory_resources.c - --include $(top_srcdir)/git.mk diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index fbc230ec77..0000000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl - -SUBDIRS = reference tools - -EXTRA_DIST += \ - CODING-STYLE \ - developers.txt \ - dnd_internals.txt \ - focus_tracking.txt \ - iconcache.txt \ - RELEASE-HOWTO \ - sizing-test.txt \ - styles.txt \ - text_widget_internals.txt \ - tree-column-sizing.png \ - tree-column-sizing.txt \ - widget_geometry.txt \ - widget_system.txt - --include $(top_srcdir)/git.mk diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am deleted file mode 100644 index 3a52c1e9a6..0000000000 --- a/docs/reference/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl - -SUBDIRS = gdk gtk libgail-util - -GITIGNOREFILES = */*.1 - -EXTRA_DIST += \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am deleted file mode 100644 index 77264cf210..0000000000 --- a/docs/reference/gdk/Makefile.am +++ /dev/null @@ -1,212 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = 1.6 - -# The name of the module. -DOC_MODULE=gdk3 - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=gdk-docs.sgml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--deprecated-guards=GDK_DISABLE_DEPRECATED \ - --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=$(top_srcdir)/gdk $(top_srcdir)/gdk/x11 - -# Used for dependencies -HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h -CFILE_GLOB=$(top_srcdir)/gdk/*.c - -# Header files to ignore when scanning -IGNORE_HFILES= \ - gdkintl.h \ - gdkmarshalers.h \ - gdkkeysyms.h \ - gdkinternals.h \ - gdkprivate.h \ - gdk-private.h \ - gdkapplaunchcontextprivate.h \ - gdkcursorprivate.h \ - gdkdevicemanagerprivate.h \ - gdkdeviceprivate.h \ - gdkdisplaymanagerprivate.h \ - gdkdisplayprivate.h \ - gdkdndprivate.h \ - gdkframeclockprivate.h \ - gdkglcontextprivate.h \ - gdkkeysprivate.h \ - gdkscreenprivate.h \ - gdkseatdefaultprivate.h \ - gdkseatprivate.h \ - gdkvisualprivate.h \ - keyname-table.h \ - win32 \ - x11 \ - quartz \ - broadway \ - wayland - -# Extra files to add when scanning -EXTRA_HFILES= \ - $(top_srcdir)/gdk/x11/gdkx.h - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS) - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--output-format=xml --name-space=gdk - -# Extra SGML files that are included by DOC_MAIN_SGML_FILE -content_files = \ - version.xml - -# Images to copy into HTML directory -HTML_IMAGES = \ - images/rotated-text.png \ - images/X_cursor.png \ - images/arrow.png \ - images/based_arrow_down.png \ - images/based_arrow_up.png \ - images/boat.png \ - images/bogosity.png \ - images/bottom_left_corner.png \ - images/bottom_right_corner.png \ - images/bottom_side.png \ - images/bottom_tee.png \ - images/box_spiral.png \ - images/center_ptr.png \ - images/circle.png \ - images/clock.png \ - images/coffee_mug.png \ - images/cross.png \ - images/cross_reverse.png \ - images/crosshair.png \ - images/diamond_cross.png \ - images/dot.png \ - images/dotbox.png \ - images/double_arrow.png \ - images/draft_large.png \ - images/draft_small.png \ - images/draped_box.png \ - images/exchange.png \ - images/fleur.png \ - images/gobbler.png \ - images/gumby.png \ - images/hand1.png \ - images/hand2.png \ - images/heart.png \ - images/icon.png \ - images/iron_cross.png \ - images/left_ptr.png \ - images/left_side.png \ - images/left_tee.png \ - images/leftbutton.png \ - images/ll_angle.png \ - images/lr_angle.png \ - images/man.png \ - images/middlebutton.png \ - images/mouse.png \ - images/pencil.png \ - images/pirate.png \ - images/plus.png \ - images/question_arrow.png \ - images/right_ptr.png \ - images/right_side.png \ - images/right_tee.png \ - images/rightbutton.png \ - images/rtl_logo.png \ - images/sailboat.png \ - images/sb_down_arrow.png \ - images/sb_h_double_arrow.png \ - images/sb_left_arrow.png \ - images/sb_right_arrow.png \ - images/sb_up_arrow.png \ - images/sb_v_double_arrow.png \ - images/shuttle.png \ - images/sizing.png \ - images/spider.png \ - images/spraycan.png \ - images/star.png \ - images/target.png \ - images/tcross.png \ - images/top_left_arrow.png \ - images/top_left_corner.png \ - images/top_right_corner.png \ - images/top_side.png \ - images/top_tee.png \ - images/trek.png \ - images/ul_angle.png \ - images/umbrella.png \ - images/ur_angle.png \ - images/watch.png \ - images/xterm.png \ - images/alias_cursor.png \ - images/all_scroll_cursor.png \ - images/cell_cursor.png \ - images/col_resize_cursor.png \ - images/copy_cursor.png \ - images/crosshair_cursor.png \ - images/default_cursor.png \ - images/e_resize_cursor.png \ - images/ew_resize_cursor.png \ - images/grabbing_cursor.png \ - images/grab_cursor.png \ - images/hand_cursor.png \ - images/context_menu_cursor.png \ - images/help_cursor.png \ - images/move_cursor.png \ - images/ne_resize_cursor.png \ - images/nesw_resize_cursor.png \ - images/no_drop_cursor.png \ - images/not_allowed_cursor.png \ - images/n_resize_cursor.png \ - images/ns_resize_cursor.png \ - images/nw_resize_cursor.png \ - images/nwse_resize_cursor.png \ - images/pointer_cursor.png \ - images/progress_cursor.png \ - images/row_resize_cursor.png \ - images/se_resize_cursor.png \ - images/s_resize_cursor.png \ - images/sw_resize_cursor.png \ - images/text_cursor.png \ - images/vertical_text_cursor.png \ - images/wait_cursor.png \ - images/w_resize_cursor.png \ - images/X_cursor.png \ - images/zoom_in_cursor.png \ - images/zoom_out_cursor.png - -if ENABLE_DOC_CROSS_REFERENCES -# Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS= \ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ - --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo -endif - -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += \ - version.xml.in \ - meson.build - -if ENABLE_GTK_DOC -TESTS_ENVIRONMENT = cd $(srcdir) && \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -#TESTS = $(GTKDOC_CHECK) -endif - --include $(top_srcdir)/git.mk diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am deleted file mode 100644 index dc9b80c6c5..0000000000 --- a/docs/reference/gtk/Makefile.am +++ /dev/null @@ -1,562 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = 1.6 - -# The name of the module. -DOC_MODULE=gtk3 - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=gtk-docs.sgml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=$(top_srcdir)/gtk - -# Used for dependencies -HFILE_GLOB=$(top_srcdir)/gtk/*.h -CFILE_GLOB=$(top_srcdir)/gtk/*.c - -# Header files to ignore when scanning -IGNORE_HFILES = \ - inspector \ - a11y \ - gtkaccelgroupprivate.h \ - gtkaccelmapprivate.h \ - gtkadjustmentprivate.h \ - gtkallocatedbitmaskprivate.h \ - gtkappchooserprivate.h \ - gtkapplicationaccelsprivate.h \ - gtkapplicationprivate.h \ - gtkbindingsprivate.h \ - gtkbitmaskprivate.h \ - gtkboxprivate.h \ - gtkbuilderprivate.h \ - gtkbuttonprivate.h \ - gtkcairoblurprivate.h \ - gtkcellareaboxcontextprivate.h \ - gtkclipboardprivate.h \ - gtkcolorchooserprivate.h \ - gtkcoloreditorprivate.h \ - gtkcolorplaneprivate.h \ - gtkcolorscaleprivate.h \ - gtkcolorswatchprivate.h \ - gtkcomboboxprivate.h \ - gtkcontainerprivate.h \ - gtkcssanimatedstyleprivate.h \ - gtkcssanimationprivate.h \ - gtkcssarrayvalueprivate.h \ - gtkcssbgsizevalueprivate.h \ - gtkcssbordervalueprivate.h \ - gtkcsscolorvalueprivate.h \ - gtkcsscornervalueprivate.h \ - gtkcsscustompropertyprivate.h \ - gtkcsseasevalueprivate.h \ - gtkcssenginevalueprivate.h \ - gtkcssenumvalueprivate.h \ - gtkcssiconthemevalueprivate.h \ - gtkcssimagebuiltinprivate.h \ - gtkcssimagecrossfadeprivate.h \ - gtkcssimagegradientprivate.h \ - gtkcssimageiconthemeprivate.h \ - gtkcssimagelinearprivate.h \ - gtkcssimageprivate.h \ - gtkcssimagescaledprivate.h \ - gtkcssimagesurfaceprivate.h \ - gtkcssimageurlprivate.h \ - gtkcssimagevalueprivate.h \ - gtkcssimagewin32private.h \ - gtkcssinheritvalueprivate.h \ - gtkcssinitialvalueprivate.h \ - gtkcsskeyframesprivate.h \ - gtkcsslookupprivate.h \ - gtkcssmatcherprivate.h \ - gtkcssnodeprivate.h \ - gtkcssnodedeclarationprivate.h \ - gtkcssnumbervalueprivate.h \ - gtkcsspathnodeprivate.h \ - gtkcssparserprivate.h \ - gtkcsspositionvalueprivate.h \ - gtkcssproviderprivate.h \ - gtkcssrepeatvalueprivate.h \ - gtkcssrgbavalueprivate.h \ - gtkcsssectionprivate.h \ - gtkcssselectorprivate.h \ - gtkcssshadowsvalueprivate.h \ - gtkcssshadowvalueprivate.h \ - gtkcssshorthandpropertyprivate.h\ - gtkcssstaticstyleprivate.h \ - gtkcssstringvalueprivate.h \ - gtkcssstylefuncsprivate.h \ - gtkcssstyleprivate.h \ - gtkcssstylepropertyprivate.h \ - gtkcsstransformvalueprivate.h \ - gtkcsstransientnodeprivate.h \ - gtkcsstransitionprivate.h \ - gtkcsstypedvalueprivate.h \ - gtkcsstypesprivate.h \ - gtkcssunsetvalueprivate.h \ - gtkcssvalueprivate.h \ - gtkcsswidgetnodeprivate.h \ - gtkdialogprivate.h \ - gtkentryprivate.h \ - gtkeventcontrollerprivate.h \ - gtkfilechooserprivate.h \ - gtkfilechooserwidgetprivate.h \ - gtkfontchooserprivate.h \ - gtkgesturedragprivate.h \ - gtkgesturelongpressprivate.h \ - gtkgesturemultipressprivate.h \ - gtkgesturepanprivate.h \ - gtkgestureprivate.h \ - gtkgesturerotateprivate.h \ - gtkgesturesingleprivate.h \ - gtkgestureswipeprivate.h \ - gtkgesturezoomprivate.h \ - gtkheaderbarprivate.h \ - gtkhslaprivate.h \ - gtkiconhelperprivate.h \ - gtkiconviewprivate.h \ - gtkimageprivate.h \ - gtkimmoduleprivate.h \ - gtklabelprivate.h \ - gtklockbuttonprivate.h \ - gtkmagnifierprivate.h \ - gtkmenubuttonprivate.h \ - gtkmenuitemprivate.h \ - gtkmenuprivate.h \ - gtkmenushellprivate.h \ - gtkmodulesprivate.h \ - gtkmountoperationprivate.h \ - gtkorientableprivate.h \ - gtkpixelcacheprivate.h \ - gtkplacessidebarprivate.h \ - gtkplacesviewprivate.h \ - gtkplacesviewrowprivate.h \ - gtkpopoverprivate.h \ - gtkprinter-private.h \ - gtkprintoperation-private.h \ - gtkprivate.h \ - gtkrangeprivate.h \ - gtkrecentchooserprivate.h \ - gtkrenderbackgroundprivate.h \ - gtkrenderborderprivate.h \ - gtkrendericonprivate.h \ - gtkrenderprivate.h \ - gtkroundedboxprivate.h \ - gtkscaleprivate.h \ - gtksearchengine.h \ - gtksearchenginemodel.h \ - gtksearchenginequartz.h \ - gtksearchenginesimple.h \ - gtksearchenginetracker.h \ - gtksearchentryprivate.h \ - gtkselectionprivate.h \ - gtksettingsprivate.h \ - gtksidebarrowprivate.h \ - gtksizegroup-private.h \ - gtksizerequestcacheprivate.h \ - gtksocketprivate.h \ - gtkstyleanimationprivate.h \ - gtkstylecascadeprivate.h \ - gtkstylecontextprivate.h \ - gtkstylepropertyprivate.h \ - gtkstyleproviderprivate.h \ - gtktextattributesprivate.h \ - gtktextchildprivate.h \ - gtktexthandleprivate.h \ - gtktextiterprivate.h \ - gtktextmarkprivate.h \ - gtktexttagprivate.h \ - gtktogglebuttonprivate.h \ - gtktoolbarprivate.h \ - gtktoolpaletteprivate.h \ - gtktooltipprivate.h \ - gtktooltipwindowprivate.h \ - gtktreeprivate.h \ - gtkwidgetprivate.h \ - gtkwin32themeprivate.h \ - gtkwindowprivate.h \ - fnmatch.h \ - gtkactionmuxer.h \ - gtkactionobserver.h \ - gtkactionobservable.h \ - gtk9slice.h \ - gtkanimationdescription.h \ - gtkbitmaskprivateimpl.h \ - gtkbookmarksmanager.h \ - gtkdbusgenerated.c \ - gtkdbusgenerated.h \ - gtkdebug.h \ - gtkactionhelper.h \ - gtkdndcursors.h \ - gtkfilechooserdefault.h \ - gtkfilechooserembed.h \ - gtkfilechooserentry.h \ - gtkfilechoosersettings.h \ - gtkfilechooserutils.h \ - gtkfilesystem.h \ - gtkfilesystemmodel.h \ - gtkfilesystemunix.h \ - gtkfilesystemwin32.h \ - gtkfontchooserutils.h \ - gtkiconcache.h \ - gtkiconcachevalidator.h \ - gtkiconthemeparser.h \ - gtkintl.h \ - gtkkeyhash.h \ - gtkkineticscrolling.h \ - gtkmarshal.h \ - gtkmnemonichash.h \ - gtkmenutracker.h \ - gtkmenutrackeritem.h \ - gtkmenusectionbox.h \ - gtkmodelmenu.h \ - gtkmodelmenuitem.h \ - gtkmodifierstyle.h \ - gtkpathbar.h \ - gtkprintbackend.h \ - gtkprinteroption.h \ - gtkprinteroptionset.h \ - gtkprinteroptionwidget.h \ - gtkprint-win32.h \ - gtkprintutils.h \ - gtkprivate.h \ - gtkprivatetypebuiltins.h \ - gtkquery.h \ - gtkrbtree.h \ - gtkrecentchooserdefault.h \ - gtkrecentchooserutils.h \ - gtksearchengine.h \ - gtksearchenginetracker.h \ - gtksearchenginesimple.h \ - gtksearchenginequartz.h \ - gtksequence.h \ - gtksocketprivate.h \ - gtktextbtree.h \ - gtktextbufferserialize.h \ - gtktextdisplay.h \ - gtktextlayout.h \ - gtktextsegment.h \ - gtktexttypes.h \ - gtktextutil.h \ - gtktimeline.h \ - gtkthemes.h \ - gtktrashmonitor.h \ - gtktrayicon.h \ - gtktreedatalist.h \ - gtktreemenu.h \ - gtktypebuiltins.h \ - gtkxembed.h \ - gtkwin32embed.h \ - gtkwin32embedwidget.h \ - gtkwindow-decorate.h \ - xdgmime \ - xembed.h - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_builddir)/gdk \ - -DGTK_ENABLE_BROKEN \ - -Wno-deprecated-declarations \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -CPPFLAGS += \ - -UGTK_DISABLE_SINGLE_INCLUDES - -GTKDOC_LIBS = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--output-format=xml --name-space=gtk --default-includes=gtk/gtk.h - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) -content_files = \ - broadway.xml \ - broadwayd.xml \ - building.sgml \ - compiling.sgml \ - css-overview.xml \ - css-properties.xml \ - drawing-model.xml \ - $(builddir)/getting_started.xml \ - glossary.xml \ - gtk3-demo-application.xml \ - gtk3-demo.xml \ - gtk3-icon-browser.xml \ - gtk3-widget-factory.xml \ - gtk-builder-tool.xml \ - gtk-encode-symbolic-svg.xml \ - gtk-launch.xml \ - gtk-query-immodules-3.0.xml \ - gtk-query-settings.xml \ - gtk-update-icon-cache.xml \ - input-handling.xml \ - migrating-2to3.xml \ - migrating-3xtoy.xml \ - migrating-checklist.sgml \ - migrating-GtkGrid.xml \ - migrating-GtkStyleContext.xml \ - migrating-smclient-GtkApplication.xml \ - migrating-unique-GtkApplication.xml \ - osx.sgml \ - overview.xml \ - question_index.sgml \ - resources.sgml \ - running.sgml \ - text_widget.sgml \ - tree_widget.sgml \ - version.xml \ - visual_index.xml \ - wayland.xml \ - windows.sgml \ - x11.sgml - -expand_content_files = \ - compiling.sgml \ - drawing-model.xml \ - $(builddir)/getting_started.xml \ - glossary.xml \ - input-handling.xml \ - migrating-2to3.xml \ - migrating-3xtoy.xml \ - migrating-checklist.sgml \ - migrating-GtkGrid.xml \ - migrating-GtkStyleContext.xml \ - migrating-smclient-GtkApplication.xml \ - migrating-unique-GtkApplication.xml \ - question_index.sgml \ - text_widget.sgml \ - tree_widget.sgml - -# Images to copy into HTML directory -HTML_IMAGES = \ - $(srcdir)/images/aboutdialog.png \ - $(srcdir)/images/accel-label.png \ - $(srcdir)/images/action-bar.png \ - $(srcdir)/images/appchooserbutton.png \ - $(srcdir)/images/appchooserdialog.png \ - $(srcdir)/images/assistant.png \ - $(srcdir)/images/box-packing.png \ - $(srcdir)/images/box-expand.png \ - $(srcdir)/images/button.png \ - $(srcdir)/images/check-button.png \ - $(srcdir)/images/color-button.png \ - $(srcdir)/images/colorchooser.png \ - $(srcdir)/images/combo-box.png \ - $(srcdir)/images/combo-box-entry.png \ - $(srcdir)/images/combo-box-text.png \ - $(srcdir)/images/entry.png \ - $(srcdir)/images/figure-hierarchical-drawing.png \ - $(srcdir)/images/figure-windowed-label.png \ - $(srcdir)/images/file-button.png \ - $(srcdir)/images/filechooser.png \ - $(srcdir)/images/font-button.png \ - $(srcdir)/images/fontchooser.png \ - $(srcdir)/images/frame.png \ - $(srcdir)/images/glarea.png \ - $(srcdir)/images/headerbar.png \ - $(srcdir)/images/icon-view.png \ - $(srcdir)/images/image.png \ - $(srcdir)/images/info-bar.png \ - $(srcdir)/images/label.png \ - $(srcdir)/images/levelbar.png \ - $(srcdir)/images/link-button.png \ - $(srcdir)/images/list-and-tree.png \ - $(srcdir)/images/lock-button.png \ - $(srcdir)/images/lockbutton.png \ - $(srcdir)/images/lockbutton-locked.png \ - $(srcdir)/images/lockbutton-unlocked.png \ - $(srcdir)/images/lockbutton-sorry.png \ - $(srcdir)/images/menubar.png \ - $(srcdir)/images/menu-button.png \ - $(srcdir)/images/messagedialog.png \ - $(srcdir)/images/multiline-text.png \ - $(srcdir)/images/notebook.png \ - $(srcdir)/images/panes.png \ - $(srcdir)/images/pagesetupdialog.png \ - $(srcdir)/images/placessidebar.png \ - $(srcdir)/images/popup-anchors.png \ - $(srcdir)/images/popup-at.svg \ - $(srcdir)/images/popup-flip.png \ - $(srcdir)/images/popup-slide.png \ - $(srcdir)/images/printdialog.png \ - $(srcdir)/images/progressbar.png \ - $(srcdir)/images/radio-group.png \ - $(srcdir)/images/recentchooserdialog.png \ - $(srcdir)/images/scales.png \ - $(srcdir)/images/scrollbar.png \ - $(srcdir)/images/scrolledwindow.png \ - $(srcdir)/images/search-bar.png \ - $(srcdir)/images/search-entry.png \ - $(srcdir)/images/separator.png \ - $(srcdir)/images/sidebar.png \ - $(srcdir)/images/spinbutton.png \ - $(srcdir)/images/spinner.png \ - $(srcdir)/images/stack.png \ - $(srcdir)/images/stackswitcher.png \ - $(srcdir)/images/statusbar.png \ - $(srcdir)/images/toggle-button.png \ - $(srcdir)/images/toolbar.png \ - $(srcdir)/images/toolpalette.png \ - $(srcdir)/images/tree-view-coordinates.png \ - $(srcdir)/images/volumebutton.png \ - $(srcdir)/images/window.png \ - $(srcdir)/images/layout-btlr.png \ - $(srcdir)/images/layout-btrl.png \ - $(srcdir)/images/layout-lrbt.png \ - $(srcdir)/images/layout-lrtb.png \ - $(srcdir)/images/layout-rlbt.png \ - $(srcdir)/images/layout-rltb.png \ - $(srcdir)/images/layout-tblr.png \ - $(srcdir)/images/layout-tbrl.png \ - $(srcdir)/images/widget-hvalign.png \ - $(srcdir)/images/window-default.png \ - $(srcdir)/images/hello-world.png \ - $(srcdir)/images/grid-packing.png \ - $(srcdir)/images/drawing.png \ - $(srcdir)/images/switch.png \ - $(srcdir)/images/linear.png \ - $(srcdir)/images/ease.png \ - $(srcdir)/images/ease-in-out.png \ - $(srcdir)/images/ease-in.png \ - $(srcdir)/images/ease-out.png \ - $(srcdir)/images/gradient1.png \ - $(srcdir)/images/gradient2.png \ - $(srcdir)/images/gradient3.png \ - $(srcdir)/images/gradient4.png \ - $(srcdir)/images/border1.png \ - $(srcdir)/images/border2.png \ - $(srcdir)/images/border3.png \ - $(srcdir)/images/slices.png \ - $(srcdir)/images/checks.png \ - $(srcdir)/images/options.png \ - $(srcdir)/images/arrows.png \ - $(srcdir)/images/expanders.png \ - $(srcdir)/images/background.png \ - $(srcdir)/images/frames.png \ - $(srcdir)/images/frame-gap.png \ - $(srcdir)/images/sliders.png \ - $(srcdir)/images/focus.png \ - $(srcdir)/images/handles.png \ - $(srcdir)/images/extensions.png \ - $(srcdir)/images/numerableicon.png \ - $(srcdir)/images/numerableicon2.png \ - $(srcdir)/images/bloatpad-osx.png \ - $(srcdir)/images/bloatpad-gnome.png \ - $(srcdir)/images/bloatpad-xfce.png \ - $(srcdir)/images/down-center.png \ - $(srcdir)/images/down-end.png \ - $(srcdir)/images/down-start.png \ - $(srcdir)/images/left-center.png \ - $(srcdir)/images/left-end.png \ - $(srcdir)/images/left-start.png \ - $(srcdir)/images/right-center.png \ - $(srcdir)/images/right-end.png \ - $(srcdir)/images/right-start.png \ - $(srcdir)/images/up-center.png \ - $(srcdir)/images/up-end.png \ - $(srcdir)/images/up-start.png \ - $(srcdir)/images/list-box.png \ - $(srcdir)/images/getting-started-app1.png \ - $(srcdir)/images/getting-started-app2.png \ - $(srcdir)/images/getting-started-app3.png \ - $(srcdir)/images/getting-started-app4.png \ - $(srcdir)/images/getting-started-app6.png \ - $(srcdir)/images/getting-started-app7.png \ - $(srcdir)/images/getting-started-app8.png \ - $(srcdir)/images/getting-started-app9.png \ - $(srcdir)/images/getting-started-app10.png \ - $(srcdir)/images/exampleapp.png \ - $(srcdir)/images/flow-box.png \ - $(srcdir)/images/inspector.png \ - $(srcdir)/images/gedit-shortcuts.png \ - $(srcdir)/images/clocks-shortcuts.png \ - $(srcdir)/images/builder-shortcuts.png - -if ENABLE_DOC_CROSS_REFERENCES -# Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS=--extra-dir=../gdk/html \ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio \ - --extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \ - --extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \ - --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo -endif - -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in - -######################################################################## - -man_MANS = \ - gtk-query-immodules-3.0.1 \ - gtk-update-icon-cache.1 \ - gtk-encode-symbolic-svg.1 \ - gtk-launch.1 \ - gtk3-demo.1 \ - gtk3-demo-application.1 \ - gtk3-widget-factory.1 \ - gtk3-icon-browser.1 \ - broadwayd.1 \ - gtk-builder-tool.1 \ - gtk-query-settings.1 - -if ENABLE_MAN - -XSLTPROC_FLAGS = \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 - -.xml.1: - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -dist-local-check-mans-enabled: - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi - -else - -$(man_MANS): - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@ - -dist-local-check-mans-enabled: - echo "*** --enable-man must be used in order to make dist" - false - -endif - -MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES) - -EXTRA_DIST += \ - $(man_MANS) \ - meson.build - -if ENABLE_GTK_DOC -TESTS_ENVIRONMENT = cd $(srcdir) && \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -#TESTS = $(GTKDOC_CHECK) -endif - -dist-hook-local: dist-local-check-mans-enabled all-local - -gtk-docs-clean: clean - cd $(srcdir) && rm -rf xml html - --include $(top_srcdir)/git.mk diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml index 02e3347c1d..a7ca6c4832 100644 --- a/docs/reference/gtk/building.sgml +++ b/docs/reference/gtk/building.sgml @@ -35,64 +35,37 @@ How to compile GTK+ itself already. - On UNIX-like systems GTK+ uses the standard GNU build system, - using autoconf for package - configuration and resolving portability issues, - automake for building makefiles that - comply with the GNU Coding Standards, and - libtool for building shared libraries - on multiple platforms. - - - If you are building GTK+ from the distributed source packages, - then you won't need these tools installed; the necessary pieces - of the tools are already included in the source packages. But - it's useful to know a bit about how packages that use these - tools work. A source package is distributed as a - tar.bz2 or tar.xz file - which you unpack into a directory full of the source files as follows: + On all supported platforms, GTK+ uses the Meson build system. - tar xvfj gtk+-3.2.0.tar.bz2 - tar xvfJ gtk+-3.2.0.tar.xz + tar xvfJ gtk+-3.24.0.tar.xz - In the toplevel directory that is created, there will be - a shell script called configure which - you then run to take the template makefiles called - Makefile.in in the package and create - makefiles customized for your operating system. - The configure script can be passed - various command line arguments to determine how the package - is built and installed. The most commonly useful argument is - the --prefix argument which - determines where the package is installed. To install a package - in /opt/gtk you would run configure as: + Once you have extracted the files from the release archive, and + you entered the source directory, you can use the meson + command to configure the project. - ./configure --prefix=/opt/gtk + meson setup --prefix=/opt/gtk _builddir . A full list of options can be found by running - configure with the - --help argument. In general, the defaults are - right and should be trusted. After you've run - configure, you then run the - make command to build the package and install - it. + meson configure from within the build directory. + In general, the defaults are right and should be trusted. + + + After you've run meson setup, you then run the + meson compile command to build the project and + install it. - make - make install + meson compile -C _builddir + meson install -C _builddir If you don't have permission to write to the directory you are installing in, you may have to change to root temporarily before - running make install. Also, if you are - installing in a system directory, on some systems (such as - Linux), you will need to run ldconfig after - make install so that the newly installed - libraries will be found. + running meson install. Several environment variables are useful to pass to set before @@ -131,10 +104,10 @@ How to compile GTK+ itself Before you can compile the GTK+ widget toolkit, you need to have various other tools and libraries installed on your - system. The two tools needed during the build process (as + system. The main tool needed during the build process (as differentiated from the tools used in when creating GTK+ - mentioned above such as autoconf) - are pkg-config and GNU make. + mentioned above such as meson) + is pkg-config. @@ -148,17 +121,6 @@ How to compile GTK+ itself needed for that library along with version number information.) - - - The GTK+ makefiles will mostly work with different versions - of make, however, there tends to be - a few incompatibilities, so the GTK+ team recommends - installing GNU - make if you don't already have it on your system - and using it. (It may be called gmake - rather than make.) - - Some of the libraries that GTK+ depends on are maintained by @@ -168,17 +130,15 @@ How to compile GTK+ itself - The GLib library provides core non-graphical functionality - such as high level data types, Unicode manipulation, and - an object and type system to C programs. It is available - from the GTK+ - FTP site or - here. + The GLib library + provides core non-graphical functionality such as high level data types, + Unicode manipulation, and an object and type system to C programs. It is + available here. - The GdkPixbuf library + The GdkPixbuf library provides facilities for loading images in a variety of file formats. It is available here. @@ -186,14 +146,15 @@ How to compile GTK+ itself - Pango is a library + Pango is a library for internationalized text handling. It is available here. - ATK is the Accessibility Toolkit. It provides a set of generic + ATK is the + Accessibility Toolkit. It provides a set of generic interfaces allowing accessibility technologies such as screen readers to interact with a graphical user interface. It is available @@ -202,7 +163,7 @@ How to compile GTK+ itself - Gobject Introspection + Gobject Introspection is a framework for making introspection data available to language bindings. It is available here. @@ -304,244 +265,80 @@ How to compile GTK+ itself GTK+ installs. - If one of the configure scripts fails or running - make fails, look closely at the error - messages printed; these will often provide useful information - as to what went wrong. When configure - fails, extra information, such as errors that a test compilation - ran into, is found in the file config.log. - Looking at the last couple of hundred lines in this file will - frequently make clear what went wrong. If all else fails, you - can ask for help on the gtk-list mailing list. - See for more information. + If either the meson setup or the + meson compile commands fail, look closely + at the error messages printed; these will often provide useful + information as to what went wrong. - + + Extra Configuration Options - In addition to the normal options, the - configure script for the GTK+ library - supports a number of additional arguments. (Command line - arguments for the other GTK+ libraries are described in - the documentation distributed with the those libraries.) + In addition to the standard meson options + when configuring the GTK+ project, you have a number of + additional arguments. (Command line arguments for the other + libraries are described in the documentation distributed with + the those libraries.) - configure + meson setup - --disable-modules - --enable-modules + -Dxinerama=[yes/no/auto] - --with-included-immodules=MODULE1,MODULE2,... + -Dgtk_doc=[false/true] - --enable-debug=[no/minimum/yes] + -Dprint_backends=["cups,file,lpr,papi,test,auto"] - --disable-Bsymbolic - --enable-Bsymbolic + -Dx11_backend=[false/true] - --disable-xkb - --enable-xkb + -Dwin32_backend=[false/true] - --disable-xinerama - --enable-xinerama + -Dquartz_backend=[false/true] - --disable-gtk-doc - --enable-gtk-doc + -Dbroadway_backend=[false/true] - --disable-cups - --enable-cups + -Dwayland_backend=[false/true] - --disable-papi - --enable-papi + -Dintrospection=[false/true] - --enable-xinput - --disable-xinput - - - - --enable-packagekit - --disable-packagekit - - - - --enable-x11-backend - --disable-x11-backend - - - - --enable-win32-backend - --disable-win32-backend - - - - --enable-quartz-backend - --disable-quartz-backend - - - - --enable-broadway-backend - --disable-broadway-backend - - - - --enable-wayland-backend - --disable-wayland-backend - - - - --enable-introspection=[no/auto/yes] - - - - --enable-installed-tests - --disable-installed-tests + -Dinstalled_tests=[false/true] - <systemitem>--disable-modules</systemitem> and - <systemitem>--enable-modules</systemitem> + <systemitem>-Dxinerama</systemitem> - Normally GTK+ will try to build the input method modules - as little shared libraries that are loaded on demand. - The --disable-modules argument - indicates that they should all be built statically - into the GTK+ library instead. This is useful for - people who need to produce statically-linked binaries. - If neither --disable-modules nor - --enable-modules is specified, - then the configure script will try to - auto-detect whether shared modules work on your system. + By default GTK will try to link against the Xinerama libraries + if they are found. This option can be used to explicitly control + whether Xinerama should be used. - <systemitem>--with-included-immodules</systemitem> - - - This option allows you to specify which input method modules you - want to include directly into the GTK+ shared library, as opposed - to building them as loadable modules. - - - - - <systemitem>--enable-debug</systemitem> - - - Turns on various amounts of debugging support. Setting this to - 'no' disables g_assert(), g_return_if_fail(), g_return_val_if_fail() and all cast checks between different object types. Setting it - to 'minimum' disables only cast checks. Setting it to 'yes' enables - runtime debugging. - The default is 'minimum'. - Note that 'no' is fast, but dangerous as it tends to destabilize - even mostly bug-free software by changing the effect of many bugs - from simple warnings into fatal crashes. Thus - should not - be used for stable releases of GTK+. - - - - - <systemitem>--disable-Bsymbolic</systemitem> and - <systemitem>--enable-Bsymbolic</systemitem> - - The option --disable-Bsymbolic - turns off the use of the -Bsymbolic-functions linker flag. - This is only necessary if you want to override GTK+ functions - by using LD_PRELOAD. - - - - - <systemitem>--enable-explicit-deps</systemitem> and - <systemitem>--disable-explicit-deps</systemitem> - - If --enable-explicit-deps is - specified then GTK+ will write the full set of libraries - that GTK+ depends upon into its .pc files to be used when - programs depending on GTK+ are linked. Otherwise, GTK+ - only will include the GTK+ libraries themselves, and - will depend on system library dependency facilities to - bring in the other libraries. - By default GTK+ will disable explicit dependencies unless - it detects that they are needed on the system. (If you - specify --enable-static to force - building of static libraries, then explicit dependencies - will be written since library dependencies don't work - for static libraries.) Specifying - --enable-explicit-deps or - --enable-static can cause - compatibility - problems when libraries that GTK+ depends upon change - their versions, and should be avoided if possible. - - - - - <systemitem>--disable-xkb</systemitem> and - <systemitem>--enable-xkb</systemitem> - - - By default the configure script will try - to auto-detect whether the XKB extension is supported by - the X libraries GTK+ is linked with. - These options can be used to explicitly control whether - GTK+ will support the XKB extension. - - - - - <systemitem>--disable-xinerama</systemitem> and - <systemitem>--enable-xinerama</systemitem> - - - By default the configure script will try - to link against the Xinerama libraries if they are found. - These options can be used to explicitly control whether - Xinerama should be used. - - - - - <systemitem>--disable-xinput</systemitem> and - <systemitem>--enable-xinput</systemitem> - - Controls whether GTK+ is built with support for the XInput - or XInput2 extension. These extensions provide an extended - interface to input devices such as graphics tablets. - When this support is compiled in, specially written - GTK+ programs can get access to subpixel positions, - multiple simultaneous input devices, and extra "axes" - provided by the device such as pressure and tilt - information. - - - - - <systemitem>--disable-gtk-doc</systemitem> and - <systemitem>--enable-gtk-doc</systemitem> + <systemitem>-Dgtk_doc</systemitem> The gtk-doc package is @@ -552,88 +349,57 @@ How to compile GTK+ itself gtk-doc installed and are modifying GTK+, you may want to enable gtk-doc support by passing - in --enable-gtk-doc. If not + in -Dgtk_doc=true. If not enabled, pre-generated HTML files distributed with GTK+ will be installed. - <systemitem>--disable-cups</systemitem> and - <systemitem>--enable-cups</systemitem> + <systemitem>-Dprint_backends</systemitem> - By default the configure script will try - to build the cups print backend if the cups libraries are found. - These options can be used to explicitly control whether - the cups print backend should be built. + By default GTK will try to build the appropriate print backend + for the system. You can specify the print backends manually to + explicitly control which backends should be build. - <systemitem>--disable-papi</systemitem> and - <systemitem>--enable-papi</systemitem> + <systemitem>-Dx11_backend</systemitem>, + <systemitem>-Dwin32_backend</systemitem>, + <systemitem>-Dquartz_backend</systemitem>, + <systemitem>-Dbroadway_backend</systemitem>, + <systemitem>-Dwayland_backend</systemitem> - By default the configure script will try - to build the papi print backend if the papi libraries are found. - These options can be used to explicitly control whether - the papi print backend should be built. - - - - - <systemitem>--disable-packagekit</systemitem> and - <systemitem>--enable-packagekit</systemitem> - - By default the configure script will try - to build the PackageKit support for the open-with dialog if - the PackageKit libraries are found. - These options can be used to explicitly control whether - PackageKit support should be built. - - - - - <systemitem>--enable-x11-backend</systemitem>, - <systemitem>--disable-x11-backend</systemitem>, - <systemitem>--enable-win32-backend</systemitem>, - <systemitem>--disable-win32-backend</systemitem>, - <systemitem>--enable-quartz-backend</systemitem>, - <systemitem>--disable-quartz-backend</systemitem>, - <systemitem>--enable-broadway-backend</systemitem>, - <systemitem>--disable-broadway-backend</systemitem>, - <systemitem>--enable-wayland-backend</systemitem>, - <systemitem>--disable-wayland-backend</systemitem> - - - Enables specific backends for GDK. If none of these options + Enable specific backends for GDK. If none of these options are given, the x11 backend will be enabled by default, unless the platform is Windows, in which case the default is win32. If any backend is explicitly enabled or disabled, no other platform will be enabled automatically. Other - supported backends are the quartz backend for OS X. + supported backends are the quartz backend for macOS, and the + HTML-based Broadway backend. - <systemitem>--enable-introspection</systemitem> + <systemitem>-Dintrospection</systemitem> Build with or without introspection support. - The default is 'auto'. + The default is 'true'. - <systemitem>--enable-installed-tests</systemitem> or - <systemitem>--disable-installed-tests</systemitem> + <systemitem>-Dinstalled-tests</systemitem> Whether to install tests on the system. If enabled, tests and their data are installed in ${libexecdir}/gtk+/installed-tests. Metadata for the tests is installed in ${prefix}/share/installed-tests/gtk+. - To run the installed tests, gnome-desktop-testing-runner + To run the installed tests, gnome-desktop-testing-runner can be used. diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am deleted file mode 100644 index 43f66a14e7..0000000000 --- a/docs/reference/libgail-util/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = 1.7 - -# The name of the module. -DOC_MODULE=gail-libgail-util3 - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=gail-libgail-util-docs.sgml - -# The directory containing the source code (if it contains documentation). -DOC_SOURCE_DIR=$(top_srcdir)/libgail-util - -# Used for dependencies -HFILE_GLOB = $(top_srcdir)/libgail-util/*.h -CFILE_GLOB = $(top_srcdir)/libgail-util/*.c - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(DEP_CFLAGS) - -GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-3.la - -# gtkdoc-mkdb related varaibles -MKDB_OPTIONS = -content_files = \ - version.xml - -HTML_IMAGES = - -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += \ - version.xml.in \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 2e28fba4a8..d8c6fa9b5d 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -1,11 +1,11 @@ if get_option('gtk_doc') - glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') + glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix') glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') - cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix') + cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix') cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo') - gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix') + gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix') gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf') docpath = join_paths(gtk_datadir, 'gtk-doc', 'html') diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am deleted file mode 100644 index bec43e3a55..0000000000 --- a/docs/tools/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -I$(top_srcdir)/gdk/x11 \ - -I$(top_srcdir)/tests \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -DEPS = \ - $(top_builddir)/gtk/libgtk-3.la - -LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/tests/gtkgears.o \ - $(GTK_DEP_LIBS) \ - $(GDK_DEP_LIBS) \ - -lm - -EXTRA_DIST += \ - meson.build - -if USE_X11 -noinst_PROGRAMS = \ - doc-shooter -endif - -doc_shooter_DEPENDENCIES = $(DEPS) -doc_shooter_LDADD = $(LDADDS) -doc_shooter_SOURCES = \ - shadow.c \ - shadow.h \ - shooter.c \ - widgets.c \ - widgets.h - -clean-local: - for file in *.png; do \ - case "$$file" in \ - folder.png|gnome.png) ;; \ - *) rm -f $$file ;; \ - esac ; \ - done - --include $(top_srcdir)/git.mk diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index ed8f9a7ced..0000000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -SUBDIRS = \ - bp \ - application1 application2 application3 \ - application4 application5 application6 \ - application7 application8 application9 \ - application10 - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -noinst_PROGRAMS = \ - hello-world \ - window-default \ - plugman \ - sunny \ - action-namespace \ - grid-packing \ - drawing \ - builder \ - search-bar \ - listbox-dnd - -EXTRA_DIST = \ - builder.ui \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/examples/application1/Makefile.am b/examples/application1/Makefile.am deleted file mode 100644 index 63ef50fc92..0000000000 --- a/examples/application1/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h - -EXTRA_DIST = \ - exampleapp.desktop \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/examples/application10/Makefile.am b/examples/application10/Makefile.am deleted file mode 100644 index c5bda45eba..0000000000 --- a/examples/application10/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c - -BUILT_SOURCES = \ - resources.c \ - gschemas.compiled - -resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -gsettings_SCHEMAS = \ - org.gtk.exampleapp.gschema.xml - -@GSETTINGS_RULES@ - -gschemas.compiled: org.gtk.exampleapp.gschema.xml - $(GLIB_COMPILE_SCHEMAS) . - -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - gears-menu.ui \ - exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ - meson.build - -CLEANFILES = \ - gschemas.compiled - --include $(top_srcdir)/git.mk diff --git a/examples/application2/Makefile.am b/examples/application2/Makefile.am deleted file mode 100644 index 8fc04789d8..0000000000 --- a/examples/application2/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c - -BUILT_SOURCES = resources.c - -resources.c: exampleapp.gresource.xml window.ui - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -EXTRA_DIST = \ - window.ui \ - exampleapp.gresource.xml \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/examples/application3/Makefile.am b/examples/application3/Makefile.am deleted file mode 100644 index 8fc04789d8..0000000000 --- a/examples/application3/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c - -BUILT_SOURCES = resources.c - -resources.c: exampleapp.gresource.xml window.ui - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -EXTRA_DIST = \ - window.ui \ - exampleapp.gresource.xml \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/examples/application4/Makefile.am b/examples/application4/Makefile.am deleted file mode 100644 index 7bc91ba1df..0000000000 --- a/examples/application4/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c - -BUILT_SOURCES = resources.c - -resources.c: exampleapp.gresource.xml window.ui app-menu.ui - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - exampleapp.gresource.xml \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/examples/application5/Makefile.am b/examples/application5/Makefile.am deleted file mode 100644 index b6f34e7043..0000000000 --- a/examples/application5/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c - -BUILT_SOURCES = \ - resources.c \ - gschemas.compiled - -resources.c: exampleapp.gresource.xml window.ui app-menu.ui - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -gsettings_SCHEMAS = \ - org.gtk.exampleapp.gschema.xml - -@GSETTINGS_RULES@ - -gschemas.compiled: org.gtk.exampleapp.gschema.xml - $(GLIB_COMPILE_SCHEMAS) . - -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ - meson.build - -CLEANFILES = \ - gschemas.compiled - --include $(top_srcdir)/git.mk diff --git a/examples/application6/Makefile.am b/examples/application6/Makefile.am deleted file mode 100644 index 9cf885ed10..0000000000 --- a/examples/application6/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c - -BUILT_SOURCES = \ - resources.c \ - gschemas.compiled - -resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -gsettings_SCHEMAS = \ - org.gtk.exampleapp.gschema.xml - -@GSETTINGS_RULES@ - -gschemas.compiled: org.gtk.exampleapp.gschema.xml - $(GLIB_COMPILE_SCHEMAS) . - -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ - meson.build - -CLEANFILES = \ - gschemas.compiled - --include $(top_srcdir)/git.mk diff --git a/examples/application7/Makefile.am b/examples/application7/Makefile.am deleted file mode 100644 index 9cf885ed10..0000000000 --- a/examples/application7/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c - -BUILT_SOURCES = \ - resources.c \ - gschemas.compiled - -resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -gsettings_SCHEMAS = \ - org.gtk.exampleapp.gschema.xml - -@GSETTINGS_RULES@ - -gschemas.compiled: org.gtk.exampleapp.gschema.xml - $(GLIB_COMPILE_SCHEMAS) . - -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ - meson.build - -CLEANFILES = \ - gschemas.compiled - --include $(top_srcdir)/git.mk diff --git a/examples/application8/Makefile.am b/examples/application8/Makefile.am deleted file mode 100644 index c5bda45eba..0000000000 --- a/examples/application8/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c - -BUILT_SOURCES = \ - resources.c \ - gschemas.compiled - -resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -gsettings_SCHEMAS = \ - org.gtk.exampleapp.gschema.xml - -@GSETTINGS_RULES@ - -gschemas.compiled: org.gtk.exampleapp.gschema.xml - $(GLIB_COMPILE_SCHEMAS) . - -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - gears-menu.ui \ - exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ - meson.build - -CLEANFILES = \ - gschemas.compiled - --include $(top_srcdir)/git.mk diff --git a/examples/application9/Makefile.am b/examples/application9/Makefile.am deleted file mode 100644 index c5bda45eba..0000000000 --- a/examples/application9/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -GTK_CFLAGS = \ - -I$(top_srcdir) \ - $(GTK_DEP_CFLAGS) - -GTK_LIBS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - -noinst_PROGRAMS = exampleapp - -exampleapp_CFLAGS = $(GTK_CFLAGS) -exampleapp_LDADD = $(GTK_LIBS) -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c - -BUILT_SOURCES = \ - resources.c \ - gschemas.compiled - -resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --generate-source - -gsettings_SCHEMAS = \ - org.gtk.exampleapp.gschema.xml - -@GSETTINGS_RULES@ - -gschemas.compiled: org.gtk.exampleapp.gschema.xml - $(GLIB_COMPILE_SCHEMAS) . - -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - gears-menu.ui \ - exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ - meson.build - -CLEANFILES = \ - gschemas.compiled - --include $(top_srcdir)/git.mk diff --git a/examples/bp/Makefile.am b/examples/bp/Makefile.am deleted file mode 100644 index 66b52b188a..0000000000 --- a/examples/bp/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -AM_CPPFLAGS = \ - -DSRCDIR=\"$(abs_srcdir)\" \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -noinst_PROGRAMS = bloatpad - - -bloatpad_SOURCES = bloatpad.c -nodist_bloatpad_SOURCES = bloatpad-gresources.c - -resource_files = \ - bloatpad.gresources.xml \ - gtk/menus.ui \ - gtk/help-overlay.ui - -bloatpad-gresources.c: $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< - -CLEANFILES = bloatpad-gresources.c - -EXTRA_DIST = \ - $(resource_files) \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/gdk/Makefile.am b/gdk/Makefile.am deleted file mode 100644 index 9874a6d5c4..0000000000 --- a/gdk/Makefile.am +++ /dev/null @@ -1,319 +0,0 @@ -## Makefile.am for gtk+/gdk -include $(top_srcdir)/Makefile.decl -include gdk-sources.inc - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ENV = \ - CC="$(CC)" -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=../gdk \ - --warn-all -INTROSPECTION_COMPILER_ARGS = \ - --includedir=$(srcdir) \ - --includedir=. - -SUBDIRS = $(GDK_BACKENDS) . - -DIST_SUBDIRS = win32 x11 quartz broadway wayland - -CLEANFILES = - -EXTRA_DIST += \ - keynames.txt \ - keynames-translate.txt \ - keyname-table.h \ - gdkkeynames.c \ - gen-keyname-table.pl \ - gdkconfig.h.win32 \ - gdkconfig.h.win32_broadway \ - gdkkeysyms-update.pl \ - gdkmarshalers.list \ - gdkwindowimpl.h \ - makefile.msc \ - gdkenumtypes.c.template \ - gdkenumtypes.h.template \ - gdkversionmacros.h.in \ - meson.build \ - gen-gdk-gresources-xml.py \ - gdkconfig.h.meson - -GDK_CFLAGS_DEFINES = \ - -DG_LOG_USE_STRUCTURED=1 \ - -DGDK_COMPILATION - - -AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - $(GDK_CFLAGS_DEFINES) \ - -I$(top_builddir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -# libtool stuff: set version and export symbols for resolving -# since automake doesn't support conditionalized libsomething_la_LDFLAGS -# we use the general approach here -LDADD = \ - $(GTK_LINK_FLAGS) \ - -version-info $(LT_VERSION_INFO) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) - -# -# setup GDK sources and their dependencies -# - -gdkincludedir = $(includedir)/gtk-3.0/gdk -gdkinclude_HEADERS = $(gdk_public_h_sources) -nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h - -deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated -deprecatedinclude_HEADERS = $(gdk_deprecated_h_sources) - -common_sources = \ - $(gdk_private_headers) \ - $(gdk_c_sources) \ - gdkenumtypes.c \ - gdkmarshalers.c \ - gdkmarshalers.h \ - gdkresources.h \ - gdkresources.c - -libgdk_3_la_SOURCES = $(common_sources) -libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS) -libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS) -libgdk_3_la_LDFLAGS = $(LDADD) - -if USE_X11 -libgdk_3_la_LIBADD += x11/libgdk-x11.la -endif # USE_X11 - -if USE_QUARTZ -libgdk_3_la_LIBADD += quartz/libgdk-quartz.la -endif # USE_QUARTZ - -if USE_WIN32 -libgdk_3_la_LIBADD += win32/libgdk-win32.la -libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o -libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -endif # USE_WIN32 - -if USE_BROADWAY -libgdk_3_la_LIBADD += broadway/libgdk-broadway.la -endif # USE_BROADWAY - -if USE_WAYLAND -libgdk_3_la_LIBADD += wayland/libgdk-wayland.la -endif - -if HAVE_INTROSPECTION - -introspection_files = \ - $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources)) \ - $(gdk_c_sources) \ - $(gdk_built_sources) - -Gdk-3.0.gir: libgdk-3.la Makefile -Gdk_3_0_gir_SCANNERFLAGS = \ - --c-include="gdk/gdk.h" -Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0 -Gdk_3_0_gir_LIBS = libgdk-3.la -Gdk_3_0_gir_FILES = $(introspection_files) -Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0 -INTROSPECTION_GIRS += Gdk-3.0.gir -if OS_WIN32 -Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir) -endif -if USE_X11 -GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile -GdkX11_3_0_gir_SCANNERFLAGS = \ - --identifier-prefix=Gdk \ - --c-include="gdk/gdkx.h" \ - --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir -GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0 -GdkX11_3_0_gir_LIBS = libgdk-3.la -GdkX11_3_0_gir_FILES = $(x11_introspection_files) -GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0 -INTROSPECTION_GIRS += GdkX11-3.0.gir - -endif # USE_X11 - -if OS_WIN32 -GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile -GdkWin32_3_0_gir_SCANNERFLAGS = \ - --identifier-prefix=Gdk \ - --c-include="gdk/gdkwin32.h" \ - --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir -GdkWin32_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 -GdkWin32_3_0_gir_LIBS = libgdk-3.la -GdkWin32_3_0_gir_FILES = $(w32_introspection_files) -GdkWin32_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir) -INTROSPECTION_GIRS += GdkWin32-3.0.gir - -endif # OS_WIN32 - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) - -endif # HAVE_INTROSPECTION - -if OS_WIN32 -gdk.def: libgdk-3.la - echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@ - echo "EXPORTS" >>$@ - objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@ -install-def-file: gdk.def - mkdir -p $(DESTDIR)$(libdir) - $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def -uninstall-def-file: - -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def -else -install-def-file: -uninstall-def-file: -endif - -if MS_LIB_AVAILABLE -noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib - -gdk-win32-$(GTK_API_VERSION).lib: libgdk-3.la gdk.def - lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@ - -install-ms-lib: - mkdir -p $(DESTDIR)$(libdir) - $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) - -uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib -else -install-ms-lib: -uninstall-ms-lib: -endif - -lib_LTLIBRARIES = libgdk-3.la - -MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h -EXTRA_DIST += \ - fallback-c89.c - -install-exec-hook: -if DISABLE_EXPLICIT_DEPS - $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la -endif - -BUILT_SOURCES = \ - $(gdk_built_sources) \ - gdkconfig.h - -gdkenumtypes.h: stamp-gdkenumtypes.h - @true -stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \ - $(gdk_h_sources) ) >> xgen-geth \ - && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \ - && rm -f xgen-geth \ - && echo timestamp > $(@F) -gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \ - $(gdk_h_sources) ) > xgen-getc \ - && cp xgen-getc gdkenumtypes.c \ - && rm -f xgen-getc - -# -# Marshaller generation -# -gdkmarshalers.h: gdkmarshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) \ - --prefix=_gdk_marshal \ - --valist-marshallers \ - --header \ - $(srcdir)/gdkmarshalers.list > gdkmarshalers-h.tmp \ - && mv gdkmarshalers-h.tmp gdkmarshalers.h \ - || ( rm -f gdkmarshalers-h.tmp && exit 1) -gdkmarshalers.c: gdkmarshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) \ - --prefix=_gdk_marshal \ - --valist-marshallers \ - --body \ - $(srcdir)/gdkmarshalers.list > gdkmarshalers-c.tmp \ - && mv gdkmarshalers-c.tmp gdkmarshalers.c \ - || ( rm -f gdkmarshalers-c.tmp && exit 1 ) - -gdkconfig.h: stamp-gc-h - $(AM_V_GEN) if test -f gdkconfig.h; then :; \ - else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi -stamp-gc-h: $(top_builddir)/config.status - $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h \ - && echo timestamp > gdk/$(@F) - -# -# Resources -# - -glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) - -gdk.gresource.xml: Makefile.am - $(AM_V_GEN) echo "" > $@; \ - echo "" >> $@; \ - echo " " >> $@; \ - for f in $(glsl_sources); do \ - n=`basename $$f`; \ - echo " resources/glsl/$$n" >> $@; \ - done; \ - echo " " >> $@; \ - echo "" >> $@; - -EXTRA_DIST += $(glsl_sources) -CLEANFILES += gdk.gresource.xml - -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/gdk.gresource.xml) - -gdkresources.h: gdk.gresource.xml - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \ - --sourcedir=$(srcdir) --c-name _gdk --generate-header --manual-register --internal -gdkresources.c: gdk.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \ - --sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register --internal - -# ------------------- MSVC Build Items ---------------- -MSVCPROJS = gdk-3 - -gdk_3_FILES = $(gdk_c_sources) -gdk_3_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: \ - $(top_builddir)/win32/vs9/gdk-3.vcproj - -DISTCLEANFILES = gdkconfig.h stamp-gc-h - -install-data-local: install-ms-lib install-def-file - -uninstall-local: uninstall-ms-lib uninstall-def-file - rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h - -# if srcdir!=builddir, clean out maintainer-clean files from builddir -# this allows dist to pass. -distclean-local: - if test $(srcdir) != .; then \ - rm -f $(MAINTAINERCLEANFILES); \ - fi - -.PHONY: files - -files: - @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ - echo $$p; \ - done - --include $(top_srcdir)/git.mk diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am deleted file mode 100644 index 7136182331..0000000000 --- a/gdk/broadway/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl -include gdk-broadway-sources.inc -NULL = - -libgdkincludedir = $(includedir)/gtk-3.0/gdk -libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway - -AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DG_LOG_USE_STRUCTURED=1 \ - -DGDK_COMPILATION \ - -DGDK_DISABLE_DEPRECATION_WARNINGS \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GDK_HIDDEN_VISIBILITY_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -LDADDS = $(GDK_DEP_LIBS) -lrt - -noinst_LTLIBRARIES = libgdk-broadway.la - -bin_PROGRAMS = broadwayd - -libgdkinclude_HEADERS = $(GDK_PUBLIC_H_SRCS_BROADWAY) - -EXTRA_DIST += toarray.pl - -clienthtml.h: client.html - $(AM_V_GEN) $(PERL) $(srcdir)/toarray.pl client_html $(srcdir)/client.html > $@ - -EXTRA_DIST += client.html - -broadwayjs.h: broadway.js rawinflate.min.js - $(AM_V_GEN) $(PERL) $(srcdir)/toarray.pl broadway_js $(srcdir)/broadway.js $(srcdir)/rawinflate.min.js > $@ - -EXTRA_DIST += broadway.js rawinflate.min.js - -# built headers that don't get installed -broadway_built_sources = \ - $(broadway_built_private_headers) - -libgdk_broadway_la_SOURCES = \ - $(broadway_built_private_headers)\ - $(GDK_BROADWAY_NON_GENERATED_SOURCES) - -if OS_UNIX -libgdk_broadway_la_LIBADD = \ - $(SHM_LIBS) \ - $(NULL) -endif - -if OS_WIN32 -broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32 -else -broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@ -endif - -MAINTAINERCLEANFILES = $(broadway_built_sources) -EXTRA_DIST += $(broadway_built_sources) - -BUILT_SOURCES = $(broadway_built_sources) - -EXTRA_DIST += \ - meson.build \ - gen-c-array.py - -# ------------------- MSVC Build Items ---------------- -MSVCPROJS = gdk3-broadway broadwayd - -gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES) -gdk3_broadway_EXCLUDES = dummy - -broadwayd_FILES = $(broadwayd_SOURCES) -broadwayd_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: \ - $(top_builddir)/win32/vs9/gdk3-broadway.vcproj \ - $(top_builddir)/win32/vs9/broadwayd.vcproj - --include $(top_srcdir)/git.mk diff --git a/gdk/broadway/gdk-broadway-sources.inc b/gdk/broadway/gdk-broadway-sources.inc deleted file mode 100644 index dd047f9a7d..0000000000 --- a/gdk/broadway/gdk-broadway-sources.inc +++ /dev/null @@ -1,55 +0,0 @@ -# Public header list for GdkBroadway - -GDK_PUBLIC_H_SRCS_BROADWAY = \ - gdkbroadway.h - -libgdkbroadwayinclude_HEADERS = \ - gdkbroadwaydisplay.h \ - gdkbroadwaywindow.h \ - gdkbroadwaycursor.h \ - gdkbroadwaymonitor.h \ - gdkbroadwayvisual.h - -# built headers that don't get installed - -broadway_built_private_headers = \ - clienthtml.h \ - broadwayjs.h - -# Other non-generated sources -GDK_BROADWAY_NON_GENERATED_SOURCES = \ - gdkcursor-broadway.c \ - gdkdevice-broadway.h \ - gdkdevice-broadway.c \ - gdkdevicemanager-broadway.h \ - gdkdevicemanager-broadway.c \ - gdkdisplay-broadway.c \ - gdkdisplay-broadway.h \ - gdkdnd-broadway.c \ - gdkeventsource.c \ - gdkeventsource.h \ - gdkglobals-broadway.c \ - gdkkeys-broadway.c \ - gdkmonitor-broadway.c \ - gdkmonitor-broadway.h \ - gdkproperty-broadway.c \ - gdkscreen-broadway.c \ - gdkscreen-broadway.h \ - gdkselection-broadway.c \ - gdktestutils-broadway.c \ - gdkvisual-broadway.c \ - gdkwindow-broadway.c \ - gdkwindow-broadway.h \ - gdkprivate-broadway.h \ - gdkbroadway-server.h \ - gdkbroadway-server.c - -broadwayd_SOURCES = \ - broadway-protocol.h \ - broadwayd.c \ - broadway-server.h \ - broadway-server.c \ - broadway-buffer.c \ - broadway-buffer.h \ - broadway-output.h \ - broadway-output.c diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h deleted file mode 100644 index 0818af293d..0000000000 --- a/gdk/broadway/gdkbroadwaydisplaymanager.h +++ /dev/null @@ -1,46 +0,0 @@ -/* gdkbroadwaydisplaymanager.h - * - * Copyright (C) 2005-2007 Imendio AB - * Copyright 2010 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__ -#define __GDK_BROADWAY_DISPLAY_MANAGER_H__ - -#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GDK_TYPE_BROADWAY_DISPLAY_MANAGER (gdk_broadway_display_manager_get_type ()) -#define GDK_BROADWAY_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY_MANAGER, GdkBroadwayDisplayManager)) - -#ifdef GDK_COMPILATION -typedef struct _GdkBroadwayDisplayManager GdkBroadwayDisplayManager; -#else -typedef GdkDisplayManager _GdkBroadwayDisplayManager; -#endif -typedef struct _GdkDisplayManagerClass GdkBroadwayDisplayManagerClass; - -GDK_AVAILABLE_IN_ALL -GType gdk_broadway_display_manager_get_type (void); - -G_END_DECLS - -#endif /* __GDK_BROADWAY_DISPLAY_MANAGER_H__ */ diff --git a/gdk/gdk-sources.inc b/gdk/gdk-sources.inc deleted file mode 100644 index 9235edb6cf..0000000000 --- a/gdk/gdk-sources.inc +++ /dev/null @@ -1,213 +0,0 @@ -# -# GDK header files for public installation (non-generated) -# - -# -# setup source file variables -# - -gdk_public_h_sources = \ - gdk.h \ - gdk-autocleanup.h \ - gdkapplaunchcontext.h \ - gdkcairo.h \ - gdkcursor.h \ - gdkdevice.h \ - gdkdevicepad.h \ - gdkdevicetool.h \ - gdkdevicemanager.h \ - gdkdisplay.h \ - gdkdisplaymanager.h \ - gdkdnd.h \ - gdkdrawingcontext.h \ - gdkevents.h \ - gdkframetimings.h \ - gdkglcontext.h \ - gdkkeys.h \ - gdkkeysyms.h \ - gdkkeysyms-compat.h \ - gdkmain.h \ - gdkmonitor.h \ - gdkpango.h \ - gdkframeclock.h \ - gdkpixbuf.h \ - gdkprivate.h \ - gdkproperty.h \ - gdkrectangle.h \ - gdkrgba.h \ - gdkscreen.h \ - gdkseat.h \ - gdkselection.h \ - gdktestutils.h \ - gdkthreads.h \ - gdktypes.h \ - gdkvisual.h \ - gdkwindow.h - -gdk_deprecated_h_sources = \ - deprecated/gdkcolor.h - -gdk_h_sources = \ - $(gdk_public_h_sources) \ - $(gdk_deprecated_h_sources) - -gdk_private_headers = \ - gdk-private.h \ - gdkapplaunchcontextprivate.h \ - gdkconstructor.h \ - gdkcursorprivate.h \ - gdkdevicemanagerprivate.h \ - gdkdeviceprivate.h \ - gdkdevicepadprivate.h \ - gdkdevicetoolprivate.h \ - gdkdisplaymanagerprivate.h \ - gdkdisplayprivate.h \ - gdkdndprivate.h \ - gdkdrawingcontextprivate.h \ - gdkframeclockidle.h \ - gdkframeclockprivate.h \ - gdkglcontextprivate.h \ - gdkmonitorprivate.h \ - gdkprofilerprivate.h \ - gdkscreenprivate.h \ - gdkseatprivate.h \ - gdkseatdefaultprivate.h \ - gdkinternals.h \ - gdkintl.h \ - gdkkeysprivate.h \ - gdkvisualprivate.h \ - gdkx.h - -gdk_deprecated_c_sources = \ - deprecated/gdkcolor.c - -gdk_c_sources = \ - $(gdk_deprecated_c_sources) \ - gdk-private.c \ - gdk.c \ - gdkapplaunchcontext.c \ - gdkcairo.c \ - gdkcursor.c \ - gdkdeprecated.c \ - gdkdevice.c \ - gdkdevicepad.c \ - gdkdevicetool.c \ - gdkdevicemanager.c \ - gdkdisplay.c \ - gdkdisplaymanager.c \ - gdkdnd.c \ - gdkdrawingcontext.c \ - gdkevents.c \ - gdkframetimings.c \ - gdkgl.c \ - gdkglcontext.c \ - gdkglobals.c \ - gdkkeys.c \ - gdkkeyuni.c \ - gdkmonitor.c \ - gdkoffscreenwindow.c \ - gdkframeclock.c \ - gdkframeclockidle.c \ - gdkpango.c \ - gdkpixbuf-drawable.c \ - gdkprofiler.c \ - gdkproperty.c \ - gdkrectangle.c \ - gdkrgba.c \ - gdkscreen.c \ - gdkseat.c \ - gdkseatdefault.c \ - gdkselection.c \ - gdkvisual.c \ - gdkwindow.c \ - gdkwindowimpl.c - -gdk_built_sources = \ - gdkenumtypes.h \ - gdkenumtypes.c \ - gdkmarshalers.h \ - gdkmarshalers.c \ - gdkresources.h \ - gdkresources.c \ - gdkversionmacros.h - -x11_introspection_files = \ - x11/gdkapplaunchcontext-x11.c \ - x11/gdkasync.c \ - x11/gdkcursor-x11.c \ - x11/gdkdevice-core-x11.c \ - x11/gdkdevicemanager-core-x11.c \ - x11/gdkdevicemanager-x11.c \ - x11/gdkdevicemanager-xi2.c \ - x11/gdkdevice-xi2.c \ - x11/gdkdisplay-x11.c \ - x11/gdkdisplaymanager-x11.c \ - x11/gdkdnd-x11.c \ - x11/gdkeventsource.c \ - x11/gdkeventtranslator.c \ - x11/gdkgeometry-x11.c \ - x11/gdkglcontext-x11.c \ - x11/gdkkeys-x11.c \ - x11/gdkmain-x11.c \ - x11/gdkmonitor-x11.c \ - x11/gdkproperty-x11.c \ - x11/gdkscreen-x11.c \ - x11/gdkselection-x11.c \ - x11/gdksettings.c \ - x11/gdktestutils-x11.c \ - x11/gdkvisual-x11.c \ - x11/gdkwindow-x11.c \ - x11/gdkxftdefaults.c \ - x11/gdkxid.c \ - x11/xsettings-client.c \ - x11/gdkx.h \ - x11/gdkx11applaunchcontext.h \ - x11/gdkx11cursor.h \ - x11/gdkx11device.h \ - x11/gdkx11device-core.h \ - x11/gdkx11device-xi2.h \ - x11/gdkx11devicemanager.h \ - x11/gdkx11devicemanager-core.h \ - x11/gdkx11devicemanager-xi2.h \ - x11/gdkx11display.h \ - x11/gdkx11displaymanager.h \ - x11/gdkx11dnd.h \ - x11/gdkx11glcontext.h \ - x11/gdkx11keys.h \ - x11/gdkx11monitor.h \ - x11/gdkx11property.h \ - x11/gdkx11screen.h \ - x11/gdkx11selection.h \ - x11/gdkx11utils.h \ - x11/gdkx11visual.h \ - x11/gdkx11window.h - -w32_introspection_files = \ - win32/gdkcursor-win32.c \ - win32/gdkdevicemanager-win32.c \ - win32/gdkdevice-virtual.c \ - win32/gdkdevice-win32.c \ - win32/gdkdevice-wintab.c \ - win32/gdkdisplaymanager-win32.c \ - win32/gdkdisplay-win32.c \ - win32/gdkdnd-win32.c \ - win32/gdkevents-win32.c \ - win32/gdkgeometry-win32.c \ - win32/gdkglobals-win32.c \ - win32/gdkkeys-win32.c \ - win32/gdkmain-win32.c \ - win32/gdkproperty-win32.c \ - win32/gdkscreen-win32.c \ - win32/gdkselection-win32.c \ - win32/gdktestutils-win32.c \ - win32/gdkwin32.h \ - win32/gdkwin32cursor.h \ - win32/gdkwin32display.h \ - win32/gdkwin32displaymanager.h \ - win32/gdkwin32dnd.h \ - win32/gdkwin32id.c \ - win32/gdkwin32keys.h \ - win32/gdkwin32misc.h \ - win32/gdkwin32screen.h \ - win32/gdkwin32window.h \ - win32/gdkwindow-win32.c diff --git a/gdk/gdkenumtypes.c.template b/gdk/gdkenumtypes.c.template index c5104e0e0d..768210a839 100644 --- a/gdk/gdkenumtypes.c.template +++ b/gdk/gdkenumtypes.c.template @@ -12,7 +12,7 @@ GType @enum_name@_get_type (void) { - static volatile gsize g_define_type_id__volatile = 0; + static gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { diff --git a/gdk/makefile.msc b/gdk/makefile.msc deleted file mode 100644 index 0d88d1e417..0000000000 --- a/gdk/makefile.msc +++ /dev/null @@ -1,175 +0,0 @@ -## Makefile for building the GDK DLL with Microsoft C -## Use: nmake -f makefile.msc - -## You must first build the Win32-dependent sources in the win32 subdirectory. - -## There is no install target, you have to decide where and -## how to install for yourself. - -TOP = ..\.. -!INCLUDE $(TOP)/glib/build/win32/make.msc - -# Location of the Wintab toolkit. Downloadable from http://www.pointing.com. -# definition should possibly go to build/win32/module.def, too. -!IFNDEF WTKIT -WTKIT = $(TOP)\wtkit126 -!ENDIF - -############################################################### - -# Nothing much configurable below -# overwrite version? -GTK_VER=3.0 - -!IFNDEF PERL -PERL = perl -!ENDIF - -INCLUDES = -FImsvc_recommended_pragmas.h \ - -I . -I .. \ - $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) $(GDK_PIXBUF_CFLAGS) \ - -DEFINES = \ - -DHAVE_CONFIG_H \ - -DGDK_VERSION=\"$(GTK_VER)\" \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" - -EXTRALIBS = \ - $(WTKIT)\lib\i386\wntab32x.lib \ - $(GLIB_LIBS) $(GDK_PIXBUF_LIBS) \ - $(CAIRO_LIBS) $(CAIRO_GOBJECT_LIBS) \ - $(PANGOWIN32_LIBS) $(PANGOCAIRO_LIBS) $(INTL_LIBS) - -gdk-win32-backend : - cd win32 - nmake -nologo -f makefile.msc - cd .. - -all: \ - ..\config.h \ - gdkconfig.h \ - gdkenumtypes.h \ - gdkenumtypes.c \ - gdkmarshalers.h \ - gdkmarshalers.c \ - gdk-win32-backend \ - libgdk-win32-$(GTK_VER)-0.dll \ -# testgdk.exe \ -# gdk-win32-$(GTK_VER)s.lib \ -# gdk-x11-$(GTK_VER).dll \ - -gdk_OBJECTS = \ - gdk.obj \ - gdkapplaunchcontext.obj \ - gdkcairo.obj \ - gdkcolor.obj \ - gdkcursor.obj \ - gdkdevice.obj \ - gdkdevicemanager.obj \ - gdkdisplay.obj \ - gdkdisplaymanager.obj \ - gdkdnd.obj \ - gdkenumtypes.obj \ - gdkevents.obj \ - gdkglobals.obj \ - gdkkeynames.obj \ - gdkkeys.obj \ - gdkkeyuni.obj \ - gdkmarshalers.obj \ - gdkoffscreenwindow.obj \ - gdkpango.obj \ - gdkpixbuf-drawable.obj \ - gdkrectangle.obj \ - gdkrgba.obj \ - gdkscreen.obj \ - gdkselection.obj \ - gdkvisual.obj \ - gdkwindow.obj \ - gdkwindowimpl.obj \ - -gdk_public_h_sources = \ - gdk.h \ - gdkapplaunchcontext.h \ - gdkcairo.h \ - gdkcolor.h \ - gdkcursor.h \ - gdkdevice.h \ - gdkdevicemanager.h \ - gdkdisplay.h \ - gdkdisplaymanager.h \ - gdkdnd.h \ - gdkevents.h \ - gdkkeys.h \ - gdkkeysyms.h \ - gdkkeysyms-compat.h \ - gdkmain.h \ - gdkpango.h \ - gdkpixbuf.h \ - gdkprivate.h \ - gdkproperty.h \ - gdkrectangle.h \ - gdkrgba.h \ - gdkscreen.h \ - gdkselection.h \ - gdktestutils.h \ - gdkthreads.h \ - gdktypes.h \ - gdkvisual.h \ - gdkwindow.h - -# private marshalers -gdkmarshalers.h : gdkmarshalers.list - $(GLIB)\gobject\glib-genmarshal --prefix=_gdk_marshal gdkmarshalers.list --header >>gdkmarshalers.h - -gdkmarshalers.c : gdkmarshalers.list - $(GLIB)\gobject\glib-genmarshal --prefix=_gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c - -gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template - $(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.h.template \ - $(gdk_public_h_sources) > gdkenumtypes.h - -gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template - $(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.c.template \ - $(gdk_public_h_sources) > gdkenumtypes.c - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -gdkconfig.h : gdkconfig.h.win32 - copy gdkconfig.h.win32 gdkconfig.h - -gdk.def: gdk.symbols - echo EXPORTS > gdk.def - cl /EP -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 \ - -DG_GNUC_CONST= \ - gdk.symbols >> gdk.def - -# /force /verbose:lib -libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib - $(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \ - gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \ - $(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib /def:gdk.def - -gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS) - lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib - -gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib - $(CC) $(CFLAGS) -LD -Fegdk-x11-$(GTK_VER).dll $(gdk_OBJECTS) \ - $(PANGO)\pango\pangox-$(PANGO_VER).lib \ - x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def - -testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj - $(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS) - -clean:: - cd win32 - nmake -f makefile.msc clean - cd .. - del gdkmarshalers.c - del gdkmarshalers.h - del *.dll - del *.obj - del *.lib - del *.err - del *.res diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am deleted file mode 100644 index bbe74c57eb..0000000000 --- a/gdk/quartz/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -libgdkincludedir = $(includedir)/gtk-3.0/gdk -libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz - -AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DG_LOG_USE_STRUCTURED=1 \ - -DGDK_COMPILATION \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GDK_HIDDEN_VISIBILITY_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) \ - "-xobjective-c" - -LDADDS = $(GDK_DEP_LIBS) - -noinst_LTLIBRARIES = libgdk-quartz.la - -libgdk_quartz_la_SOURCES = \ - GdkQuartzView.c \ - GdkQuartzView.h \ - GdkQuartzNSWindow.c \ - GdkQuartzNSWindow.h \ - gdkcursor-quartz.c \ - gdkdevice-core-quartz.c \ - gdkdevicemanager-core-quartz.c \ - gdkdevicemanager-core-quartz.h \ - gdkdisplay-quartz.c \ - gdkdisplay-quartz.h \ - gdkdisplaylinksource.c \ - gdkdisplaylinksource.h \ - gdkdisplaymanager-quartz.c \ - gdkdnd-quartz.c \ - gdkdnd-quartz.h \ - gdkevents-quartz.c \ - gdkeventloop-quartz.c \ - gdkglcontext-quartz.c \ - gdkglcontext-quartz.h \ - gdkglobals-quartz.c \ - gdkinternal-quartz.h \ - gdkkeys-quartz.c \ - gdkkeys-quartz.h \ - gdkmonitor-quartz.c \ - gdkmonitor-quartz.h \ - gdkprivate-quartz.h \ - gdkproperty-quartz.c \ - gdkquartz.h \ - gdkscreen-quartz.c \ - gdkscreen-quartz.h \ - gdkselection-quartz.c \ - gdktestutils-quartz.c \ - gdkutils-quartz.c \ - gdkvisual-quartz.c \ - gdkwindow-quartz.c \ - gdkwindow-quartz.h \ - xcursors.h - -libgdkinclude_HEADERS = \ - gdkquartz.h - -libgdkquartzinclude_HEADERS = \ - gdkquartz-cocoa-access.h \ - gdkquartz-gtk-only.h \ - gdkquartzcursor.h \ - gdkquartzdevice-core.h \ - gdkquartzdevicemanager-core.h \ - gdkquartzdisplay.h \ - gdkquartzdisplaymanager.h \ - gdkquartzdnd.h \ - gdkquartzglcontext.h \ - gdkquartzkeys.h \ - gdkquartzmonitor.h \ - gdkquartzscreen.h \ - gdkquartzutils.h \ - gdkquartzvisual.h \ - gdkquartzwindow.h - -EXTRA_DIST += \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am deleted file mode 100644 index 1b06c650b4..0000000000 --- a/gdk/wayland/Makefile.am +++ /dev/null @@ -1,135 +0,0 @@ -## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl - -libgdkincludedir = $(includedir)/gtk-3.0/gdk -libgdkwaylandincludedir = $(includedir)/gtk-3.0/gdk/wayland - -AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DG_LOG_USE_STRUCTURED=1 \ - -DGDK_COMPILATION \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_srcdir)/gdk/wayland/cursor \ - -I$(top_builddir)/gdk \ - $(GDK_HIDDEN_VISIBILITY_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -LDADDS = $(GDK_DEP_LIBS) $(SHM_LIBS) - -noinst_LTLIBRARIES = \ - libgdk-wayland.la - -BUILT_SOURCES = \ - pointer-gestures-unstable-v1-client-protocol.h \ - pointer-gestures-unstable-v1-protocol.c \ - xdg-shell-client-protocol.h \ - xdg-shell-protocol.c \ - xdg-shell-unstable-v6-client-protocol.h \ - xdg-shell-unstable-v6-protocol.c \ - xdg-foreign-unstable-v1-client-protocol.h \ - xdg-foreign-unstable-v1-protocol.c \ - gtk-primary-selection-client-protocol.h \ - gtk-primary-selection-protocol.c \ - tablet-unstable-v2-client-protocol.h \ - tablet-unstable-v2-protocol.c \ - xdg-output-unstable-v1-protocol.c \ - xdg-output-unstable-v1-client-protocol.h \ - keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h \ - keyboard-shortcuts-inhibit-unstable-v1-protocol.c \ - server-decoration-client-protocol.h \ - server-decoration-protocol.c \ - gtk-shell-client-protocol.h \ - gtk-shell-protocol.c \ - primary-selection-unstable-v1-client-protocol.h \ - primary-selection-unstable-v1-protocol.c -if USE_XDG_ACTIVATION -BUILT_SOURCES += \ - xdg-activation-v1-client-protocol.h \ - xdg-activation-v1-protocol.c -endif - -nodist_libgdk_wayland_la_SOURCES = \ - $(BUILT_SOURCES) - -DISTCLEANFILES = \ - $(BUILT_SOURCES) - -libgdk_wayland_la_SOURCES = \ - gdkapplaunchcontext-wayland.c \ - gdkcursor-wayland.c \ - gdkdevice-wayland.c \ - gdkdisplay-wayland.c \ - gdkdisplay-wayland.h \ - gdkdnd-wayland.c \ - gdkeventsource.c \ - gdkkeys-wayland.c \ - gdkglcontext-wayland.c \ - gdkglcontext-wayland.h \ - gdkmonitor-wayland.c \ - gdkmonitor-wayland.h \ - gdkscreen-wayland.c \ - gdkseat-wayland.h \ - gdkselection-wayland.c \ - gdkwindow-wayland.c \ - gdkwayland.h \ - gdkprivate-wayland.h \ - wm-button-layout-translation.c \ - wm-button-layout-translation.h - -libgdk_wayland_la_SOURCES += \ - cursor/os-compatibility.c \ - cursor/os-compatibility.h \ - cursor/wayland-cursor.c \ - cursor/wayland-cursor.h \ - cursor/xcursor.c \ - cursor/xcursor.h - -libgdkinclude_HEADERS = \ - gdkwayland.h - -libgdkwaylandinclude_HEADERS = \ - gdkwaylanddevice.h \ - gdkwaylanddisplay.h \ - gdkwaylandglcontext.h \ - gdkwaylandmonitor.h \ - gdkwaylandselection.h \ - gdkwaylandwindow.h - -.SECONDEXPANSION: - -define protostability -$(if $(findstring unstable,$1),unstable,stable) -endef - -define protoname -$(shell echo $1 | sed 's/\([a-z\-]\{1,\}\)-[a-z]\{1,\}-v[0-9]\{1,\}/\1/') -endef - -%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@ -%-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -xdg-activation-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/staging/xdg-activation/xdg-activation-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@ -xdg-activation-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/staging/xdg-activation/xdg-activation-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -%-protocol.c : $(srcdir)/protocol/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@ - -%-server-protocol.h : $(srcdir)/protocol/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@ -%-client-protocol.h : $(srcdir)/protocol/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -EXTRA_DIST += \ - protocol/gtk-primary-selection.xml \ - protocol/gtk-shell.xml \ - protocol/server-decoration.xml \ - cursor/meson.build \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c index 656e3e67da..ba8002db46 100644 --- a/gdk/wayland/gdkselection-wayland.c +++ b/gdk/wayland/gdkselection-wayland.c @@ -348,7 +348,7 @@ stored_selection_new (GdkWaylandSelection *wayland_selection, static void stored_selection_add_data (StoredSelection *stored_selection, GdkPropMode mode, - guchar *data, + const guchar *data, gsize data_len) { if (mode == GDK_PROP_MODE_REPLACE) diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index 1f0801fe43..d9ed7da3fc 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -38,7 +38,7 @@ gdk_wayland_deps = [ # wayland protocols wlprotocolsdep = dependency('wayland-protocols') -proto_dir = wlprotocolsdep.get_pkgconfig_variable('pkgdatadir') +proto_dir = wlprotocolsdep.get_variable(pkgconfig: 'pkgdatadir') assert(proto_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc') wayland_scanner = find_program('wayland-scanner') diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am deleted file mode 100644 index 586e8fddc0..0000000000 --- a/gdk/win32/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl -include gdk-win32-sources.inc - -libgdkincludedir = $(includedir)/gtk-3.0/gdk -libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32 - -AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DG_LOG_USE_STRUCTURED=1 \ - -DINSIDE_GDK_WIN32 \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GDK_HIDDEN_VISIBILITY_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) \ - $(GDK_WIN32_EXTRA_CFLAGS) \ - -DGDK_COMPILATION - -if WIN32_GLES -AM_CPPFLAGS += "-DGDK_WIN32_ENABLE_EGL=1" -endif #WIN32_GLES - -libgdk_win32_DEP_LIBS = \ - -lhid - -LDADDS = $(libgdk_win32_DEP_LIBS) $(GDK_DEP_LIBS) - -noinst_LTLIBRARIES = libgdk-win32.la - -SUBDIRS=rc - -EXTRA_DIST += \ - bdfcursor.c \ - makefile.msc \ - meson.build - -libgdk_win32_la_LIBADD = \ - $(LDADDS) \ - $(NULL) - -libgdkinclude_HEADERS = $(GDK_PUBLIC_H_SRCS_WIN32) - -# ------------------- MSVC Build Items ---------------- -MSVCPROJS = gdk3-win32 - -gdk3_win32_FILES = $(libgdk_win32_la_SOURCES) -gdk3_win32_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: \ - $(top_builddir)/win32/vs9/gdk3-win32.vcproj - --include $(top_srcdir)/git.mk diff --git a/gdk/win32/gdk-win32-sources.inc b/gdk/win32/gdk-win32-sources.inc deleted file mode 100644 index b162787058..0000000000 --- a/gdk/win32/gdk-win32-sources.inc +++ /dev/null @@ -1,72 +0,0 @@ -# Public header list for GdkWin32 - -GDK_PUBLIC_H_SRCS_WIN32 = \ - gdkwin32.h - -libgdkwin32include_HEADERS = \ - gdkwin32cursor.h \ - gdkwin32display.h \ - gdkwin32displaymanager.h\ - gdkwin32dnd.h \ - gdkwin32glcontext.h \ - gdkwin32keys.h \ - gdkwin32misc.h \ - gdkwin32monitor.h \ - gdkwin32screen.h \ - gdkwin32window.h - -# Sources list for GdkWin32 -libgdk_win32_la_SOURCES = \ - gdkcursor-win32.c \ - gdkdevicemanager-win32.c \ - gdkdevicemanager-win32.h \ - gdkdevice-virtual.c \ - gdkdevice-virtual.h \ - gdkdevice-win32.c \ - gdkdevice-win32.h \ - gdkdevice-winpointer.c \ - gdkdevice-winpointer.h \ - gdkdevice-wintab.c \ - gdkdevice-wintab.h \ - gdkdisplay-win32.c \ - gdkdisplay-win32.h \ - gdkdisplaymanager-win32.c \ - gdkdnd-win32.c \ - gdkevents-win32.c \ - gdkgeometry-win32.c \ - gdkglcontext-win32.c \ - gdkglcontext-win32.h \ - gdkglobals-win32.c \ - gdkkeys-win32.c \ - gdkkeys-win32.h \ - gdkkeys-win32-impl.c \ - gdkkeys-win32-impl-wow64.c \ - gdkmain-win32.c \ - gdkmonitor-win32.c \ - gdkmonitor-win32.h \ - gdkprivate-win32.h \ - gdkproperty-win32.c \ - gdkscreen-win32.c \ - gdkselection-win32.c \ - gdkselection-win32.h \ - gdktestutils-win32.c \ - gdkwin32cursor.h \ - gdkwin32display.h \ - gdkwin32displaymanager.h \ - gdkwin32dnd.h \ - gdkwin32dnd-private.h \ - gdkwin32glcontext.h \ - gdkwin32langnotification.c \ - gdkwin32langnotification.h \ - gdkwin32.h \ - gdkwin32id.c \ - gdkwin32keys.h \ - gdkwin32monitor.h \ - gdkwin32screen.h \ - gdkwin32window.h \ - gdkwindow-win32.c \ - gdkwindow-win32.h \ - pktdef.h \ - winpointer.h \ - wintab.h \ - xcursors.h diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc deleted file mode 100644 index ab6e30eda2..0000000000 --- a/gdk/win32/makefile.msc +++ /dev/null @@ -1,76 +0,0 @@ -## Makefile for building the GDK DLL with Microsoft C -## Use: nmake -f makefile.msc - -################################################################ - -# Nothing much configurable below - -TOP = ../../.. -!INCLUDE $(TOP)/glib/build/win32/make.msc - -# Location of the Wintab toolkit. Downloadable from http://www.pointing.com. -# definition should possibly go to build/win32/module.def, too. -!IFNDEF WTKIT -WTKIT = $(TOP)\wtkit126 -!ENDIF - -GTK_VER=3.0 - -DEFINES = \ - -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\" \ - -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" - -INCLUDES = -FImsvc_recommended_pragmas.h \ - -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) \ - $(GDK_PIXBUF_CFLAGS) -I$(WTKIT)\include -I$(GLIB) \ - -all: \ - ..\..\config.h \ - ..\gdkconfig.h \ - gdk-win32.lib \ - gdk.res - -gdk_win32_DEPS = \ - hid.lib - -gdk_win32_OBJECTS = \ - gdkcursor-win32.obj \ - gdkdevice-win32.obj \ - gdkdevice-winpointer.obj \ - gdkdevice-wintab.obj \ - gdkdevicemanager-win32.obj \ - gdkdnd-win32.obj \ - gdkdisplay-win32.obj \ - gdkdisplaymanager-win32.obj \ - gdkevents-win32.obj \ - gdkgeometry-win32.obj \ - gdkglobals-win32.obj \ - gdkinput.obj \ - gdkkeys-win32.obj \ - gdkkeys-win32-impl.obj \ - gdkkeys-win32-impl-wow64.obj \ - gdkmain-win32.obj \ - gdkproperty-win32.obj \ - gdkscreen-win32.obj \ - gdkselection-win32.obj \ - gdktestutils-win32.obj \ - gdkwin32id.obj \ - gdkwindow-win32.obj - -..\..\config.h : ..\..\config.h.win32 - copy ..\..\config.h.win32 ..\..\config.h - -..\gdkconfig.h : ..\gdkconfig.h.win32 - copy ..\gdkconfig.h.win32 ..\gdkconfig.h - -gdk.res : rc\gdk.rc - rc -DBUILDNUMBER=0 -r -fo gdk.res rc\gdk.rc - -gdk-win32.lib : $(gdk_win32_OBJECTS) - lib -out:gdk-win32.lib $(gdk_win32_DEPS) $(gdk_win32_OBJECTS) - -clean:: - del *.obj - del *.lib - del *.err - del *.res diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am deleted file mode 100644 index 4196109c41..0000000000 --- a/gdk/win32/rc/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -EXTRA_DIST += \ - gdk.rc \ - gdk.rc.in \ - gtk.ico - -if USE_WIN32 -noinst_DATA = gdk-win32-res.o -endif - -gdk-win32-res.o : gdk.rc gtk.ico - $(WINDRES) -I $(srcdir) gdk.rc $@ - --include $(top_srcdir)/git.mk diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am deleted file mode 100644 index 32b1f24434..0000000000 --- a/gdk/x11/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl - -libgdkincludedir = $(includedir)/gtk-3.0/gdk -libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11 - -AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DG_LOG_USE_STRUCTURED=1 \ - -DGDK_COMPILATION \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GDK_HIDDEN_VISIBILITY_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -LDADDS = $(GDK_DEP_LIBS) - -noinst_LTLIBRARIES = libgdk-x11.la - -libgdk_x11_la_SOURCES = \ - MwmUtil.h \ - gdkapplaunchcontext-x11.c \ - gdkasync.c \ - gdkasync.h \ - gdkcursor-x11.c \ - gdkdevice-core-x11.c \ - gdkdevice-xi2.c \ - gdkdevicemanager-core-x11.c \ - gdkdevicemanager-x11.c \ - gdkdevicemanager-xi2.c \ - gdkdevicemanagerprivate-core.h \ - gdkdisplaymanager-x11.c \ - gdkdisplay-x11.c \ - gdkdisplay-x11.h \ - gdkdnd-x11.c \ - gdkeventsource.c \ - gdkeventsource.h \ - gdkeventtranslator.c \ - gdkeventtranslator.h \ - gdkgeometry-x11.c \ - gdkglcontext-x11.c \ - gdkglcontext-x11.h \ - gdkkeys-x11.c \ - gdkmain-x11.c \ - gdkmonitor-x11.c \ - gdkmonitor-x11.h \ - gdkproperty-x11.c \ - gdkscreen-x11.c \ - gdkscreen-x11.h \ - gdkselection-x11.c \ - gdktestutils-x11.c \ - gdkvisual-x11.c \ - gdkwindow-x11.c \ - gdkwindow-x11.h \ - gdkxftdefaults.c \ - gdkxid.c \ - gdkx.h \ - gdkprivate-x11.h \ - xsettings-client.h \ - xsettings-client.c - -libgdkinclude_HEADERS = \ - gdkx.h - -libgdkx11include_HEADERS = \ - gdkx-autocleanups.h \ - gdkx11applaunchcontext.h \ - gdkx11cursor.h \ - gdkx11device.h \ - gdkx11device-core.h \ - gdkx11device-xi2.h \ - gdkx11devicemanager.h \ - gdkx11devicemanager-core.h \ - gdkx11devicemanager-xi2.h \ - gdkx11display.h \ - gdkx11displaymanager.h \ - gdkx11dnd.h \ - gdkx11glcontext.h \ - gdkx11keys.h \ - gdkx11monitor.h \ - gdkx11property.h \ - gdkx11screen.h \ - gdkx11selection.h \ - gdkx11utils.h \ - gdkx11visual.h \ - gdkx11window.h - -# We need to include all these C files here since the conditionals -# don't seem to be correctly expanded for the dist files. -EXTRA_DIST += \ - gdksettings.c \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/gdk/x11/gdkx11devicemanager-xi.h b/gdk/x11/gdkx11devicemanager-xi.h deleted file mode 100644 index d0582f2890..0000000000 --- a/gdk/x11/gdkx11devicemanager-xi.h +++ /dev/null @@ -1,42 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2009 Carlos Garnacho - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GDK_X11_DEVICE_MANAGER_XI_H__ -#define __GDK_X11_DEVICE_MANAGER_XI_H__ - -#include - -G_BEGIN_DECLS - -#define GDK_TYPE_X11_DEVICE_MANAGER_XI (gdk_x11_device_manager_xi_get_type ()) -#define GDK_X11_DEVICE_MANAGER_XI(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_X11_DEVICE_MANAGER_XI, GdkX11DeviceManagerXI)) -#define GDK_X11_DEVICE_MANAGER_XI_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_X11_DEVICE_MANAGER_XI, GdkX11DeviceManagerXIClass)) -#define GDK_IS_X11_DEVICE_MANAGER_XI(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_X11_DEVICE_MANAGER_XI)) -#define GDK_IS_X11_DEVICE_MANAGER_XI_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_X11_DEVICE_MANAGER_XI)) -#define GDK_X11_DEVICE_MANAGER_XI_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_X11_DEVICE_MANAGER_XI, GdkX11DeviceManagerXIClass)) - -typedef struct _GdkX11DeviceManagerXI GdkX11DeviceManagerXI; -typedef struct _GdkX11DeviceManagerXIClass GdkX11DeviceManagerXIClass; - - -GDK_AVAILABLE_IN_ALL -GType gdk_x11_device_manager_xi_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GDK_X11_DEVICE_MANAGER_XI_H__ */ diff --git a/git.mk b/git.mk deleted file mode 100644 index 762c87428e..0000000000 --- a/git.mk +++ /dev/null @@ -1,334 +0,0 @@ -# git.mk -# -# Copyright 2009, Red Hat, Inc. -# Copyright 2010,2011,2012,2013 Behdad Esfahbod -# Written by Behdad Esfahbod -# -# Copying and distribution of this file, with or without modification, -# is permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. -# -# The latest version of this file can be downloaded from: -# https://raw.github.com/behdad/git.mk/master/git.mk -# Bugs, etc, should be reported upstream at: -# https://github.com/behdad/git.mk -# -# To use in your project, import this file in your git repo's toplevel, -# then do "make -f git.mk". This modifies all Makefile.am files in -# your project to -include git.mk. Remember to add that line to new -# Makefile.am files you create in your project, or just rerun the -# "make -f git.mk". -# -# This enables automatic .gitignore generation. If you need to ignore -# more files, add them to the GITIGNOREFILES variable in your Makefile.am. -# But think twice before doing that. If a file has to be in .gitignore, -# chances are very high that it's a generated file and should be in one -# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES. -# -# The only case that you need to manually add a file to GITIGNOREFILES is -# when remove files in one of mostlyclean-local, clean-local, distclean-local, -# or maintainer-clean-local make targets. -# -# Note that for files like editor backup, etc, there are better places to -# ignore them. See "man gitignore". -# -# If "make maintainer-clean" removes the files but they are not recognized -# by this script (that is, if "git status" shows untracked files still), send -# me the output of "git status" as well as your Makefile.am and Makefile for -# the directories involved and I'll diagnose. -# -# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see -# Makefile.am.sample in the git.mk git repo. -# -# Don't EXTRA_DIST this file. It is supposed to only live in git clones, -# not tarballs. It serves no useful purpose in tarballs and clutters the -# build dir. -# -# This file knows how to handle autoconf, automake, libtool, gtk-doc, -# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata, -# appstream. -# -# This makefile provides the following targets: -# -# - all: "make all" will build all gitignore files. -# - gitignore: makes all gitignore files in the current dir and subdirs. -# - .gitignore: make gitignore file for the current dir. -# - gitignore-recurse: makes all gitignore files in the subdirs. -# -# KNOWN ISSUES: -# -# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the -# submodule doesn't find us. If you have configure.{in,ac} files in -# subdirs, add a proxy git.mk file in those dirs that simply does: -# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste. -# And add those files to git. See vte/gnome-pty-helper/git.mk for -# example. -# - - - -############################################################################### -# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES: -############################################################################### - -# -# Most autotools-using modules should be fine including this variable in their -# toplevel MAINTAINERCLEANFILES: -GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/configure.scan \ - `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \ - test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ - for x in \ - ar-lib \ - compile \ - config.guess \ - config.sub \ - config.rpath \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - test-driver \ - ylwrap \ - ; do echo "$$AUX_DIR/$$x"; done` \ - `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \ - head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` -# -# All modules should also be fine including the following variable, which -# removes automake-generated Makefile.in files: -GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ - `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \ - while read f; do \ - case $$f in Makefile|*/Makefile) \ - test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ - done` -# -# Modules that use libtool and use AC_CONFIG_MACRO_DIR() may also include this, -# though it's harmless to include regardless. -GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ - `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ - if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ - for x in \ - libtool.m4 \ - ltoptions.m4 \ - ltsugar.m4 \ - ltversion.m4 \ - lt~obsolete.m4 \ - ; do echo "$$MACRO_DIR/$$x"; done; \ - fi` - - - -############################################################################### -# Default rule is to install ourselves in all Makefile.am files: -############################################################################### - -git-all: git-mk-install - -git-mk-install: - @echo "Installing git makefile" - @any_failed=; \ - find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \ - if grep 'include .*/git.mk' $$x >/dev/null; then \ - echo "$$x already includes git.mk"; \ - else \ - failed=; \ - echo "Updating $$x"; \ - { cat $$x; \ - echo ''; \ - echo '-include $$(top_srcdir)/git.mk'; \ - } > $$x.tmp || failed=1; \ - if test x$$failed = x; then \ - mv $$x.tmp $$x || failed=1; \ - fi; \ - if test x$$failed = x; then : else \ - echo "Failed updating $$x"; >&2 \ - any_failed=1; \ - fi; \ - fi; done; test -z "$$any_failed" - -.PHONY: git-all git-mk-install - - - -############################################################################### -# Actual .gitignore generation: -############################################################################### - -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk - @echo "git.mk: Generating $@" - @{ \ - if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ - for x in \ - $(DOC_MODULE)-decl-list.txt \ - $(DOC_MODULE)-decl.txt \ - tmpl/$(DOC_MODULE)-unused.sgml \ - "tmpl/*.bak" \ - xml html \ - ; do echo "/$$x"; done; \ - FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \ - case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \ - fi; \ - if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ - for lc in $(DOC_LINGUAS); do \ - for x in \ - $(if $(DOC_MODULE),$(DOC_MODULE).xml) \ - $(DOC_PAGES) \ - $(DOC_INCLUDES) \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - for x in \ - $(_DOC_OMF_ALL) \ - $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) \ - $(_DOC_MOFILES) \ - $(DOC_H_FILE) \ - "*/.xml2po.mo" \ - "*/*.omf.out" \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \ - for lc in $(HELP_LINGUAS); do \ - for x in \ - $(HELP_FILES) \ - "$$lc.stamp" \ - "$$lc.mo" \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - fi; \ - if test "x$(gsettings_SCHEMAS)" = x; then :; else \ - for x in \ - $(gsettings_SCHEMAS:.xml=.valid) \ - $(gsettings__enum_file) \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(appdata_XML)" = x; then :; else \ - for x in \ - $(appdata_XML:.xml=.valid) \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(appstream_XML)" = x; then :; else \ - for x in \ - $(appstream_XML:.xml=.valid) \ - ; do echo "/$$x"; done; \ - fi; \ - for tdir in po $(GITIGNORE_TRANSLATION_DIRS); do \ - if test -f "$(srcdir)/$$tdir/Makefile.in.in"; then \ - for x in \ - $$tdir/Makefile.in.in \ - $$tdir/Makefile.in.in~ \ - $$tdir/Makefile.in \ - $$tdir/Makefile \ - $$tdir/Makevars.template \ - $$tdir/POTFILES \ - $$tdir/Rules-quot \ - $$tdir/stamp-it \ - $$tdir/stamp-po \ - $$tdir/.intltool-merge-cache \ - "$$tdir/*.gmo" \ - "$$tdir/*.header" \ - "$$tdir/*.mo" \ - "$$tdir/*.sed" \ - "$$tdir/*.sin" \ - $$tdir/$(GETTEXT_PACKAGE).pot \ - ; do echo "/$$x"; done; \ - fi; \ - for x in \ - ABOUT-NLS \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - ; do echo "/$$x"; done; \ - done; \ - if test -f $(srcdir)/configure; then \ - for x in \ - autom4te.cache \ - configure \ - config.h \ - stamp-h1 \ - libtool \ - config.lt \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(DEJATOOL)" = x; then :; else \ - for x in \ - $(DEJATOOL) \ - ; do echo "/$$x.sum"; echo "/$$x.log"; done; \ - echo /site.exp; \ - fi; \ - if test "x$(am__dirstamp)" = x; then :; else \ - echo "$(am__dirstamp)"; \ - fi; \ - if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \ - for x in \ - "*.lo" \ - ".libs" "_libs" \ - ; do echo "$$x"; done; \ - fi; \ - for x in \ - .gitignore \ - $(GITIGNOREFILES) \ - $(CLEANFILES) \ - $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \ - $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \ - $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ - so_locations \ - $(MOSTLYCLEANFILES) \ - $(TEST_LOGS) \ - $(TEST_LOGS:.log=.trs) \ - $(TEST_SUITE_LOG) \ - "*.gcda" \ - "*.gcno" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ - $(filter %_vala.stamp,$(DIST_COMMON)) \ - $(filter %.vapi,$(DIST_COMMON)) \ - $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \ - Makefile \ - Makefile.in \ - "*.orig" \ - "*.rej" \ - "*.bak" \ - "*~" \ - ".*.sw[nop]" \ - ".dirstamp" \ - ; do echo "/$$x"; done; \ - for x in \ - "*.$(OBJEXT)" \ - $(DEPDIR) \ - ; do echo "$$x"; done; \ - } | \ - sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ - sed 's@/[.]/@/@g' | \ - LC_ALL=C sort | uniq > $@.tmp && \ - mv $@.tmp $@; - -all: $(srcdir)/.gitignore gitignore-recurse-maybe -gitignore: $(srcdir)/.gitignore gitignore-recurse - -gitignore-recurse-maybe: - @for subdir in $(DIST_SUBDIRS); do \ - case " $(SUBDIRS) " in \ - *" $$subdir "*) :;; \ - *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \ - esac; \ - done -gitignore-recurse: - @for subdir in $(DIST_SUBDIRS); do \ - test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \ - done - -maintainer-clean: gitignore-clean -gitignore-clean: - -rm -f $(srcdir)/.gitignore - -.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe diff --git a/gtk/Makefile.am b/gtk/Makefile.am deleted file mode 100644 index 946e72febc..0000000000 --- a/gtk/Makefile.am +++ /dev/null @@ -1,749 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects - -include $(top_srcdir)/Makefile.decl - -GTK_BASE_CFLAGS_DEFINES = \ - -DG_LOG_USE_STRUCTURED=1 \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DGTK_COMPILATION \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED - -GTK_PLAT_CFLAGS_DEFINES = \ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_LOCALEDIR=\"$(localedir)\" \ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ - -DGTK_HOST=\"$(host)\" \ - -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" - -AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gtk\" \ - $(GTK_BASE_CFLAGS_DEFINES) \ - $(GTK_PLAT_CFLAGS_DEFINES) \ - -DX11_DATA_PREFIX=\"$(X11_PREFIX)\" \ - -DISO_CODES_PREFIX=\"$(ISO_CODES_PREFIX)\" \ - -I$(top_builddir) \ - -I$(top_builddir)/gtk \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - $(GMODULE_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(INCLUDED_IMMODULE_DEFINE) - -if OS_WIN32 -gtk_def = gtk.def -gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def - -gtk_win32_res = gtk-win32-res.o -gtk_win32_res_ldflag = -Wl,gtk-win32-res.o - -gtk-win32-res.o : gtk-win32.rc libgtk3.manifest - $(WINDRES) gtk-win32.rc $@ - -gtk-win32.rc: gtk-win32.rc.body - cat $< >>$@ - echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk3.manifest" >>$@ - -gtk.def: libgtk-3.la - echo "LIBRARY libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@ - echo "EXPORTS" >>$@ - objdump -p .libs/libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@ - -install-def-file: gtk.def - $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def -uninstall-def-file: - -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def -else -install-def-file: -uninstall-def-file: -endif - -if MS_LIB_AVAILABLE -noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib - -gtk-win32-$(GTK_API_VERSION).lib: libgtk-3.la gtk.def - lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@ - -install-ms-lib: - $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) - -uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/gtk-win32-$(GTK_API_VERSION).lib -else -install-ms-lib: -uninstall-ms-lib: -endif - -libadd = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GMODULE_LIBS) \ - $(GTK_DEP_LIBS) -deps = \ - $(top_builddir)/gdk/libgdk-3.la - -# libtool stuff: set version and export symbols for resolving -# since automake doesn't support conditionalized libsomething_la_LDFLAGS -# we use the general approach here -libtool_opts = \ - $(GTK_LINK_FLAGS) \ - -version-info $(LT_VERSION_INFO) \ - -export-dynamic $(no_undefined) \ - -rpath $(libdir) - - -included-modules: -if HAVE_INCLUDED_IMMMODULES - @cd $(top_builddir)/modules/input && $(MAKE) $(AM_MAKEFLAGS) included-modules - -libadd += $(INCLUDED_IMMODULE_OBJ) -deps += $(INCLUDED_IMMODULE_OBJ) - -$(INCLUDED_IMMODULE_OBJ): included-modules - @true -endif - -.PHONY: included-modules - -# -# setup source file variables -# - -include $(srcdir)/a11y/Makefile.inc -include $(srcdir)/deprecated/Makefile.inc -include $(srcdir)/inspector/Makefile.inc -include $(srcdir)/gtk-sources.inc - -# GTK+ header files for public installation (non-generated, or generated -# by configure) - -gtk_public_h_sources = $(GTK_PUB_HDRS) - -if OS_UNIX -gtk_unix_print_public_h_sources = $(GTK_UNIX_PRINT_PUB_HDRS) -endif - -gtk_private_type_h_sources = $(GTK_PRIVATE_TYPE_HDRS) - -# GTK+ header files that don't get installed -gtk_private_h_sources = \ - $(inspector_h_sources) \ - $(gtk_private_type_h_sources) \ - $(gtk_base_private_h_sources) - -# GTK+ C sources to build the library from -gtk_base_c_sources = \ - $(a11y_c_sources) \ - $(gtk_deprecated_c_sources) \ - $(inspector_c_sources) \ - $(gtk_base_c_sources_base) - -if USE_QUARTZ -gtk_base_c_sources += $(gtk_clipboard_dnd_c_sources_quartz) -else -gtk_base_c_sources += $(gtk_clipboard_dnd_c_sources_generic) -endif - -nodist_gtk_c_sources = -gtk_c_sources = $(gtk_base_c_sources) - -$(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml - $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.Gtk. \ - --c-namespace _Gtk \ - --generate-c-code gtkdbusgenerated \ - $(srcdir)/gtkdbusinterfaces.xml - -nodist_gtk_c_sources += $(gtk_dbus_built_sources) - -gtk_os_unix_c_sources = $(gtk_os_unix_c_sources_base) - -if OS_UNIX -gtk_private_h_sources += $(gtk_os_unix_private_h_sources) - -if HAVE_TRACKER3 -gtk_private_h_sources += $(gtk_os_unix_tracker3_private_h_sources) -gtk_os_unix_c_sources += $(gtk_os_unix_tracker3_c_sources) -endif - -gtk_c_sources += $(gtk_os_unix_c_sources) -endif - -if OS_WIN32 -gtk_private_h_sources += $(gtk_os_win32_private_h_sources) -gtk_c_sources += $(gtk_os_win32_c_sources) -endif - -if USE_X11 -gtk_c_sources += $(gtk_use_x11_c_sources) -gtk_private_h_sources += $(gtk_use_x11_private_h_sources) -endif - -if USE_WAYLAND -gtk_c_sources += $(gtk_use_wayland_c_sources) -endif - -# pretty tricky way to write USE_WAYLAND || USE_X11... -if USE_WAYLAND -gtk_c_sources += $(gtk_use_wayland_or_x11_c_sources) -else -if USE_X11 -gtk_c_sources += $(gtk_use_wayland_or_x11_c_sources) -else -endif -endif - -if USE_WIN32 -gtk_c_sources += $(gtk_use_win32_c_sources) -gtk_private_h_sources += $(gtk_use_win32_private_h_sources) -endif - -if USE_QUARTZ -gtk_c_sources += $(gtk_use_quartz_c_sources) -gtk_private_h_sources += $(gtk_use_quartz_private_h_sources) -endif - -gtk_all_private_h_sources = \ - $(a11y_private_h_sources) \ - $(gtk_deprecated_private_h_sources) \ - $(gtk_private_h_sources) \ - $(gtk_use_x11_private_h_sources) \ - $(gtk_use_win32_private_h_sources) \ - $(gtk_use_quartz_private_h_sources) - -if !USE_X11 -if !USE_WIN32 -if !USE_QUARTZ -gtk_c_sources += $(gtk_use_stub_c_sources) -endif -endif -endif - -# we use our own built_sources variable rules to avoid automake's -# BUILT_SOURCES oddities -# we generate frequently rebuild files piggyback on a stamp file, so sources -# depending on them only get rebuild when the built source actually changed -# content - -gtk_built_sources = \ - $(gtk_built_private_headers) \ - $(gtk_built_public_sources) \ - $(gtk_other_built_sources) - -nodist_gtk_c_sources += $(gtk_built_sources) - -stamp_files = \ - stamp-gtkmarshalers.h \ - stamp-gtktypebuiltins.h \ - stamp-gtkprivatetypebuiltins.h - -# -# setup GTK+ sources and their dependencies -# -MAINTAINERCLEANFILES = \ - $(gtk_built_sources) \ - $(gtk_dbus_built_sources) \ - $(print_portal_built_sources) \ - $(stamp_files) - -DISTCLEANFILES = gtktypefuncs.inc - -if OS_WIN32 -DISTCLEANFILES += gtk-win32.rc -endif - -EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources) - -# We need to dist this for `make distcheck`, apparently... -EXTRA_DIST += gtk.gresource.xml - - -pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION) -pkgdata_DATA = gtkbuilder.rng - -EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng - -itsdir = $(datadir)/gettext/its -its_DATA = gtkbuilder.loc gtkbuilder.its - -EXTRA_DIST += $(its_DATA) - -templates = \ - $(inspector_templates) \ - $(gtk_base_ui_templates) - -# -# rules to generate built sources -# -# setup autogeneration dependencies -gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf -CLEANFILES = $(gen_sources) - -BUILT_SOURCES = \ - $(gtk_built_sources) \ - $(gtk_dbus_built_sources) \ - $(print_portal_built_sources) - -# all autogenerated files need to be generated in the srcdir, -# so old versions get remade and are not confused with newer -# versions in the build dir. thus a development setup requires -# srcdir to be writable, passing --disable-rebuilds to -# ../configure will supress all autogeneration rules. -gtkmarshalers.h: stamp-gtkmarshalers.h - @true -stamp-gtkmarshalers.h: gtkmarshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) \ - --prefix=_gtk_marshal \ - --header \ - --valist-marshallers \ - $(srcdir)/gtkmarshalers.list >> xgen-gmlh \ - && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \ - && rm -f xgen-gmlh \ - && echo timestamp > $(@F) -gtkmarshalers.c: gtkmarshalers.list - $(AM_V_GEN) (echo "#undef G_ENABLE_DEBUG"; \ - $(GLIB_GENMARSHAL) \ - --prefix=_gtk_marshal \ - --body \ - --valist-marshallers $(srcdir)/gtkmarshalers.list) >> xgen-gmlc \ - && cp xgen-gmlc gtkmarshalers.c \ - && rm -f xgen-gmlc - -gtktypebuiltins.h: stamp-gtktypebuiltins.h - @true -stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.h.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbh \ - && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \ - && rm -f xgen-gtbh \ - && echo timestamp > $(@F) -gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.c.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbc \ - && cp xgen-gtbc gtktypebuiltins.c \ - && rm -f xgen-gtbc - -gtk.gresource.xml: Makefile.am inspector/Makefile.inc - $(AM_V_GEN) echo "" > $@; \ - echo "" >> $@; \ - echo " " >> $@; \ - echo " theme/Adwaita/gtk.css" >> $@; \ - echo " theme/Adwaita/gtk-dark.css" >> $@; \ - echo " theme/Adwaita/gtk-contained.css" >> $@; \ - echo " theme/Adwaita/gtk-contained-dark.css" >> $@; \ - for f in $(srcdir)/theme/Adwaita/assets/*.png; do \ - n=`basename $$f`; \ - echo " theme/Adwaita/assets/$$n" >> $@; \ - done; \ - for f in $(srcdir)/theme/Adwaita/assets/*.svg; do \ - n=`basename $$f`; \ - echo " theme/Adwaita/assets/$$n" >> $@; \ - done; \ - echo " theme/HighContrast/gtk.css" >> $@; \ - echo " theme/HighContrast/gtk-inverse.css" >> $@; \ - echo " theme/HighContrast/gtk-contained.css" >> $@; \ - echo " theme/HighContrast/gtk-contained-inverse.css" >> $@; \ - for f in $(srcdir)/theme/HighContrast/assets/*.png; do \ - n=`basename $$f`; \ - echo " theme/HighContrast/assets/$$n" >> $@; \ - done; \ - for f in $(srcdir)/theme/HighContrast/assets/*.svg; do \ - n=`basename $$f`; \ - echo " theme/HighContrast/assets/$$n" >> $@; \ - done; \ - echo " theme/win32/gtk-win32-base.css" >> $@; \ - echo " theme/win32/gtk.css" >> $@; \ - for f in $(srcdir)/cursor/*.png; do \ - n=`basename $$f`; \ - echo " cursor/$$n" >> $@; \ - done; \ - for f in $(srcdir)/gesture/*.symbolic.png; do \ - n=`basename $$f`; \ - echo " gesture/$$n" >> $@; \ - done; \ - for f in $(srcdir)/ui/*.ui; do \ - n=`basename $$f`; \ - echo " ui/$$n" >> $@; \ - done; \ - for s in 16x16 22x22 24x24 32x32 48x48; do \ - for c in actions status categories; do \ - for f in $(srcdir)/icons/$$s/$$c/*.png; do \ - test "$$f" = "$(srcdir)/icons/$$s/$$c/*.png" && continue; \ - n=`basename $$f`; \ - echo " icons/$$s/$$c/$$n" >> $@; \ - done; \ - done; \ - done; \ - for s in scalable; do \ - for c in status; do \ - for f in $(srcdir)/icons/$$s/$$c/*.svg; do \ - test "$$f" = "$(srcdir)/icons/$$s/$$c/*.svg" && continue; \ - n=`basename $$f`; \ - echo " icons/$$s/$$c/$$n" >> $@; \ - done; \ - done; \ - done; \ - for f in $(srcdir)/inspector/*.ui; do \ - n=`basename $$f`; \ - echo " inspector/$$n" >> $@; \ - done; \ - echo " inspector/logo.png" >> $@; \ - for f in $(srcdir)/emoji/*.data; do \ - n=`basename $$f`; \ - echo " emoji/$$n" >> $@; \ - done; \ - echo " " >> $@; \ - echo "" >> $@; - -adwaita_theme_scss = \ - $(adwaita_theme_scss_sources) \ - $() - -highcontrast_theme_scss = \ - $(highcontrast_theme_scss_sources) \ - $() - -if REBUILD_SCSS -# If we have sassc then we can rebuild the theme CSS as soon as the SCSS -# files have been changed - -scss_verbose = $(scss_verbose_@AM_V@) -scss_verbose_ = $(scss_verbose_@AM_DEFAULT_V@) -scss_verbose_0 = @echo " SCSS $@"; - -SASSC_OPTS = -a -M -t compact - -theme/Adwaita/gtk-contained.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained.scss $(adwaita_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ - -theme/Adwaita/gtk-contained-dark.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained-dark.scss $(adwaita_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ - -theme/HighContrast/gtk-contained.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained.scss $(highcontrast_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ - -theme/HighContrast/gtk-contained-inverse.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained-inverse.scss $(highcontrast_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ - -endif # REBUILD_SCSS - -theme_sources = \ - $(win32_theme_css_sources) \ - $(adwaita_theme_scss) \ - $(adwaita_theme_files) \ - $(highcontrast_theme_scss) \ - $(highcontrast_theme_css_sources) - -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/gtk.gresource.xml) - -gtkresources.h: gtk.gresource.xml - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ - --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register --internal -gtkresources.c: gtk.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ - --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register --internal - -gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h - @true -stamp-gtkprivatetypebuiltins.h: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \ - $(gtk_private_type_h_sources) ) > xgen-gptbh \ - && (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \ - && rm -f xgen-gptbh \ - && echo timestamp > $(@F) -gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.c.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \ - $(gtk_private_type_h_sources) ) > xgen-gptbc \ - && cp xgen-gptbc gtkprivatetypebuiltins.c \ - && rm -f xgen-gptbc - - -gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile - $(AM_V_GEN) export LC_ALL=C ; \ - (echo '#undef GTK_COMPILATION' && echo '#include ') > xgen-gtfsrc.c && \ - echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \ - ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ - $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ - sort | uniq | \ - $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \ - && cp xgen-gtf $@ && rm -f xgen-gtf -$(srcdir)/gtktestutils.c: gtktypefuncs.inc - -# target platform: -lib_LTLIBRARIES = libgtk-3.la - -gtkincludedir = $(includedir)/gtk-3.0/gtk -gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h - -a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y -a11yinclude_HEADERS= $(a11y_h_sources) - -deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated -deprecatedinclude_HEADERS= $(gtk_deprecated_h_sources) - -gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk -gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) - -nodist_libgtk_3_la_SOURCES = $(nodist_gtk_c_sources) -libgtk_3_la_SOURCES = $(gtk_c_sources) -libgtk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS) -libgtk_3_la_LDFLAGS = $(libtool_opts) -libgtk_3_la_LIBADD = $(libadd) -libgtk_3_la_DEPENDENCIES = $(deps) - -if USE_QUARTZ -libgtk_3_la_CFLAGS += "-xobjective-c" -endif - -if USE_WIN32 -libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -libgtk_3_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag) -libgtk_3_la_DEPENDENCIES += $(gtk_win32_res) -endif - -install-exec-hook: -if DISABLE_EXPLICIT_DEPS - $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la -endif - -if USE_QUARTZ -install-mac-key-theme: - $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0 - $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css -uninstall-mac-key-theme: - rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css -else -install-mac-key-theme: -uninstall-mac-key-theme: -endif - -# ------------------- MSVC Build Items ---------------- -MSVCPROJS = gtk-3 - -gtk_3_FILES = \ - $(gtk_base_c_sources) \ - $(gtk_os_win32_c_sources) \ - $(gtk_use_win32_c_sources) - -gtk_3_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: \ - $(top_builddir)/win32/vs9/gtk-3.vcproj - -# Install a RC file for the default GTK+ theme, and key themes -install-data-local: install-ms-lib install-def-file install-mac-key-theme - $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0 - $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css - $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0 - $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css - -uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme - rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css - rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css - -# if srcdir!=builddir, clean out maintainer-clean files from builddir -# this allows dist to pass. -distclean-local: - if test $(srcdir) != .; then \ - rm -f $(MAINTAINERCLEANFILES); \ - fi - -if HAVE_INTROSPECTION -introspected_pub_headers = $(filter-out %private.h gtktextdisplay.h gtktextlayout.h gtkx.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS)) - -introspection_files = \ - $(introspected_pub_headers) \ - $(filter-out %win32.c, $(gtk_base_c_sources)) \ - gtkprintoperation-unix.c \ - gtktypebuiltins.h \ - gtktypebuiltins.c - -if USE_X11 -introspection_files += \ - gtksocket.c \ - gtkplug.c -endif - -include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_SCANNER_ENV = CC="$(CC)" -INTROSPECTION_COMPILER_ARGS = \ - --includedir=$(srcdir) \ - --includedir=. \ - --includedir=../gdk - -Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile -Gtk_3_0_gir_SCANNERFLAGS = \ - --warn-all \ - --add-include-path=$(top_builddir)/gdk \ - --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir -Gtk_3_0_gir_INCLUDES = Atk-1.0 -Gtk_3_0_gir_C_INCLUDES = gtk/gtk.h gtk/gtk-a11y.h -if USE_X11 -Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11 -Gtk_3_0_gir_INCLUDES += xlib-2.0 -Gtk_3_0_gir_C_INCLUDES += gtk/gtkx.h -endif -Gtk_3_0_gir_CFLAGS = \ - $(AM_CPPFLAGS) \ - -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -Gtk_3_0_gir_FILES = $(introspection_files) -Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la -Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0 -INTROSPECTION_GIRS = Gtk-3.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif - -# -# Installed tools -# -bin_PROGRAMS = \ - gtk-query-immodules-3.0 \ - gtk-update-icon-cache \ - gtk-encode-symbolic-svg \ - gtk-builder-tool \ - gtk-query-settings \ - gtk-launch - -gtk_query_immodules_3_0_SOURCES = queryimmodules.c gtkutils.c -gtk_query_immodules_3_0_LDADD = \ - libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GMODULE_LIBS) \ - $(GTK_DEP_LIBS) - -gtk_update_icon_cache_SOURCES = updateiconcache.c -gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) - -gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c -gtk_encode_symbolic_svg_LDADD = \ - $(GDK_PIXBUF_LIBS) \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -gtk_builder_tool_SOURCES = gtk-builder-tool.c -gtk_builder_tool_LDADD = \ - libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -gtk_query_settings_SOURCES = gtk-query-settings.c -gtk_query_settings_LDADD= \ - libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -gtk_launch_SOURCES = gtk-launch.c -gtk_launch_LDADD = \ - libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -if OS_WIN32 - -# Workaround for UAC silliness: programs with "update" in their name -# are believed to be installers and require elevated privileges to be -# used... Embed a manifest file into executable to tell Windows that -# gtk-update-icon-cache.exe doesn't require any special privileges. - -GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest -GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc -GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o - -$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py - $(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir) - -$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST) - -$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST) - $(WINDRES) --input $< --output $@ --output-format=coff - -gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT) - -endif - -.PHONY: files - -files: - @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ - echo $$p; \ - done - -gsettings_SCHEMAS = \ - org.gtk.Settings.FileChooser.gschema.xml \ - org.gtk.Settings.ColorChooser.gschema.xml \ - org.gtk.Settings.EmojiChooser.gschema.xml \ - org.gtk.Settings.Debug.gschema.xml - -@GSETTINGS_RULES@ - -EXTRA_DIST += \ - $(resource_files) \ - $(gesture_sources) \ - $(theme_sources) \ - $(gsettings_SCHEMAS) \ - compose/compose-parse.py \ - emoji/convert-emoji.c \ - emoji/gresource.xml.in \ - emoji/README.md \ - emoji/de.data \ - emoji/en.data \ - emoji/es.data \ - emoji/fr.data \ - emoji/zh.data \ - a11y/Makefile.inc \ - deprecated/Makefile.inc \ - glade/README.glade \ - glade/gtk-private-widgets.xml \ - compose/gtk-compose-lookaside.txt \ - inspector/Makefile.inc \ - libgtk3.manifest.in \ - gtk-win32.rc.body.in \ - gtk-win32.rc.body \ - gtkwin32embed.h \ - gtkwin32embedwidget.h \ - gtkwin32embedwidget.c \ - gtkprint-win32.h \ - gtkprint-win32.c \ - gtksearchenginetracker3.c \ - gtksearchenginetracker3.h \ - gtksearchenginequartz.h \ - gtkdbusinterfaces.xml \ - gtk-keys.css.default \ - gtk-keys.css.emacs \ - gtk-keys.css.mac \ - makefile.msc \ - makefile.msc.in \ - gtktypebuiltins.c.template \ - gtktypebuiltins.h.template \ - gtkprivatetypebuiltins.c.template \ - gtkprivatetypebuiltins.h.template \ - meson.build \ - gen-gtk-gresources-xml.py \ - gen-rc.py \ - generate-uac-manifest.py \ - gentypefuncs.py \ - a11y/meson.build \ - deprecated/meson.build \ - inspector/meson.build \ - theme/Adwaita/meson.build \ - theme/Adwaita/parse-sass.sh \ - theme/Adwaita/render-assets.sh \ - theme/HighContrast/assets.svg \ - theme/HighContrast/assets.txt \ - theme/HighContrast/meson.build \ - theme/HighContrast/parse-sass.sh \ - theme/HighContrast/render-assets.sh - - --include $(top_srcdir)/git.mk diff --git a/gtk/a11y/Makefile.inc b/gtk/a11y/Makefile.inc deleted file mode 100644 index c116a1f131..0000000000 --- a/gtk/a11y/Makefile.inc +++ /dev/null @@ -1,135 +0,0 @@ -a11y_h_sources = \ - a11y/gtk-a11y-autocleanups.h \ - a11y/gtkarrowaccessible.h \ - a11y/gtkbooleancellaccessible.h \ - a11y/gtkbuttonaccessible.h \ - a11y/gtkcellaccessible.h \ - a11y/gtkcellaccessibleparent.h \ - a11y/gtkcheckmenuitemaccessible.h \ - a11y/gtkcomboboxaccessible.h \ - a11y/gtkcontaineraccessible.h \ - a11y/gtkcontainercellaccessible.h \ - a11y/gtkentryaccessible.h \ - a11y/gtkexpanderaccessible.h \ - a11y/gtkfilechooserwidgetaccessible.h \ - a11y/gtkflowboxaccessible.h \ - a11y/gtkflowboxchildaccessible.h \ - a11y/gtkframeaccessible.h \ - a11y/gtkheaderbaraccessible.h \ - a11y/gtkiconviewaccessible.h \ - a11y/gtkimageaccessible.h \ - a11y/gtkimagecellaccessible.h \ - a11y/gtklabelaccessible.h \ - a11y/gtklevelbaraccessible.h \ - a11y/gtklinkbuttonaccessible.h \ - a11y/gtklistboxaccessible.h \ - a11y/gtklistboxrowaccessible.h \ - a11y/gtklockbuttonaccessible.h \ - a11y/gtkmenuaccessible.h \ - a11y/gtkmenubuttonaccessible.h \ - a11y/gtkmenuitemaccessible.h \ - a11y/gtkmenushellaccessible.h \ - a11y/gtknotebookaccessible.h \ - a11y/gtknotebookpageaccessible.h \ - a11y/gtkpanedaccessible.h \ - a11y/gtkplugaccessible.h \ - a11y/gtkpopoveraccessible.h \ - a11y/gtkprogressbaraccessible.h \ - a11y/gtkradiobuttonaccessible.h \ - a11y/gtkradiomenuitemaccessible.h \ - a11y/gtkrangeaccessible.h \ - a11y/gtkrenderercellaccessible.h \ - a11y/gtkscaleaccessible.h \ - a11y/gtkscalebuttonaccessible.h \ - a11y/gtkscrolledwindowaccessible.h \ - a11y/gtksocketaccessible.h \ - a11y/gtkspinbuttonaccessible.h \ - a11y/gtkspinneraccessible.h \ - a11y/gtkstatusbaraccessible.h \ - a11y/gtkstackaccessible.h \ - a11y/gtkswitchaccessible.h \ - a11y/gtktextcellaccessible.h \ - a11y/gtktextviewaccessible.h \ - a11y/gtktogglebuttonaccessible.h \ - a11y/gtktoplevelaccessible.h \ - a11y/gtktreeviewaccessible.h \ - a11y/gtkwidgetaccessible.h \ - a11y/gtkwindowaccessible.h - -a11y_private_h_sources = \ - a11y/gtkaccessibility.h \ - a11y/gtkaccessibilitymisc.h \ - a11y/gtkaccessibilityutil.h \ - a11y/gtkcellaccessibleprivate.h \ - a11y/gtkcolorswatchaccessibleprivate.h \ - a11y/gtkcontaineraccessibleprivate.h \ - a11y/gtkiconviewaccessibleprivate.h \ - a11y/gtklabelaccessibleprivate.h \ - a11y/gtkflowboxaccessibleprivate.h \ - a11y/gtklistboxaccessibleprivate.h \ - a11y/gtklockbuttonaccessibleprivate.h \ - a11y/gtkstackaccessibleprivate.h \ - a11y/gtktextviewaccessibleprivate.h \ - a11y/gtktreeviewaccessibleprivate.h \ - a11y/gtkwidgetaccessibleprivate.h - -a11y_c_sources = \ - a11y/gtkaccessibility.c \ - a11y/gtkaccessibilitymisc.c \ - a11y/gtkaccessibilityutil.c \ - a11y/gtkarrowaccessible.c \ - a11y/gtkbooleancellaccessible.c \ - a11y/gtkbuttonaccessible.c \ - a11y/gtkcellaccessible.c \ - a11y/gtkcellaccessibleparent.c \ - a11y/gtkcheckmenuitemaccessible.c \ - a11y/gtkcolorswatchaccessible.c \ - a11y/gtkcomboboxaccessible.c \ - a11y/gtkcontaineraccessible.c \ - a11y/gtkcontainercellaccessible.c \ - a11y/gtkentryaccessible.c \ - a11y/gtkexpanderaccessible.c \ - a11y/gtkfilechooserwidgetaccessible.c \ - a11y/gtkflowboxaccessible.c \ - a11y/gtkflowboxchildaccessible.c \ - a11y/gtkframeaccessible.c \ - a11y/gtkheaderbaraccessible.c \ - a11y/gtkiconviewaccessible.c \ - a11y/gtkimageaccessible.c \ - a11y/gtkimagecellaccessible.c \ - a11y/gtklabelaccessible.c \ - a11y/gtklevelbaraccessible.c \ - a11y/gtklinkbuttonaccessible.c \ - a11y/gtklistboxaccessible.c \ - a11y/gtklistboxrowaccessible.c \ - a11y/gtklockbuttonaccessible.c \ - a11y/gtkmenuaccessible.c \ - a11y/gtkmenubuttonaccessible.c \ - a11y/gtkmenushellaccessible.c \ - a11y/gtkmenuitemaccessible.c \ - a11y/gtknotebookaccessible.c \ - a11y/gtknotebookpageaccessible.c \ - a11y/gtkpanedaccessible.c \ - a11y/gtkplugaccessible.c \ - a11y/gtkpopoveraccessible.c \ - a11y/gtkprogressbaraccessible.c \ - a11y/gtkradiobuttonaccessible.c \ - a11y/gtkradiomenuitemaccessible.c \ - a11y/gtkrangeaccessible.c \ - a11y/gtkrenderercellaccessible.c \ - a11y/gtkscaleaccessible.c \ - a11y/gtkscalebuttonaccessible.c \ - a11y/gtkscrolledwindowaccessible.c \ - a11y/gtksocketaccessible.c \ - a11y/gtkspinbuttonaccessible.c \ - a11y/gtkspinneraccessible.c \ - a11y/gtkstatusbaraccessible.c \ - a11y/gtkstackaccessible.c \ - a11y/gtkswitchaccessible.c \ - a11y/gtktextcellaccessible.c \ - a11y/gtktextviewaccessible.c \ - a11y/gtktogglebuttonaccessible.c \ - a11y/gtktoplevelaccessible.c \ - a11y/gtktreeviewaccessible.c \ - a11y/gtkwidgetaccessible.c \ - a11y/gtkwindowaccessible.c diff --git a/gtk/a11y/gtkcellaccessibleparent.c b/gtk/a11y/gtkcellaccessibleparent.c index bb0590c1ee..319a8426ee 100644 --- a/gtk/a11y/gtkcellaccessibleparent.c +++ b/gtk/a11y/gtkcellaccessibleparent.c @@ -23,7 +23,7 @@ GType gtk_cell_accessible_parent_get_type (void) { - static volatile gsize g_define_type_id__volatile = 0; + static gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc deleted file mode 100644 index d1cdc5cdce..0000000000 --- a/gtk/deprecated/Makefile.inc +++ /dev/null @@ -1,90 +0,0 @@ -gtk_deprecated_h_sources = \ - deprecated/gtkactivatable.h \ - deprecated/gtkaction.h \ - deprecated/gtkactiongroup.h \ - deprecated/gtkalignment.h \ - deprecated/gtkarrow.h \ - deprecated/gtkcolorsel.h \ - deprecated/gtkcolorseldialog.h \ - deprecated/gtkfontsel.h \ - deprecated/gtkgradient.h \ - deprecated/gtkhandlebox.h \ - deprecated/gtkhbbox.h \ - deprecated/gtkhbox.h \ - deprecated/gtkhpaned.h \ - deprecated/gtkhscale.h \ - deprecated/gtkhscrollbar.h \ - deprecated/gtkhseparator.h \ - deprecated/gtkhsv.h \ - deprecated/gtkiconfactory.h \ - deprecated/gtkimagemenuitem.h \ - deprecated/gtkmisc.h \ - deprecated/gtknumerableicon.h \ - deprecated/gtkradioaction.h \ - deprecated/gtkrc.h \ - deprecated/gtkrecentaction.h \ - deprecated/gtkstatusicon.h \ - deprecated/gtkstock.h \ - deprecated/gtkstyle.h \ - deprecated/gtkstyleproperties.h \ - deprecated/gtksymboliccolor.h \ - deprecated/gtktable.h \ - deprecated/gtktearoffmenuitem.h \ - deprecated/gtkthemingengine.h \ - deprecated/gtktoggleaction.h \ - deprecated/gtkuimanager.h \ - deprecated/gtkvbbox.h \ - deprecated/gtkvbox.h \ - deprecated/gtkvscale.h \ - deprecated/gtkvscrollbar.h \ - deprecated/gtkvseparator.h \ - deprecated/gtkvpaned.h - -gtk_deprecated_private_h_sources = \ - deprecated/gtkgradientprivate.h \ - deprecated/gtkiconfactoryprivate.h \ - deprecated/gtknumerableiconprivate.h \ - deprecated/gtkstylepropertiesprivate.h \ - deprecated/gtksymboliccolorprivate.h - -gtk_deprecated_c_sources = \ - deprecated/gtkactivatable.c \ - deprecated/gtkaction.c \ - deprecated/gtkactiongroup.c \ - deprecated/gtkalignment.c \ - deprecated/gtkarrow.c \ - deprecated/gtkcolorsel.c \ - deprecated/gtkcolorseldialog.c \ - deprecated/gtkfontsel.c \ - deprecated/gtkgradient.c \ - deprecated/gtkhandlebox.c \ - deprecated/gtkhbbox.c \ - deprecated/gtkhbox.c \ - deprecated/gtkhpaned.c \ - deprecated/gtkhscale.c \ - deprecated/gtkhscrollbar.c \ - deprecated/gtkhseparator.c \ - deprecated/gtkhsv.c \ - deprecated/gtkiconfactory.c \ - deprecated/gtkimagemenuitem.c \ - deprecated/gtkmisc.c \ - deprecated/gtknumerableicon.c \ - deprecated/gtkradioaction.c \ - deprecated/gtkrc.c \ - deprecated/gtkrecentaction.c \ - deprecated/gtkstatusicon.c \ - deprecated/gtkstock.c \ - deprecated/gtkstyle.c \ - deprecated/gtkstyleproperties.c \ - deprecated/gtksymboliccolor.c \ - deprecated/gtktable.c \ - deprecated/gtktearoffmenuitem.c \ - deprecated/gtkthemingengine.c \ - deprecated/gtktoggleaction.c \ - deprecated/gtkuimanager.c \ - deprecated/gtkvbbox.c \ - deprecated/gtkvbox.c \ - deprecated/gtkvscale.c \ - deprecated/gtkvscrollbar.c \ - deprecated/gtkvseparator.c \ - deprecated/gtkvpaned.c diff --git a/gtk/gtk-sources.inc b/gtk/gtk-sources.inc deleted file mode 100644 index a073ada426..0000000000 --- a/gtk/gtk-sources.inc +++ /dev/null @@ -1,1066 +0,0 @@ -# List of headers to be passed into glib-mkenums - - -# GTK+ header files for public installation (non-generated, or generated -# by configure) - -GTK_PUB_HDRS = \ - gtk.h \ - gtk-autocleanups.h \ - gtkx.h \ - gtkx-autocleanups.h \ - gtk-a11y.h \ - gtkaboutdialog.h \ - gtkaccelgroup.h \ - gtkaccellabel.h \ - gtkaccelmap.h \ - gtkaccessible.h \ - gtkactionable.h \ - gtkactionbar.h \ - gtkadjustment.h \ - gtkappchooser.h \ - gtkappchooserbutton.h \ - gtkappchooserdialog.h \ - gtkappchooserwidget.h \ - gtkapplication.h \ - gtkapplicationwindow.h \ - gtkaspectframe.h \ - gtkassistant.h \ - gtkbbox.h \ - gtkbin.h \ - gtkbindings.h \ - gtkborder.h \ - gtkbox.h \ - gtkbuilder.h \ - gtkbuildable.h \ - gtkbutton.h \ - gtkcalendar.h \ - gtkcellarea.h \ - gtkcellareacontext.h \ - gtkcellareabox.h \ - gtkcelleditable.h \ - gtkcelllayout.h \ - gtkcellrenderer.h \ - gtkcellrendereraccel.h \ - gtkcellrenderercombo.h \ - gtkcellrendererpixbuf.h \ - gtkcellrendererprogress.h \ - gtkcellrendererspin.h \ - gtkcellrendererspinner.h\ - gtkcellrenderertext.h \ - gtkcellrenderertoggle.h \ - gtkcellview.h \ - gtkcheckbutton.h \ - gtkcheckmenuitem.h \ - gtkclipboard.h \ - gtkcolorbutton.h \ - gtkcolorchooser.h \ - gtkcolorchooserwidget.h \ - gtkcolorchooserdialog.h \ - gtkcolorutils.h \ - gtkcombobox.h \ - gtkcomboboxtext.h \ - gtkcontainer.h \ - gtkcssprovider.h \ - gtkcsssection.h \ - gtkdebug.h \ - gtkdialog.h \ - gtkdnd.h \ - gtkdragdest.h \ - gtkdragsource.h \ - gtkdrawingarea.h \ - gtkeditable.h \ - gtkentry.h \ - gtkentrybuffer.h \ - gtkentrycompletion.h \ - gtkenums.h \ - gtkeventbox.h \ - gtkeventcontroller.h \ - gtkeventcontrollerkey.h \ - gtkeventcontrollermotion.h \ - gtkeventcontrollerscroll.h \ - gtkexpander.h \ - gtkfilechooser.h \ - gtkfilechooserbutton.h \ - gtkfilechooserdialog.h \ - gtkfilechoosernative.h \ - gtkfilechooserwidget.h \ - gtkfilefilter.h \ - gtkfixed.h \ - gtkflowbox.h \ - gtkfontbutton.h \ - gtkfontchooser.h \ - gtkfontchooserdialog.h \ - gtkfontchooserwidget.h \ - gtkframe.h \ - gtkgesture.h \ - gtkgesturedrag.h \ - gtkgesturelongpress.h \ - gtkgesturemultipress.h \ - gtkgesturepan.h \ - gtkgesturerotate.h \ - gtkgesturesingle.h \ - gtkgesturestylus.h \ - gtkgestureswipe.h \ - gtkgesturezoom.h \ - gtkglarea.h \ - gtkgrid.h \ - gtkheaderbar.h \ - gtkicontheme.h \ - gtkiconview.h \ - gtkimage.h \ - gtkimcontext.h \ - gtkimcontextinfo.h \ - gtkimcontextsimple.h \ - gtkimmodule.h \ - gtkimmulticontext.h \ - gtkinfobar.h \ - gtkinvisible.h \ - gtklabel.h \ - gtklayout.h \ - gtklevelbar.h \ - gtklinkbutton.h \ - gtklistbox.h \ - gtkliststore.h \ - gtklockbutton.h \ - gtkmain.h \ - gtkmenu.h \ - gtkmenubar.h \ - gtkmenubutton.h \ - gtkmenuitem.h \ - gtkmenushell.h \ - gtkmenutoolbutton.h \ - gtkmessagedialog.h \ - gtkmodelbutton.h \ - gtkmodules.h \ - gtkmountoperation.h \ - gtknativedialog.h \ - gtknotebook.h \ - gtkoffscreenwindow.h \ - gtkorientable.h \ - gtkoverlay.h \ - gtkpadcontroller.h \ - gtkpagesetup.h \ - gtkpaned.h \ - gtkpapersize.h \ - gtkplacessidebar.h \ - gtkplug.h \ - gtkpopover.h \ - gtkpopovermenu.h \ - gtkprintcontext.h \ - gtkprintoperation.h \ - gtkprintoperationpreview.h \ - gtkprintsettings.h \ - gtkprogressbar.h \ - gtkradiobutton.h \ - gtkradiomenuitem.h \ - gtkradiotoolbutton.h \ - gtkrange.h \ - gtkrecentchooser.h \ - gtkrecentchooserdialog.h \ - gtkrecentchoosermenu.h \ - gtkrecentchooserwidget.h \ - gtkrecentfilter.h \ - gtkrecentmanager.h \ - gtkrender.h \ - gtkrevealer.h \ - gtkscale.h \ - gtkscalebutton.h \ - gtkscrollable.h \ - gtkscrollbar.h \ - gtkscrolledwindow.h \ - gtksearchbar.h \ - gtksearchentry.h \ - gtkselection.h \ - gtkseparator.h \ - gtkseparatormenuitem.h \ - gtkseparatortoolitem.h \ - gtksettings.h \ - gtkshortcutlabel.h \ - gtkshortcutsgroup.h \ - gtkshortcutssection.h \ - gtkshortcutsshortcut.h \ - gtkshortcutswindow.h \ - gtkshow.h \ - gtkstacksidebar.h \ - gtksizegroup.h \ - gtksizerequest.h \ - gtksocket.h \ - gtkspinbutton.h \ - gtkspinner.h \ - gtkstack.h \ - gtkstackswitcher.h \ - gtkstatusbar.h \ - gtkstylecontext.h \ - gtkstyleprovider.h \ - gtkswitch.h \ - gtktestutils.h \ - gtktextattributes.h \ - gtktextbuffer.h \ - gtktextbufferrichtext.h \ - gtktextchild.h \ - gtktextdisplay.h \ - gtktextiter.h \ - gtktextmark.h \ - gtktexttag.h \ - gtktexttagtable.h \ - gtktextview.h \ - gtktogglebutton.h \ - gtktoggletoolbutton.h \ - gtktoolbar.h \ - gtktoolbutton.h \ - gtktoolitem.h \ - gtktoolitemgroup.h \ - gtktoolpalette.h \ - gtktoolshell.h \ - gtktooltip.h \ - gtktreednd.h \ - gtktreemodel.h \ - gtktreemodelfilter.h \ - gtktreemodelsort.h \ - gtktreeselection.h \ - gtktreesortable.h \ - gtktreestore.h \ - gtktreeview.h \ - gtktreeviewcolumn.h \ - gtktypes.h \ - gtkviewport.h \ - gtkvolumebutton.h \ - gtkwidget.h \ - gtkwidgetpath.h \ - gtkwindow.h \ - gtkwindowgroup.h - -GTK_PRIVATE_TYPE_HDRS = \ - gtkcsstypesprivate.h \ - gtktexthandleprivate.h - -GTK_UNIX_PRINT_PUB_HDRS = \ - gtkpagesetupunixdialog.h \ - gtkprintunixdialog.h \ - gtkprinter.h \ - gtkprintjob.h \ - gtkunixprint-autocleanups.h \ - gtkunixprint.h - -# Installed header files without compatibility guarantees -# that are not included in gtk/gtk.h -gtk_semi_private_h_sources = \ - gtktextlayout.h - -# Base non-generated private headers -gtk_base_private_h_sources = \ - gtkactionmuxer.h \ - gtkactionobserver.h \ - gtkactionobservable.h \ - gtkadjustmentprivate.h \ - gtkapplicationaccelsprivate.h \ - gtkapplicationprivate.h \ - gtkaccelgroupprivate.h \ - gtkaccelmapprivate.h \ - gtkactionhelper.h \ - gtkallocatedbitmaskprivate.h \ - gtkappchooserprivate.h \ - gtkbindingsprivate.h \ - gtkbitmaskprivate.h \ - gtkbitmaskprivateimpl.h \ - gtkbookmarksmanager.h \ - gtkboxprivate.h \ - gtkboxgadgetprivate.h \ - gtkbuilderprivate.h \ - gtkbuiltiniconprivate.h \ - gtkbuttonprivate.h \ - gtkcairoblurprivate.h \ - gtkcellareaboxcontextprivate.h \ - gtkcheckbuttonprivate.h \ - gtkcheckmenuitemprivate.h \ - gtkclipboardprivate.h \ - gtkcolorswatchprivate.h \ - gtkcoloreditorprivate.h \ - gtkcolorpickerprivate.h \ - gtkcolorpickerkwinprivate.h \ - gtkcolorpickerportalprivate.h \ - gtkcolorpickershellprivate.h \ - gtkcolorplaneprivate.h \ - gtkcolorscaleprivate.h \ - gtkcolorchooserprivate.h \ - gtkcomboboxprivate.h \ - gtkcomposetable.h \ - gtkcontainerprivate.h \ - gtkcssanimationprivate.h \ - gtkcssanimatedstyleprivate.h \ - gtkcssarrayvalueprivate.h \ - gtkcssbgsizevalueprivate.h \ - gtkcssbordervalueprivate.h \ - gtkcsscalcvalueprivate.h \ - gtkcsscolorvalueprivate.h \ - gtkcsscornervalueprivate.h \ - gtkcsscustomgadgetprivate.h \ - gtkcsscustompropertyprivate.h \ - gtkcssdimensionvalueprivate.h \ - gtkcsseasevalueprivate.h \ - gtkcssenginevalueprivate.h \ - gtkcssenumvalueprivate.h \ - gtkcssgadgetprivate.h \ - gtkcssiconthemevalueprivate.h \ - gtkcssimagebuiltinprivate.h \ - gtkcssimagecrossfadeprivate.h \ - gtkcssimagefallbackprivate.h \ - gtkcssimagegradientprivate.h \ - gtkcssimageiconthemeprivate.h \ - gtkcssimagelinearprivate.h \ - gtkcssimageradialprivate.h \ - gtkcssimageprivate.h \ - gtkcssimagesurfaceprivate.h \ - gtkcssimageurlprivate.h \ - gtkcssimagerecolorprivate.h \ - gtkcssimagescaledprivate.h \ - gtkcssimagevalueprivate.h \ - gtkcssimagewin32private.h \ - gtkcssinheritvalueprivate.h \ - gtkcssinitialvalueprivate.h \ - gtkcsskeyframesprivate.h \ - gtkcsslookupprivate.h \ - gtkcssmatcherprivate.h \ - gtkcssnodeprivate.h \ - gtkcssnodedeclarationprivate.h \ - gtkcssnodestylecacheprivate.h \ - gtkcssnumbervalueprivate.h \ - gtkcsspalettevalueprivate.h \ - gtkcssparserprivate.h \ - gtkcsspathnodeprivate.h \ - gtkcsspositionvalueprivate.h \ - gtkcssproviderprivate.h \ - gtkcssrepeatvalueprivate.h \ - gtkcssrgbavalueprivate.h \ - gtkcsssectionprivate.h \ - gtkcssselectorprivate.h \ - gtkcssshadowsvalueprivate.h \ - gtkcssshadowvalueprivate.h \ - gtkcssshorthandpropertyprivate.h \ - gtkcssstaticstyleprivate.h \ - gtkcssstringvalueprivate.h \ - gtkcssstylefuncsprivate.h \ - gtkcssstylechangeprivate.h \ - gtkcssstyleprivate.h \ - gtkcssstylepropertyprivate.h \ - gtkcsstransformvalueprivate.h \ - gtkcsstransientnodeprivate.h \ - gtkcsstransitionprivate.h \ - gtkcsstypedvalueprivate.h \ - gtkcssunsetvalueprivate.h \ - gtkcssvalueprivate.h \ - gtkcsswin32sizevalueprivate.h \ - gtkcsswidgetnodeprivate.h \ - gtkcustompaperunixdialog.h \ - gtkdialogprivate.h \ - gtkdndprivate.h \ - gtkemojichooser.h \ - gtkemojicompletion.h \ - gtkentryprivate.h \ - gtkeventcontrollerprivate.h \ - gtkfilechooserembed.h \ - gtkfilechooserentry.h \ - gtkfilechooserprivate.h \ - gtkfilechoosernativeprivate.h \ - gtkfilechooserwidgetprivate.h \ - gtkfilechooserutils.h \ - gtkfilefilterprivate.h \ - gtkfilesystem.h \ - gtkfilesystemmodel.h \ - gtkfontchooserprivate.h \ - gtkfontchooserutils.h \ - gtkfontchooserwidgetprivate.h \ - gtkgestureprivate.h \ - gtkgesturedragprivate.h \ - gtkgesturelongpressprivate.h \ - gtkgesturemultipressprivate.h \ - gtkgesturepanprivate.h \ - gtkgesturerotateprivate.h \ - gtkgesturesingleprivate.h \ - gtkgesturestylusprivate.h \ - gtkgestureswipeprivate.h \ - gtkgesturezoomprivate.h \ - gtkheaderbarprivate.h \ - gtkhslaprivate.h \ - gtkiconcache.h \ - gtkiconhelperprivate.h \ - gtkiconprivate.h \ - gtkiconthemeprivate.h \ - gtkiconviewprivate.h \ - gtkimagedefinitionprivate.h \ - gtkimageprivate.h \ - gtkimmoduleprivate.h \ - gtkimcontextsimpleseqs.h \ - gtkintl.h \ - gtkkeyhash.h \ - gtkkineticscrolling.h \ - gtklabelprivate.h \ - gtklockbuttonprivate.h \ - gtkmagnifierprivate.h \ - gtkmenubuttonprivate.h \ - gtkmenuprivate.h \ - gtkmenuitemprivate.h \ - gtkmenusectionbox.h \ - gtkmenushellprivate.h \ - gtkmenutracker.h \ - gtkmenutrackeritem.h \ - gtkmnemonichash.h \ - gtkmodelmenuitem.h \ - gtkmodifierstyle.h \ - gtkmodulesprivate.h \ - gtkmountoperationprivate.h \ - gtknativedialogprivate.h \ - gtkorientableprivate.h \ - gtkpango.h \ - gtkpathbar.h \ - gtkplacessidebarprivate.h \ - gtkplacesviewprivate.h \ - gtkplacesviewrowprivate.h \ - gtkpopoverprivate.h \ - gtkprintoperation-private.h \ - gtkprintutils.h \ - gtkprivate.h \ - gtkpixelcacheprivate.h \ - gtkprogresstrackerprivate.h \ - gtkquery.h \ - gtkrangeprivate.h \ - gtkrbtree.h \ - gtkrecentchooserdefault.h \ - gtkrecentchooserprivate.h \ - gtkrecentchooserutils.h \ - gtkrenderbackgroundprivate.h \ - gtkrenderborderprivate.h \ - gtkrendericonprivate.h \ - gtkrenderprivate.h \ - gtkresources.h \ - gtkroundedboxprivate.h \ - gtksearchengine.h \ - gtksearchenginesimple.h \ - gtksearchenginemodel.h \ - gtksearchentryprivate.h \ - gtkselectionprivate.h \ - gtksettingsprivate.h \ - gtkshortcutswindowprivate.h \ - gtkshortcutsshortcutprivate.h \ - gtksidebarrowprivate.h \ - gtksizegroup-private.h \ - gtksizerequestcacheprivate.h \ - gtksocketprivate.h \ - gtkstyleanimationprivate.h \ - gtkstylecascadeprivate.h \ - gtkstylecontextprivate.h \ - gtkstylepropertyprivate.h \ - gtkstyleproviderprivate.h \ - gtktextattributesprivate.h \ - gtktextbtree.h \ - gtktextbufferprivate.h \ - gtktextbufferserialize.h \ - gtktextchildprivate.h \ - gtktexthandleprivate.h \ - gtktextiterprivate.h \ - gtktextmarkprivate.h \ - gtktextsegment.h \ - gtktexttagprivate.h \ - gtktexttagtableprivate.h \ - gtktexttypes.h \ - gtktextutil.h \ - gtktrashmonitor.h \ - gtktogglebuttonprivate.h \ - gtktoolbarprivate.h \ - gtktoolpaletteprivate.h \ - gtktooltipprivate.h \ - gtktooltipwindowprivate.h \ - gtktreedatalist.h \ - gtktreeprivate.h \ - gtkutilsprivate.h \ - gtkwidgetprivate.h \ - gtkwidgetpathprivate.h \ - gtkwin32drawprivate.h \ - gtkwin32themeprivate.h \ - gtkwindowprivate.h \ - gtktreemenu.h \ - gdkpixbufutilsprivate.h \ - open-type-layout.h \ - language-names.h \ - script-names.h - -# GTK base sources (had to split those in 2 parts to avoid U1095 error :|, order unchanged from before) -# gtk_base_c_sources_base_gtka_gtkh: sources from gtka* to gtkh*, mostly -# gtk_base_c_sources_base_gtki_gtkw: sources from gtki* to gtkw*, mostly -gtk_base_c_sources_base_gtka_gtkh = \ - gtkactionmuxer.c \ - gtkactionobserver.c \ - gtkactionobservable.c \ - gtkactionable.c \ - gtkquery.c \ - gtksearchbar.c \ - gtksearchentry.c \ - gtksearchengine.c \ - gtksearchenginesimple.c \ - gtksearchenginemodel.c \ - fnmatch.c \ - gtkaboutdialog.c \ - gtkaccelgroup.c \ - gtkaccellabel.c \ - gtkaccelmap.c \ - gtkaccessible.c \ - gtkactionbar.c \ - gtkactionhelper.c \ - gtkadjustment.c \ - gtkallocatedbitmask.c \ - gtkappchooser.c \ - gtkappchooserwidget.c \ - gtkappchooserbutton.c \ - gtkappchooserdialog.c \ - gtkapplication.c \ - gtkapplicationaccels.c \ - gtkapplicationimpl.c \ - gtkapplicationwindow.c \ - gtkaspectframe.c \ - gtkassistant.c \ - gtkbbox.c \ - gtkbin.c \ - gtkbindings.c \ - gtkbookmarksmanager.c \ - gtkborder.c \ - gtkbox.c \ - gtkboxgadget.c \ - gtkbuildable.c \ - gtkbuilder.c \ - gtkbuilderparser.c \ - gtkbuilder-menus.c \ - gtkbuiltinicon.c \ - gtkbutton.c \ - gtkcairoblur.c \ - gtkcalendar.c \ - gtkcellarea.c \ - gtkcellareabox.c \ - gtkcellareaboxcontext.c \ - gtkcellareacontext.c \ - gtkcelleditable.c \ - gtkcelllayout.c \ - gtkcellrenderer.c \ - gtkcellrendereraccel.c \ - gtkcellrenderercombo.c \ - gtkcellrendererpixbuf.c \ - gtkcellrendererprogress.c \ - gtkcellrendererspin.c \ - gtkcellrendererspinner.c \ - gtkcellrenderertext.c \ - gtkcellrenderertoggle.c \ - gtkcellview.c \ - gtkcheckbutton.c \ - gtkcheckmenuitem.c \ - gtkcolorbutton.c \ - gtkcolorchooser.c \ - gtkcolorchooserwidget.c \ - gtkcolorchooserdialog.c \ - gtkcoloreditor.c \ - gtkcolorpicker.c \ - gtkcolorpickerkwin.c \ - gtkcolorpickerportal.c \ - gtkcolorpickershell.c \ - gtkcolorplane.c \ - gtkcolorscale.c \ - gtkcolorswatch.c \ - gtkcolorutils.c \ - gtkcombobox.c \ - gtkcomboboxtext.c \ - gtkcomposetable.c \ - gtkcontainer.c \ - gtkcssanimation.c \ - gtkcssanimatedstyle.c \ - gtkcssarrayvalue.c \ - gtkcssbgsizevalue.c \ - gtkcssbordervalue.c \ - gtkcsscalcvalue.c \ - gtkcsscolorvalue.c \ - gtkcsscornervalue.c \ - gtkcsscustomgadget.c \ - gtkcsscustomproperty.c \ - gtkcssdimensionvalue.c \ - gtkcsseasevalue.c \ - gtkcssenumvalue.c \ - gtkcssenginevalue.c \ - gtkcssgadget.c \ - gtkcssiconthemevalue.c \ - gtkcssimage.c \ - gtkcssimagebuiltin.c \ - gtkcssimagecrossfade.c \ - gtkcssimagefallback.c \ - gtkcssimagegradient.c \ - gtkcssimageicontheme.c \ - gtkcssimagelinear.c \ - gtkcssimageradial.c \ - gtkcssimagesurface.c \ - gtkcssimageurl.c \ - gtkcssimagerecolor.c \ - gtkcssimagescaled.c \ - gtkcssimagevalue.c \ - gtkcssimagewin32.c \ - gtkcssinheritvalue.c \ - gtkcssinitialvalue.c \ - gtkcsskeyframes.c \ - gtkcsslookup.c \ - gtkcssmatcher.c \ - gtkcssnode.c \ - gtkcssnodedeclaration.c \ - gtkcssnodestylecache.c \ - gtkcssnumbervalue.c \ - gtkcsspalettevalue.c \ - gtkcssparser.c \ - gtkcsspathnode.c \ - gtkcsspositionvalue.c \ - gtkcssprovider.c \ - gtkcssrepeatvalue.c \ - gtkcssrgbavalue.c \ - gtkcsssection.c \ - gtkcssselector.c \ - gtkcssstringvalue.c \ - gtkcssstyle.c \ - gtkcssstylechange.c \ - gtkcssshadowsvalue.c \ - gtkcssshadowvalue.c \ - gtkcssshorthandproperty.c \ - gtkcssshorthandpropertyimpl.c \ - gtkcssstaticstyle.c \ - gtkcssstylefuncs.c \ - gtkcssstyleproperty.c \ - gtkcssstylepropertyimpl.c \ - gtkcsstransformvalue.c \ - gtkcsstransientnode.c \ - gtkcsstransition.c \ - gtkcsstypedvalue.c \ - gtkcssunsetvalue.c \ - gtkcsstypes.c \ - gtkcssvalue.c \ - gtkcsswidgetnode.c \ - gtkcsswin32sizevalue.c \ - gtkdialog.c \ - gtkdragsource.c \ - gtkdrawingarea.c \ - gtkeditable.c \ - gtkemojichooser.c \ - gtkemojicompletion.c \ - gtkentry.c \ - gtkentrybuffer.c \ - gtkentrycompletion.c \ - gtkeventbox.c \ - gtkeventcontroller.c \ - gtkeventcontrollerkey.c \ - gtkeventcontrollermotion.c \ - gtkeventcontrollerscroll.c \ - gtkexpander.c \ - gtkfilechooser.c \ - gtkfilechooserbutton.c \ - gtkfilechooserdialog.c \ - gtkfilechooserembed.c \ - gtkfilechooserentry.c \ - gtkfilechoosernative.c \ - gtkfilechoosernativeportal.c \ - gtkfilechooserutils.c \ - gtkfilechooserwidget.c \ - gtkfilefilter.c \ - gtkfilesystem.c \ - gtkfilesystemmodel.c \ - gtkfixed.c \ - gtkflowbox.c \ - gtkfontbutton.c \ - gtkfontchooser.c \ - gtkfontchooserdialog.c \ - gtkfontchooserutils.c \ - gtkfontchooserwidget.c \ - gtkframe.c \ - gtkgladecatalog.c \ - gtkgesture.c \ - gtkgesturedrag.c \ - gtkgesturelongpress.c \ - gtkgesturemultipress.c \ - gtkgesturepan.c \ - gtkgesturerotate.c \ - gtkgesturesingle.c \ - gtkgesturestylus.c \ - gtkgestureswipe.c \ - gtkgesturezoom.c \ - gtkglarea.c \ - gtkgrid.c \ - gtkheaderbar.c \ - gtkhsla.c - -gtk_base_c_sources_base_gtki_gtkw = \ - gtkicon.c \ - gtkiconcache.c \ - gtkiconcachevalidator.c \ - gtkiconhelper.c \ - gtkicontheme.c \ - gtkiconview.c \ - gtkimage.c \ - gtkimagedefinition.c \ - gtkimcontext.c \ - gtkimcontextsimple.c \ - gtkimmodule.c \ - gtkimmulticontext.c \ - gtkinfobar.c \ - gtkinvisible.c \ - gtkkeyhash.c \ - gtkkineticscrolling.c \ - gtklabel.c \ - gtklayout.c \ - gtklevelbar.c \ - gtklinkbutton.c \ - gtklistbox.c \ - gtkliststore.c \ - gtklockbutton.c \ - gtkmain.c \ - gtkmagnifier.c \ - gtkmenu.c \ - gtkmenubar.c \ - gtkmenubutton.c \ - gtkmenuitem.c \ - gtkmenusectionbox.c \ - gtkmenushell.c \ - gtkmenutracker.c \ - gtkmenutrackeritem.c \ - gtkmenutoolbutton.c \ - gtkmessagedialog.c \ - gtkmnemonichash.c \ - gtkmodelmenuitem.c \ - gtkmodelbutton.c \ - gtkmodifierstyle.c \ - gtkmodules.c \ - gtkmountoperation.c \ - gtknativedialog.c \ - gtknotebook.c \ - gtkoffscreenwindow.c \ - gtkorientable.c \ - gtkoverlay.c \ - gtkpadcontroller.c \ - gtkpagesetup.c \ - gtkpaned.c \ - gtkpango.c \ - gtkpapersize.c \ - gtkpathbar.c \ - gtkplacessidebar.c \ - gtkplacesview.c \ - gtkplacesviewrow.c \ - gtkprintcontext.c \ - gtkprintoperation.c \ - gtkprintoperationpreview.c \ - gtkprintsettings.c \ - gtkprintutils.c \ - gtkprivate.c \ - gtkprogressbar.c \ - gtkprogresstracker.c \ - gtkpixelcache.c \ - gtkpopover.c \ - gtkpopovermenu.c \ - gtkradiobutton.c \ - gtkradiomenuitem.c \ - gtkradiotoolbutton.c \ - gtkrange.c \ - gtkrbtree.c \ - gtkrecentchooserdefault.c \ - gtkrecentchooserdialog.c \ - gtkrecentchoosermenu.c \ - gtkrecentchooserwidget.c \ - gtkrecentchooserutils.c \ - gtkrecentchooser.c \ - gtkrecentfilter.c \ - gtkrecentmanager.c \ - gtkrender.c \ - gtkrenderbackground.c \ - gtkrenderborder.c \ - gtkrendericon.c \ - gtkrevealer.c \ - gtkroundedbox.c \ - gtkscale.c \ - gtkscalebutton.c \ - gtkscrollable.c \ - gtkscrollbar.c \ - gtkscrolledwindow.c \ - gtkselection.c \ - gtkseparator.c \ - gtkseparatormenuitem.c \ - gtkseparatortoolitem.c \ - gtksettings.c \ - gtkshortcutsgroup.c \ - gtkshortcutlabel.c \ - gtkshortcutsshortcut.c \ - gtkshortcutssection.c \ - gtkshortcutswindow.c \ - gtksidebarrow.c \ - gtksizegroup.c \ - gtksizerequest.c \ - gtksizerequestcache.c \ - gtkshow.c \ - gtkstacksidebar.c \ - gtkspinbutton.c \ - gtkspinner.c \ - gtkstack.c \ - gtkstackswitcher.c \ - gtkstatusbar.c \ - gtkstyleanimation.c \ - gtkstylecascade.c \ - gtkstylecontext.c \ - gtkstyleproperty.c \ - gtkstyleprovider.c \ - gtkstyleproviderprivate.c \ - gtkswitch.c \ - gtktestutils.c \ - gtktextattributes.c \ - gtktextbtree.c \ - gtktextbuffer.c \ - gtktextbufferrichtext.c \ - gtktextbufferserialize.c \ - gtktextchild.c \ - gtktextdisplay.c \ - gtktexthandle.c \ - gtktextiter.c \ - gtktextlayout.c \ - gtktextmark.c \ - gtktextsegment.c \ - gtktexttag.c \ - gtktexttagtable.c \ - gtktexttypes.c \ - gtktextutil.c \ - gtktextview.c \ - gtktogglebutton.c \ - gtktoggletoolbutton.c \ - gtktoolbar.c \ - gtktoolbutton.c \ - gtktoolitem.c \ - gtktoolitemgroup.c \ - gtktoolpalette.c \ - gtktoolshell.c \ - gtktooltip.c \ - gtktooltipwindow.c \ - gtktrashmonitor.c \ - gtktreedatalist.c \ - gtktreednd.c \ - gtktreemenu.c \ - gtktreemodel.c \ - gtktreemodelfilter.c \ - gtktreemodelsort.c \ - gtktreeselection.c \ - gtktreesortable.c \ - gtktreestore.c \ - gtktreeview.c \ - gtktreeviewcolumn.c \ - gtkutils.c \ - gtkvolumebutton.c \ - gtkviewport.c \ - gtkwidget.c \ - gtkwidgetpath.c \ - gtkwindow.c \ - gtkwindowgroup.c \ - gtkwin32draw.c \ - gtkwin32theme.c \ - gdkpixbufutils.c \ - language-names.c \ - script-names.c - -gtk_base_c_sources_base = $(gtk_base_c_sources_base_gtka_gtkh) $(gtk_base_c_sources_base_gtki_gtkw) - -# Clipboard/dnd platform-specific sources -gtk_clipboard_dnd_c_sources_quartz = \ - gtkclipboard-quartz.c \ - gtkdnd-quartz.c - -gtk_clipboard_dnd_c_sources_generic = \ - gtkclipboard.c \ - gtkdnd.c \ - gtkdragdest.c - -# Stub sources -gtk_use_stub_c_sources = \ - gtkmountoperation-stub.c - -# Base platform-specific sources -gtk_os_unix_c_sources_base = \ - gtkcustompaperunixdialog.c \ - gtkpagesetupunixdialog.c \ - gtkprinter.c \ - gtkprinteroption.c \ - gtkprinteroptionset.c \ - gtkprinteroptionwidget.c \ - gtkprintjob.c \ - gtkprintoperation-unix.c \ - gtkprintoperation-portal.h \ - gtkprintoperation-portal.c \ - gtkprintunixdialog.c \ - gtkprintbackend.c \ - gtksearchenginetracker.c - -gtk_os_unix_private_h_sources = \ - gtkiconcachevalidator.h \ - gtkprintbackend.h \ - gtkprinter-private.h \ - gtkprinteroption.h \ - gtkprinteroptionset.h \ - gtkprinteroptionwidget.h \ - gtksearchenginetracker.h - -gtk_os_unix_tracker3_private_h_sources = gtksearchenginetracker3.h -gtk_os_unix_tracker3_c_sources = gtksearchenginetracker3.c - -gtk_use_wayland_c_sources = \ - gtkapplication-wayland.c - -gtk_use_wayland_or_x11_c_sources = \ - gtkapplication-dbus.c - -gtk_use_x11_c_sources = \ - gtkplug.c \ - gtksocket.c \ - gtkxembed.c \ - deprecated/gtktrayicon-x11.c \ - gtkapplication-x11.c \ - gtkmountoperation-x11.c - -gtk_use_x11_private_h_sources = \ - gtkxembed.h \ - deprecated/gtktrayicon.h \ - xembed.h - -gtk_os_win32_c_sources = \ - gtkprint-win32.c \ - gtkprintoperation-win32.c \ - gtkfilechoosernativewin32.c \ - gtkwin32.c - -gtk_os_win32_private_h_sources = gtkprint-win32.h - -gtk_use_win32_private_h_sources = \ - gtkwin32embed.h \ - gtkwin32embedwidget.h - -gtk_use_win32_c_sources = \ - gtkwin32embed.c \ - gtkwin32embedwidget.c \ - $(gtk_use_stub_c_sources) - -gtk_use_quartz_c_sources = \ - gtksearchenginequartz.c \ - $(gtk_use_stub_c_sources) \ - gtkapplication-quartz.c \ - gtkapplication-quartz-menu.c \ - gtkfilechoosernativequartz.c \ - gtkquartz.c - -gtk_use_quartz_private_h_sources = \ - gtksearchenginequartz.h \ - gtkquartz.h - -# Generated sources -# built sources that get installed with the header files -gtk_built_public_sources = \ - gtktypebuiltins.h - -# built headers that don't get installed -gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h - -gtk_built_private_headers = \ - gtkresources.h \ - gtkmarshalers.h \ - gtkprivatetypebuiltins.h - -gtk_other_built_sources = \ - gtkresources.c \ - gtk.gresource.xml \ - gtktypebuiltins.c \ - gtkmarshalers.c \ - gtkprivatetypebuiltins.c - -# non-header sources (headers should be specified in the above variables) -# that don't serve as direct make target sources, i.e. they don't have -# their own .lo rules and don't get publically installed -gtk_extra_sources = \ - paper_names.c \ - paper_names_offsets.c \ - gen-paper-names.c \ - deprecated/gtkstatusicon-quartz.c \ - gtkversion.h.in \ - gtkmarshalers.list \ - fallback-c89.c - -# Resources -# Base UI templates -gtk_base_ui_templates = \ - ui/gtkapplication-quartz.ui \ - ui/gtkaboutdialog.ui \ - ui/gtkactionbar.ui \ - ui/gtkappchooserdialog.ui \ - ui/gtkappchooserwidget.ui \ - ui/gtkassistant.ui \ - ui/gtkcolorchooserdialog.ui \ - ui/gtkcoloreditor.ui \ - ui/gtkcombobox.ui \ - ui/gtkdialog.ui \ - ui/gtkfilechooserbutton.ui \ - ui/gtkemojichooser.ui \ - ui/gtkfilechooserwidget.ui \ - ui/gtkfilechooserdialog.ui \ - ui/gtkfontbutton.ui \ - ui/gtkfontchooserdialog.ui \ - ui/gtkfontchooserwidget.ui \ - ui/gtkinfobar.ui \ - ui/gtklockbutton.ui \ - ui/gtkmessagedialog.ui \ - ui/gtkpagesetupunixdialog.ui \ - ui/gtkpathbar.ui \ - ui/gtkplacesview.ui \ - ui/gtkplacesviewrow.ui \ - ui/gtkprintunixdialog.ui \ - ui/gtkrecentchooserdefault.ui \ - ui/gtksearchbar.ui \ - ui/gtkscalebutton.ui \ - ui/gtkstatusbar.ui \ - ui/gtktooltipwindow.ui \ - ui/gtkvolumebutton.ui \ - ui/gtksidebarrow.ui - -gesture_sources = \ - gesture/gesture-pinch-symbolic.svg \ - gesture/gesture-stretch-symbolic.svg \ - gesture/gesture-rotate-clockwise-symbolic.svg \ - gesture/gesture-rotate-anticlockwise-symbolic.svg \ - gesture/gesture-two-finger-swipe-left-symbolic.svg \ - gesture/gesture-two-finger-swipe-right-symbolic.svg - -adwaita_theme_css_sources = \ - theme/Adwaita/gtk-contained.css \ - theme/Adwaita/gtk-contained-dark.css \ - theme/Adwaita/gtk.css \ - theme/Adwaita/gtk-dark.css - -adwaita_theme_scss_sources = \ - theme/Adwaita/_colors-public.scss \ - theme/Adwaita/_colors.scss \ - theme/Adwaita/_common.scss \ - theme/Adwaita/_drawing.scss \ - theme/Adwaita/gtk-contained-dark.scss \ - theme/Adwaita/gtk-contained.scss - -adwaita_theme_files = \ - theme/Adwaita/assets.txt \ - theme/Adwaita/assets.svg \ - theme/Adwaita/README \ - $(adwaita_theme_css_sources) - -highcontrast_theme_css_sources = \ - theme/HighContrast/gtk-contained.css \ - theme/HighContrast/gtk-contained-inverse.css \ - theme/HighContrast/gtk.css \ - theme/HighContrast/gtk-inverse.css - -highcontrast_theme_scss_sources = \ - theme/HighContrast/_colors-hc.scss \ - theme/HighContrast/gtk-contained-inverse.scss \ - theme/HighContrast/gtk-contained.scss - -win32_theme_css_sources = \ - theme/win32/gtk.css \ - theme/win32/gtk-win32-base.css - - diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index b0caf16fdf..2484a580fb 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -2227,7 +2227,7 @@ _gtk_clipboard_store_all (void) * * Gets the selection that this clipboard is for. * - * Returns: the selection + * Returns: (transfer none): the selection * * Since: 3.22 */ diff --git a/gtk/gtkeventcontrollerscroll.h b/gtk/gtkeventcontrollerscroll.h index 8b785a8a0f..3a39062c6e 100644 --- a/gtk/gtkeventcontrollerscroll.h +++ b/gtk/gtkeventcontrollerscroll.h @@ -69,11 +69,11 @@ GDK_AVAILABLE_IN_3_24 GtkEventController *gtk_event_controller_scroll_new (GtkWidget *widget, GtkEventControllerScrollFlags flags); GDK_AVAILABLE_IN_3_24 -void gtk_event_controller_scroll_set_flags (GtkEventControllerScroll *controller, +void gtk_event_controller_scroll_set_flags (GtkEventControllerScroll *scroll, GtkEventControllerScrollFlags flags); GDK_AVAILABLE_IN_3_24 GtkEventControllerScrollFlags - gtk_event_controller_scroll_get_flags (GtkEventControllerScroll *controller); + gtk_event_controller_scroll_get_flags (GtkEventControllerScroll *scroll); G_END_DECLS diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 468ef2ae87..8ba764cf01 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -4232,7 +4232,7 @@ gtk_label_style_updated (GtkWidget *widget) if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_FONT)) { gtk_label_clear_layout (GTK_LABEL (widget)); - gtk_widget_queue_resize (label); + gtk_widget_queue_resize (widget); } if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_ATTRS) || diff --git a/gtk/gtkprivatetypebuiltins.c.template b/gtk/gtkprivatetypebuiltins.c.template index d7961be8ef..031ffb8020 100644 --- a/gtk/gtkprivatetypebuiltins.c.template +++ b/gtk/gtkprivatetypebuiltins.c.template @@ -14,7 +14,7 @@ GType _@enum_name@_get_type (void) { - static volatile gsize g_define_type_id__volatile = 0; + static gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template index 9a5a360f09..844e546b3d 100644 --- a/gtk/gtktypebuiltins.c.template +++ b/gtk/gtktypebuiltins.c.template @@ -13,7 +13,7 @@ GType @enum_name@_get_type (void) { - static volatile gsize g_define_type_id__volatile = 0; + static gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { diff --git a/gtk/inspector/Makefile.inc b/gtk/inspector/Makefile.inc deleted file mode 100644 index 7641d3a9e5..0000000000 --- a/gtk/inspector/Makefile.inc +++ /dev/null @@ -1,79 +0,0 @@ -inspector_c_sources = \ - inspector/action-editor.c \ - inspector/actions.c \ - inspector/cellrenderergraph.c \ - inspector/css-editor.c \ - inspector/css-node-tree.c \ - inspector/data-list.c \ - inspector/general.c \ - inspector/gestures.c \ - inspector/graphdata.c \ - inspector/gtkstackcombo.c \ - inspector/gtktreemodelcssnode.c \ - inspector/init.c \ - inspector/inspect-button.c \ - inspector/magnifier.c \ - inspector/menu.c \ - inspector/misc-info.c \ - inspector/object-hierarchy.c \ - inspector/object-tree.c \ - inspector/prop-editor.c \ - inspector/prop-list.c \ - inspector/resource-list.c \ - inspector/selector.c \ - inspector/signals-list.c \ - inspector/size-groups.c \ - inspector/statistics.c \ - inspector/strv-editor.c \ - inspector/treewalk.c \ - inspector/visual.c \ - inspector/window.c - -inspector_h_sources = \ - inspector/action-editor.h \ - inspector/actions.h \ - inspector/cellrenderergraph.h \ - inspector/css-editor.h \ - inspector/css-node-tree.h \ - inspector/data-list.h \ - inspector/general.h \ - inspector/gestures.h \ - inspector/graphdata.h \ - inspector/gtkstackcombo.h \ - inspector/gtktreemodelcssnode.h \ - inspector/init.h \ - inspector/magnifier.h \ - inspector/menu.h \ - inspector/misc-info.h \ - inspector/object-hierarchy.h \ - inspector/object-tree.h \ - inspector/prop-editor.h \ - inspector/prop-list.h \ - inspector/resource-list.h \ - inspector/selector.h \ - inspector/signals-list.h \ - inspector/size-groups.h \ - inspector/statistics.h \ - inspector/strv-editor.h \ - inspector/treewalk.h \ - inspector/visual.h \ - inspector/window.h - -inspector_templates = \ - inspector/actions.ui \ - inspector/css-editor.ui \ - inspector/css-node-tree.ui \ - inspector/data-list.ui \ - inspector/general.ui \ - inspector/magnifier.ui \ - inspector/menu.ui \ - inspector/misc-info.ui \ - inspector/object-hierarchy.ui \ - inspector/object-tree.ui \ - inspector/prop-list.ui \ - inspector/resource-list.ui \ - inspector/selector.ui \ - inspector/signals-list.ui \ - inspector/statistics.ui \ - inspector/visual.ui \ - inspector/window.ui diff --git a/gtk/meson.build b/gtk/meson.build index 79f4f0d234..21540dd93b 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -847,7 +847,7 @@ gtk_deps = [ ] if x11_enabled - x11_data_prefix = dependency('x11').get_pkgconfig_variable('prefix') + x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix') gtk_cargs += [ '-DX11_DATA_PREFIX="@0@"'.format(x11_data_prefix), ] gtk_sources += gtk_use_x11_sources @@ -1147,8 +1147,6 @@ gtk_launch = executable( ) gtk_tools += gtk_launch -if meson.version().version_compare('>=0.54.0') - foreach tool: gtk_tools - meson.override_find_program(tool.name(), tool) - endforeach -endif +foreach tool: gtk_tools + meson.override_find_program(tool.name(), tool) +endforeach diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am deleted file mode 100644 index 0b389ad8b8..0000000000 --- a/libgail-util/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -include $(top_srcdir)/Makefile.decl -include libgail-util-sources.inc - -EXTRA_DIST += \ - gailutil.def \ - meson.build - -if OS_WIN32 -export_symbols = -export-symbols $(srcdir)/gailutil.def -gailutil.def: libgailutil-3.la - echo "LIBRARY libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE)" >$@ - echo "EXPORTS" >>$@ - objdump -p .libs/libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE).dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@ -install-def-file: gailutil.def - $(INSTALL) gailutil.def $(DESTDIR)$(libdir) -uninstall-def-file: - -rm $(DESTDIR)$(libdir)/gailutil.def -else -install-def-file: -uninstall-def-file: -endif - -if MS_LIB_AVAILABLE -noinst_DATA = gailutil.lib - -install-ms-lib: - $(INSTALL) gailutil.lib $(DESTDIR)$(libdir) - -uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/gailutil.lib -else -install-ms-lib: -uninstall-ms-lib: -endif - - -lib_LTLIBRARIES = libgailutil-3.la - -libgailutilincludedir=$(includedir)/gail-3.0/libgail-util - -libgailutil_3_la_SOURCES = \ - $(util_c_sources) - -libgailutilinclude_HEADERS = \ - $(util_public_h_sources) - -libgailutil_3_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gtk \ - -I$(top_builddir)/gtk \ - $(AM_CPPFLAGS) \ - -DGDK_DISABLE_DEPRECATED\ - -DGTK_DISABLE_DEPRECATED - -libgailutil_3_la_CFLAGS = \ - $(GTK_DEP_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(AM_CFLAGS) - -libgailutil_3_la_LIBADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -libgailutil_3_la_LDFLAGS = \ - -version-info $(GAIL_LT_VERSION_INFO) \ - $(no_undefined) \ - $(LDFLAGS) - -gailutil.lib: libgailutil-3.la gailutil.def - lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@ - -install-data-local: install-ms-lib install-def-file - -uninstall-local: uninstall-ms-lib uninstall-def-file - -# ------------------- MSVC Build Items ---------------- -MSVCPROJS = gailutil-3 - -gailutil_3_FILES = $(libgailutil_3_la_SOURCES) - -gailutil_3_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: \ - $(top_builddir)/win32/vs9/gailutil-3.vcproj - --include $(top_srcdir)/git.mk diff --git a/libgail-util/libgail-util-sources.inc b/libgail-util/libgail-util-sources.inc deleted file mode 100644 index 4f71e1aa62..0000000000 --- a/libgail-util/libgail-util-sources.inc +++ /dev/null @@ -1,10 +0,0 @@ -# Source listings for libgail-util - -util_c_sources = \ - gailmisc.c \ - gailtextutil.c - -util_public_h_sources = \ - gailmisc.h \ - gailtextutil.h \ - gail-util.h diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index d425a9182e..0000000000 --- a/m4/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -!/ax_prog_cc_for_build.m4 -!/pkg_config_for_build.m4 -*.m4 diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 deleted file mode 100644 index 21256bf25b..0000000000 --- a/m4/ax_prog_cc_for_build.m4 +++ /dev/null @@ -1,127 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_CC_FOR_BUILD -# -# DESCRIPTION -# -# This macro searches for a C compiler that generates native executables, -# that is a C compiler that surely is not a cross-compiler. This can be -# useful if you have to generate source code at compile-time like for -# example GCC does. -# -# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything -# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). -# The value of these variables can be overridden by the user by specifying -# a compiler with an environment variable (like you do for standard CC). -# -# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object -# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if -# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are -# substituted in the Makefile. -# -# LICENSE -# -# Copyright (c) 2008 Paolo Bonzini -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 7 - -AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) -AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_REQUIRE([AC_EXEEXT])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl - -dnl Use the standard macros, but make them use other variable names -dnl -pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl -pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl -pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl -pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl -pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl -pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl -pushdef([ac_cv_objext], ac_cv_build_objext)dnl -pushdef([ac_exeext], ac_build_exeext)dnl -pushdef([ac_objext], ac_build_objext)dnl -pushdef([CC], CC_FOR_BUILD)dnl -pushdef([CPP], CPP_FOR_BUILD)dnl -pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl -pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl -pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl -pushdef([LIBS], LIBS_FOR_BUILD)dnl -pushdef([host], build)dnl -pushdef([host_alias], build_alias)dnl -pushdef([host_cpu], build_cpu)dnl -pushdef([host_vendor], build_vendor)dnl -pushdef([host_os], build_os)dnl -pushdef([ac_cv_host], ac_cv_build)dnl -pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl -pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl -pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl -pushdef([ac_cv_host_os], ac_cv_build_os)dnl -pushdef([ac_cpp], ac_build_cpp)dnl -pushdef([ac_compile], ac_build_compile)dnl -pushdef([ac_link], ac_build_link)dnl - -save_cross_compiling=$cross_compiling -save_ac_tool_prefix=$ac_tool_prefix -cross_compiling=no -ac_tool_prefix= - -AC_PROG_CC -AC_PROG_CPP -AC_EXEEXT - -ac_tool_prefix=$save_ac_tool_prefix -cross_compiling=$save_cross_compiling - -dnl Restore the old definitions -dnl -popdef([ac_link])dnl -popdef([ac_compile])dnl -popdef([ac_cpp])dnl -popdef([ac_cv_host_os])dnl -popdef([ac_cv_host_vendor])dnl -popdef([ac_cv_host_cpu])dnl -popdef([ac_cv_host_alias])dnl -popdef([ac_cv_host])dnl -popdef([host_os])dnl -popdef([host_vendor])dnl -popdef([host_cpu])dnl -popdef([host_alias])dnl -popdef([host])dnl -popdef([LIBS])dnl -popdef([LDFLAGS])dnl -popdef([CPPFLAGS])dnl -popdef([CFLAGS])dnl -popdef([CPP])dnl -popdef([CC])dnl -popdef([ac_objext])dnl -popdef([ac_exeext])dnl -popdef([ac_cv_objext])dnl -popdef([ac_cv_exeext])dnl -popdef([ac_cv_prog_cc_g])dnl -popdef([ac_cv_prog_cc_cross])dnl -popdef([ac_cv_prog_cc_works])dnl -popdef([ac_cv_prog_gcc])dnl -popdef([ac_cv_prog_CPP])dnl - -dnl Finally, set Makefile variables -dnl -BUILD_EXEEXT=$ac_build_exeext -BUILD_OBJEXT=$ac_build_objext -AC_SUBST(BUILD_EXEEXT)dnl -AC_SUBST(BUILD_OBJEXT)dnl -AC_SUBST([CFLAGS_FOR_BUILD])dnl -AC_SUBST([CPPFLAGS_FOR_BUILD])dnl -AC_SUBST([LDFLAGS_FOR_BUILD])dnl -]) diff --git a/m4/pkg_config_for_build.m4 b/m4/pkg_config_for_build.m4 deleted file mode 100644 index 0422f482f2..0000000000 --- a/m4/pkg_config_for_build.m4 +++ /dev/null @@ -1,20 +0,0 @@ -# PKG_PROG_PKG_CONFIG_FOR_BUILD([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG_FOR_BUILD], -[m4_pattern_allow([^PKG_CONFIG_FOR_BUILD$]) -AC_ARG_VAR([PKG_CONFIG_FOR_BUILD], [path to build system's pkg-config utility]) - -if test "x$ac_cv_env_PKG_CONFIG_FOR_BUILD_set" != "xset"; then - AC_PATH_PROG([PKG_CONFIG_FOR_BUILD], [pkg-config]) -fi -if test -n "$PKG_CONFIG_FOR_BUILD"; then - _pkg_for_build_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([build system's pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG_FOR_BUILD --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG_FOR_BUILD="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG_FOR_BUILD diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am deleted file mode 100644 index c053ced4d2..0000000000 --- a/m4macros/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -installed_m4= gtk-3.0.m4 - -EXTRA_DIST += $(installed_m4) - -m4datadir = $(datadir)/aclocal -m4data_DATA = $(installed_m4) - --include $(top_srcdir)/git.mk diff --git a/makefile.msc b/makefile.msc deleted file mode 100644 index 3af6b7c911..0000000000 --- a/makefile.msc +++ /dev/null @@ -1,24 +0,0 @@ -## Makefile for building the Gtk+ dlls with Microsoft C -## Use: nmake -f makefile.msc - -PARTS = gdk gtk tests - -all : \ - config.h \ - sub-all - -sub-all: - for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=all - -clean : sub-clean - -sub-clean: - for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean - -sub-one: - @cd $(THIS) - @nmake -nologo -f makefile.msc $(TARGET) - @cd .. - -config.h: config.h.win32 - copy config.h.win32 config.h diff --git a/meson.build b/meson.build index f2e63a8655..8726822897 100644 --- a/meson.build +++ b/meson.build @@ -1,11 +1,12 @@ -project('gtk+-3.0', 'c', - version: '3.24.35', - default_options: [ - 'buildtype=debugoptimized', - 'warning_level=1' - ], - meson_version : '>= 0.48.0', - license: 'LGPLv2.1+') +project('gtk+', 'c', + version: '3.24.35', + default_options: [ + 'buildtype=debugoptimized', + 'warning_level=1' + ], + meson_version : '>= 0.60.0', + license: 'LGPL-2.1-or-later', +) glib_major_req = 2 glib_minor_req = 57 @@ -189,11 +190,6 @@ cdata.set_quoted('GTK_DATADIR', gtk_datadir) cdata.set_quoted('GTK_LIBDIR', gtk_libdir) cdata.set_quoted('GTK_SYSCONFDIR', gtk_sysconfdir) cdata.set_quoted('GETTEXT_PACKAGE', 'gtk30') -cdata.set('GTK_MAJOR_VERSION', gtk_major_version) -cdata.set('GTK_MINOR_VERSION', gtk_minor_version) -cdata.set('GTK_MICRO_VERSION', gtk_micro_version) -cdata.set('GTK_BINARY_AGE', gtk_binary_age) -cdata.set('GTK_INTERFACE_AGE', gtk_interface_age) cdata.set_quoted('PACKAGE_URL', '') cdata.set_quoted('PACKAGE_NAME', 'gtk+') @@ -420,25 +416,9 @@ if pangoft_dep.found() # We get the dependency itself from pango, but pango doesn't care # about ft2 version, so an extra check is needed. - # Update once Meson can have deps declared in a declarative manner - ft2_dep = dependency('freetype2', version: '>= 2.7.1', required: false) - - if not ft2_dep.found() and cc.get_id() == 'msvc' - if cc.has_header('ft2build.h') and cc.has_header('freetype/ftmm.h') - ft_lib = cc.find_library('freetype', required: false) - if ft_lib.found() - if cc.has_function('FT_Get_Var_Design_Coordinates', dependencies: ft_lib, - prefix: '''#include - #include FT_MULTIPLE_MASTERS_H''') - ft2_dep = ft_lib - endif - endif - endif - endif - - if not ft2_dep.found() - ft2_dep = dependency('freetype2', version: '>= 2.7.1', fallback : ['freetype2', 'freetype_dep']) - endif + ft2_dep = dependency(['freetype2','FreeType'], + version: '>= 2.7.1', + fallback : ['freetype2', 'freetype_dep']) endif if win32_enabled @@ -497,7 +477,7 @@ if tracker3_enabled endif if iso_codes_dep.found() - cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix')) + cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) else cdata.set_quoted('ISO_CODES_PREFIX', get_option('prefix')) endif @@ -865,7 +845,10 @@ if os_darwin module_suffix = 'so' endif -build_gir = get_option('introspection') +# Introspection +gir = find_program('g-ir-scanner', required : get_option('introspection')) +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection')) + subdir('gdk') subdir('gtk') subdir('modules') @@ -882,9 +865,10 @@ if get_option('examples') endif # config.h -configure_file(input: 'config.h.meson', - output: 'config.h', - configuration: cdata) +configure_file( + output: 'config.h', + configuration: cdata, +) # pkg-config files - bit of a mess all of this pkgconf = configuration_data() @@ -1010,21 +994,11 @@ subdir('docs/reference') install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) if not meson.is_cross_build() - if meson.version().version_compare('>=0.57.0') - gnome.post_install( - glib_compile_schemas: true, - gio_querymodules: gio_module_dirs, - gtk_update_icon_cache: get_option('demos'), - ) - else - # Keep this in sync with post-install.py expected arguments - meson.add_install_script('build-aux/meson/post-install.py', - gtk_api_version, - gtk_binary_version, - join_paths(gtk_prefix, get_option('bindir')), - gtk_libdir, - gtk_datadir) - endif + gnome.post_install( + glib_compile_schemas: true, + gio_querymodules: gio_module_dirs, + gtk_update_icon_cache: get_option('demos'), + ) else message('Not executing post-install steps automatically when cross compiling') endif @@ -1036,16 +1010,6 @@ if host_machine.system() != 'windows' install_dir : join_paths(gtk_datadir, 'gtk-3.0', 'valgrind')) endif -test( - 'version-check', - find_program('check-version.py'), - args: [ - join_paths(meson.current_source_dir(), 'configure.ac'), - join_paths(meson.current_source_dir(), 'meson.build'), - ], - suite: 'gtk', -) - summary = [ '', '------', diff --git a/modules/Makefile.am b/modules/Makefile.am deleted file mode 100644 index b8dc2eea59..0000000000 --- a/modules/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -SUBDIRS = input - -if OS_UNIX -SUBDIRS += printbackends -endif - -EXTRA_DIST += \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am deleted file mode 100644 index ea00aea8d3..0000000000 --- a/modules/input/Makefile.am +++ /dev/null @@ -1,342 +0,0 @@ -## Makefile.am for gtk+/modules/input -include $(top_srcdir)/Makefile.decl - -AM_CPPFLAGS = \ - -DGTK_LOCALEDIR=\"$(localedir)\" \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_XIM_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - -DGTK_COMPILATION \ - $(INCLUDED_IMMODULE_DEFINE) - -DEPS = \ - $(top_builddir)/gtk/libgtk-3.la - -LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules - -im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_xim_la_SOURCES = \ - gtkimcontextxim.c \ - gtkimcontextxim.h \ - imxim.c -libstatic_im_xim_la_SOURCES = $(im_xim_la_SOURCES) -im_xim_la_LIBADD = $(LDADDS) -if USE_X11 -if INCLUDE_IM_XIM -STATIC_XIM_MODULE = libstatic-im-xim.la -else -XIM_MODULE=im-xim.la -endif -endif - -im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_am_et_la_SOURCES = imam-et.c -libstatic_im_am_et_la_SOURCES = $(im_am_et_la_SOURCES) -im_am_et_la_LIBADD = $(LDADDS) -if INCLUDE_IM_AM_ET -STATIC_AM_ET_MODULE = libstatic-im-am-et.la -else -AM_ET_MODULE = im-am-et.la -endif - -im_cedilla_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_cedilla_la_SOURCES = imcedilla.c -libstatic_im_cedilla_la_SOURCES = $(im_cedilla_la_SOURCES) -im_cedilla_la_LIBADD = $(LDADDS) -if INCLUDE_IM_CEDILLA -STATIC_CEDILLA_MODULE = libstatic-im-cedilla.la -else -CEDILLA_MODULE = im-cedilla.la -endif - -im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c -libstatic_im_cyrillic_translit_la_SOURCES = $(im_cyrillic_translit_la_SOURCES) -im_cyrillic_translit_la_LIBADD = $(LDADDS) -if INCLUDE_IM_CYRILLIC_TRANSLIT -STATIC_CYRILLIC_TRANSLIT_MODULE = libstatic-im-cyrillic-translit.la -else -CYRILLIC_TRANSLIT_MODULE = im-cyrillic-translit.la -endif - -im_ti_er_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_ti_er_la_SOURCES = imti-er.c -libstatic_im_ti_er_la_SOURCES = $(im_ti_er_la_SOURCES) -im_ti_er_la_LIBADD = $(LDADDS) -if INCLUDE_IM_TI_ER -STATIC_TI_ER_MODULE = libstatic-im-ti-er.la -else -TI_ER_MODULE = im-ti-er.la -endif - -im_ti_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_ti_et_la_SOURCES = imti-et.c -libstatic_im_ti_et_la_SOURCES = $(im_ti_et_la_SOURCES) -im_ti_et_la_LIBADD = $(LDADDS) -if INCLUDE_IM_TI_ET -STATIC_TI_ET_MODULE = libstatic-im-ti-et.la -else -TI_ET_MODULE = im-ti-et.la -endif - -im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_thai_la_SOURCES = \ - thai-charprop.c \ - thai-charprop.h \ - gtkimcontextthai.c \ - gtkimcontextthai.h \ - imthai.c -libstatic_im_thai_la_SOURCES = $(im_thai_la_SOURCES) -im_thai_la_LIBADD = $(LDADDS) -if INCLUDE_IM_THAI -STATIC_THAI_MODULE = libstatic-im-thai.la -else -THAI_MODULE = im-thai.la -endif - -im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_viqr_la_SOURCES = imviqr.c -libstatic_im_viqr_la_SOURCES = $(im_viqr_la_SOURCES) -im_viqr_la_LIBADD = $(LDADDS) -if INCLUDE_IM_VIQR -STATIC_VIQR_MODULE = libstatic-im-viqr.la -else -VIQR_MODULE = im-viqr.la -endif - -im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_inuktitut_la_SOURCES = iminuktitut.c -libstatic_im_inuktitut_la_SOURCES = $(im_inuktitut_la_SOURCES) -im_inuktitut_la_LIBADD = $(LDADDS) -if INCLUDE_IM_INUKTITUT -STATIC_INUKTITUT_MODULE = libstatic-im-inuktitut.la -else -INUKTITUT_MODULE = im-inuktitut.la -endif - -im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_ipa_la_SOURCES = imipa.c -libstatic_im_ipa_la_SOURCES = $(im_ipa_la_SOURCES) -im_ipa_la_LIBADD = $(LDADDS) -if INCLUDE_IM_IPA -STATIC_IPA_MODULE = libstatic-im-ipa.la -else -IPA_MODULE = im-ipa.la -endif - -im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_ime_la_SOURCES = \ - gtkimcontextime.c \ - gtkimcontextime.h \ - imime.c \ - imm-extra.h -libstatic_im_ime_la_SOURCES = $(im_ime_la_SOURCES) -im_ime_la_LIBADD = -limm32 $(LDADDS) -libstatic_im_ime_la_LIBADD = -limm32 -if USE_WIN32 -if INCLUDE_IM_IME -STATIC_IME_MODULE = libstatic-im-ime.la -else -IME_MODULE=im-ime.la -endif -endif - -im_quartz_la_CPPFLAGS = $(AM_CPPFLAGS) -xobjective-c -im_quartz_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_quartz_la_SOURCES = imquartz.c -libstatic_im_quartz_la_SOURCES = $(im_quartz_la_SOURCES) -im_quartz_la_LIBADD = $(LDADDS) -if INCLUDE_IM_QUARTZ -STATIC_QUARTZ_MODULE = libstatic-im-quartz.la -else -if USE_QUARTZ -QUARTZ_MODULE = im-quartz.la -endif -endif - -im_broadway_la_CPPFLAGS = $(AM_CPPFLAGS) -im_broadway_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_broadway_la_SOURCES = imbroadway.c -libstatic_im_broadway_la_SOURCES = $(im_broadway_la_SOURCES) -im_broadway_la_LIBADD = $(LDADDS) -if INCLUDE_IM_BROADWAY -STATIC_BROADWAY_MODULE = libstatic-im-broadway.la -else -if USE_BROADWAY -BROADWAY_MODULE = im-broadway.la -endif -endif - -protocol_built_sources = \ - text-input-unstable-v3-protocol.c \ - text-input-unstable-v3-client-protocol.h - -im_wayland_la_CPPFLAGS = $(AM_CPPFLAGS) -im_wayland_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_wayland_la_SOURCES = imwayland.c $(protocol_built_sources) -libstatic_im_wayland_la_SOURCES = $(im_wayland_la_SOURCES) -im_wayland_la_LIBADD = $(LDADDS) -if INCLUDE_IM_WAYLAND -STATIC_WAYLAND_MODULE = libstatic-im-wayland.la -else -if USE_WAYLAND -WAYLAND_MODULE = im-wayland.la -endif -endif - -protocol_built_sources_gtk = \ - gtk-text-input-protocol.c \ - gtk-text-input-client-protocol.h - -im_waylandgtk_la_CPPFLAGS = $(AM_CPPFLAGS) -im_waylandgtk_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_waylandgtk_la_SOURCES = imwaylandgtk.c $(protocol_built_sources_gtk) -libstatic_im_waylandgtk_la_SOURCES = $(im_waylandgtk_la_SOURCES) -im_waylandgtk_la_LIBADD = $(LDADDS) -if INCLUDE_IM_WAYLAND -STATIC_WAYLANDGTK_MODULE = libstatic-im-waylandgtk.la -else -if USE_WAYLAND -WAYLANDGTK_MODULE = im-waylandgtk.la -endif -endif - -multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-3.0"\" -im_multipress_la_CPPFLAGS = $(AM_CPPFLAGS) $(multipress_defs) -libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS) -im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -im_multipress_la_SOURCES = \ - gtkimcontextmultipress.c \ - gtkimcontextmultipress.h \ - immultipress.c -libstatic_im_multipress_la_SOURCES = $(im_multipress_la_SOURCES) -im_multipress_la_LIBADD = $(LDADDS) -if INCLUDE_IM_MULTIPRESS -STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la -else -MULTIPRESS_MODULE = im-multipress.la -endif - -imconffiledir = $(sysconfdir)/gtk-3.0 -dist_imconffile_DATA = im-multipress.conf - -if CROSS_COMPILING -RUN_QUERY_IMMODULES_TEST=false -else -RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)" -endif - -# Running this if cross compiling or if DESTDIR is set is going to -# not work at all, so skip it. -# We use install-data-hook here to workaround a bug in automake and/or libtool -# that makes the install target for the loader libraries a dependency on -# install-data-am, and not install-exec-am. We need to ensure this gets run -# after the libraries are installed in their final locations. -install-data-hook: - $(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \ - echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \ - $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \ - echo "$(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \ - $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache ; \ - else \ - echo "***" ; \ - echo "*** Warning: immodules.cache not built" ; \ - echo "***" ; \ - echo "*** Generate this file manually on host" ; \ - echo "*** system using gtk-query-immodules-3.0" ; \ - echo "***" ; \ - fi - -uninstall-local: - rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache - -if BUILD_DYNAMIC_MODULES - -module_LTLIBRARIES = \ - $(AM_ET_MODULE) \ - $(CEDILLA_MODULE) \ - $(CYRILLIC_TRANSLIT_MODULE) \ - $(IME_MODULE) \ - $(INUKTITUT_MODULE) \ - $(IPA_MODULE) \ - $(MULTIPRESS_MODULE) \ - $(QUARTZ_MODULE) \ - $(BROADWAY_MODULE) \ - $(WAYLAND_MODULE) \ - $(WAYLANDGTK_MODULE) \ - $(THAI_MODULE) \ - $(TI_ER_MODULE) \ - $(TI_ET_MODULE) \ - $(VIQR_MODULE) \ - $(XIM_MODULE) - -endif - -noinst_LTLIBRARIES = \ - $(STATIC_AM_ET_MODULE) \ - $(STATIC_CEDILLA_MODULE) \ - $(STATIC_CYRILLIC_TRANSLIT_MODULE) \ - $(STATIC_IME_MODULE) \ - $(STATIC_INUKTITUT_MODULE) \ - $(STATIC_IPA_MODULE) \ - $(STATIC_MULTIPRESS_MODULE) \ - $(STATIC_QUARTZ_MODULE) \ - $(STATIC_BROADWAY_MODULE) \ - $(STATIC_WAYLAND_MODULE) \ - $(STATIC_WAYLANDGTK_MODULE) \ - $(STATIC_THAI_MODULE) \ - $(STATIC_TI_ER_MODULE) \ - $(STATIC_TI_ET_MODULE) \ - $(STATIC_VIQR_MODULE) \ - $(STATIC_XIM_MODULE) - -included-modules: $(noinst_LTLIBRARIES) - -immodules.cache: Makefile.am $(module_LTLIBRARIES) - $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache - -if USE_WAYLAND -BUILT_SOURCES = $(protocol_built_sources) $(protocol_built_sources_gtk) -endif - -EXTRA_DIST += \ - README.multipress \ - meson.build \ - text-input-unstable-v3.xml \ - gtk-text-input.xml - -CLEANFILES = immodules.cache - -if CROSS_COMPILING -else -all-local: immodules.cache -endif - -.SECONDEXPANSION: - -define protostability -$(shell echo $1 | sed 's/.*\(\\|\\).*/\1/') -endef - -define protoname -$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/') -endef - -%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@ -%-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -%-protocol.c : $(srcdir)/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@ -%-client-protocol.h : $(srcdir)/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - --include $(top_srcdir)/git.mk diff --git a/modules/printbackends/Makefile.am b/modules/printbackends/Makefile.am deleted file mode 100644 index 76e3e2c8af..0000000000 --- a/modules/printbackends/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -SUBDIRS = file lpr - -if HAVE_CUPS -SUBDIRS += cups -endif - -if TEST_PRINT_BACKEND -SUBDIRS += test -endif - -if HAVE_PAPI -SUBDIRS += papi -endif - -DIST_SUBDIRS = cups file lpr test papi - -EXTRA_DIST += \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am deleted file mode 100644 index 09a9f893cf..0000000000 --- a/modules/printbackends/cups/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ - -I$(top_builddir)/gtk \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(CUPS_CFLAGS) \ - $(COLORD_CFLAGS) \ - -DGTK_COMPILATION \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(GTK_DEP_CFLAGS) \ - $(GTK_DEBUG_FLAGS) - -LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(COLORD_LIBS) \ - $(GTK_DEP_LIBS) - -backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends - -backend_LTLIBRARIES = libprintbackend-cups.la - -libprintbackend_cups_la_SOURCES = \ - gtkprintbackendcups.c \ - gtkprintercups.c \ - gtkcupsutils.c \ - gtkcupssecretsutils.c - -noinst_HEADERS = \ - gtkprintbackendcups.h \ - gtkprintercups.h \ - gtkcupsutils.h \ - gtkcupssecretsutils.h - -libprintbackend_cups_la_LDFLAGS = -avoid-version -module $(no_undefined) -libprintbackend_cups_la_LIBADD = $(LDADDS) $(CUPS_LIBS) - --include $(top_srcdir)/git.mk diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am deleted file mode 100644 index 9b51bf4e12..0000000000 --- a/modules/printbackends/file/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends - -backend_LTLIBRARIES = libprintbackend-file.la - -libprintbackend_file_la_SOURCES = \ - gtkprintbackendfile.c - -libprintbackend_file_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ - -I$(top_builddir)/gtk \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGTK_COMPILATION \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(AM_CPPFLAGS) - -libprintbackend_file_la_CFLAGS = \ - $(GTK_DEP_CFLAGS) \ - $(AM_CFLAGS) - -libprintbackend_file_la_LDFLAGS = \ - -avoid-version -module $(no_undefined) - -libprintbackend_file_la_LIBADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -noinst_HEADERS = \ - gtkprintbackendfile.h - --include $(top_srcdir)/git.mk diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am deleted file mode 100644 index 5a7517009e..0000000000 --- a/modules/printbackends/lpr/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ - -I$(top_builddir)/gtk \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(GTK_DEP_CFLAGS) \ - $(GTK_DEBUG_FLAGS) - -LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends - -backend_LTLIBRARIES = libprintbackend-lpr.la - -libprintbackend_lpr_la_SOURCES = \ - gtkprintbackendlpr.c - -noinst_HEADERS = \ - gtkprintbackendlpr.h - -libprintbackend_lpr_la_LDFLAGS = -avoid-version -module $(no_undefined) -libprintbackend_lpr_la_LIBADD = $(LDADDS) - --include $(top_srcdir)/git.mk diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am deleted file mode 100644 index 1390784b8f..0000000000 --- a/modules/printbackends/papi/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ - -I$(top_builddir)/gtk \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(GTK_DEP_CFLAGS) \ - $(GTK_DEBUG_FLAGS) - -LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends - -backend_LTLIBRARIES = libprintbackend-papi.la - -libprintbackend_papi_la_SOURCES = \ - gtkprinterpapi.c \ - gtkprintbackendpapi.c - -noinst_HEADERS = \ - gtkprinterpapi.h \ - gtkprintbackendpapi.h - -libprintbackend_papi_la_LDFLAGS = -avoid-version -module $(no_undefined) -libprintbackend_papi_la_LIBADD = $(LDADDS) -lpapi - --include $(top_srcdir)/git.mk diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am deleted file mode 100644 index bff5e93c7a..0000000000 --- a/modules/printbackends/test/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends - -backend_LTLIBRARIES = libprintbackend-test.la - -libprintbackend_test_la_SOURCES = \ - gtkprintbackendtest.c - -libprintbackend_test_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ - -I$(top_builddir)/gtk \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(AM_CPPFLAGS) - -libprintbackend_test_la_CFLAGS = \ - $(GTK_DEP_CFLAGS) \ - $(AM_CFLAGS) - -libprintbackend_test_la_LDFLAGS = \ - -avoid-version -module $(no_undefined) - -libprintbackend_test_la_LIBADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -noinst_HEADERS = \ - gtkprintbackendtest.h - --include $(top_srcdir)/git.mk diff --git a/sanitize-la.sh b/sanitize-la.sh deleted file mode 100755 index 0f8cb63b3f..0000000000 --- a/sanitize-la.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -f $1 ]; then - sed "s/dependency_libs=.*/dependency_libs=''/" < $1 > $1T && mv $1T $1 -fi - diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index f283e89831..0000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,589 +0,0 @@ -## Makefile.am for gtk+/tests -include $(top_srcdir)/Makefile.decl - -SUBDIRS = visuals - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(GDK_DEP_CFLAGS) - -DEPS = \ - $(top_builddir)/gtk/libgtk-3.la - -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) \ - $(GDK_DEP_LIBS) \ - -lm - - -if USE_X11 -testsocket_programs = testsocket testsocket_child -endif - -if OS_LINUX -fontconfig_programs = testfontchooserdialog -endif - -noinst_PROGRAMS = $(TEST_PROGS) \ - overlayscroll \ - syncscroll \ - subsurface \ - animated-resizing \ - animated-revealing \ - motion-compression \ - scrolling-performance \ - blur-performance \ - simple \ - flicker \ - print-editor \ - video-timer \ - testaccel \ - testadjustsize \ - testappchooser \ - testappchooserbutton \ - testassistant \ - testbaseline \ - testbbox \ - testbox \ - testboxcss \ - testbuttons \ - testcairo \ - testcalendar \ - testclipboard \ - testcolorchooser \ - testcolorchooser2 \ - testcombo \ - testcombochange \ - testcellrenderertext \ - testdialog \ - testdnd \ - testdnd2 \ - testellipsise \ - testemblems \ - testentrycompletion \ - testentryicons \ - testfilechooser \ - testfilechooserbutton \ - testflowbox \ - testfontselection \ - testfontselectiondialog \ - testfontchooser \ - testfontoptions \ - $(fontconfig_programs) \ - testframe \ - testfullscreen \ - testgeometry \ - testgiconpixbuf \ - testglarea \ - testglblending \ - testgrid \ - testgtk \ - testheaderbar \ - testheightforwidth \ - testiconview \ - testiconview-keynav \ - testicontheme \ - testimage \ - testinfobar \ - testinput \ - testkineticscrolling \ - testlist \ - testlist2 \ - testlist3 \ - testlist4 \ - testlevelbar \ - testlockbutton \ - testmenubutton \ - testmodelbutton \ - testmountoperation \ - testmultidisplay \ - testnotebookdnd \ - testnumerableicon \ - testnouiprint \ - testoffscreen \ - testoffscreenwindow \ - testorientable \ - testoverlay \ - testoverlaystyleclass \ - testprint \ - testrecentchooser \ - testrecentchoosermenu \ - testrichtext \ - testscale \ - testselection \ - testselectionmode \ - $(testsocket_programs) \ - testspinbutton \ - teststatusicon \ - teststockbuttonmenu \ - testtoolbar \ - testtoolbar2 \ - stresstest-toolbar \ - testtreechanging \ - testtreednd \ - testtreeedit \ - testtreemodel \ - testtreeview \ - testtreefocus \ - testtreeflow \ - testtreecolumns \ - testtreecolumnsizing \ - testtreesort \ - testverticalcells \ - treestoretest \ - testxinerama \ - testwindows \ - testmerge \ - testactions \ - testgrouping \ - testtooltips \ - testexpand \ - testexpander \ - testvolumebutton \ - testscrolledwindow \ - testscrolledge \ - testcellarea \ - testswitch \ - styleexamples \ - testtreemenu \ - testtoplevelembed \ - testnoscreen \ - testtreepos \ - testsensitive \ - testtextview \ - testanimation \ - testpixbuf-save \ - testpixbuf-color \ - testpixbuf-scale \ - testgmenu \ - testlogout \ - teststack \ - testrevealer \ - testrevealer2 \ - testtitlebar \ - testsplitheaders \ - teststackedheaders \ - testactionbar \ - testwindowsize \ - testpopover \ - gdkgears \ - listmodel \ - testpopup \ - testpopupat \ - $(NULL) - -if USE_WAYLAND -noinst_PROGRAMS += testforeign -endif - -if USE_X11 -noinst_PROGRAMS += testerrors -endif - -animated_resizing_DEPENDENCIES = $(TEST_DEPS) -animated_revealing_DEPENDENCIES = $(TEST_DEPS) -flicker_DEPENDENCIES = $(TEST_DEPS) -motion_compression_DEPENDENCIES = $(TEST_DEPS) -scrolling_performance_DEPENDENCIES = $(TEST_DEPS) -blur_performance_DEPENDENCIES = $(TEST_DEPS) -simple_DEPENDENCIES = $(TEST_DEPS) -print_editor_DEPENDENCIES = $(TEST_DEPS) -video_timer_DEPENDENCIES = $(TEST_DEPS) -testheightforwidth_DEPENDENCIES = $(TEST_DEPS) -testicontheme_DEPENDENCIES = $(TEST_DEPS) -testiconview_DEPENDENCIES = $(TEST_DEPS) -testaccel_DEPENDENCIES = $(TEST_DEPS) -testadjustsize_DEPENDENCIES = $(TEST_DEPS) -testassistant_DEPENDENCIES = $(TEST_DEPS) -testbaseline_DEPENDENCIES = $(TEST_DEPS) -testbbox_DEPENDENCIES = $(TEST_DEPS) -testbuttons_DEPENDENCIES = $(TEST_DEPS) -testcairo_DEPENDENCIES = $(TEST_DEPS) -testcalendar_DEPENDENCIES = $(TEST_DEPS) -testclipboard_DEPENDENCIES = $(TEST_DEPS) -testcolorchooser_DEPENDENCIES = $(TEST_DEPS) -testcolorchooser2_DEPENDENCIES = $(TEST_DEPS) -testcombo_DEPENDENCIES = $(TEST_DEPS) -testcombochange_DEPENDENCIES = $(TEST_DEPS) -testcellrenderertext_DEPENDENCIES = $(TEST_DEPS) -testdnd_DEPENDENCIES = $(TEST_DEPS) -testdnd2_DEPENDENCIES = $(TEST_DEPS) -testellipsise_DEPENDENCIES = $(TEST_DEPS) -testentrycompletion_DEPENDENCIES = $(TEST_DEPS) -testentryicons_DEPENDENCIES = $(TEST_DEPS) -testerrors_DEPENDENCIES = $(TEST_DEPS) -testfilechooser_DEPENDENCIES = $(TEST_DEPS) -testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS) -testflowbox_DEPENDENCIES = $(TEST_DEPS) -testfontselection_DEPENDENCIES = $(TEST_DEPS) -testfontselectiondialog_DEPENDENCIES = $(TEST_DEPS) -testfontchooser_DEPENDENCIES = $(TEST_DEPS) -testfontchooserdialog_DEPENDENCIES = $(TEST_DEPS) -testfontoptions_DEPENDENCIES = $(TEST_DEPS) -testframe_DEPENDENCIES = $(TEST_DEPS) -testgeometry_DEPENDENCIES = $(TEST_DEPS) -testgiconpixbuf = $(TEST_DEPS) -testgrid_DEPENDENCIES = $(TEST_DEPS) -testgtk_DEPENDENCIES = $(TEST_DEPS) -testheaderbar_DEPENDENCIES = $(TEST_DEPS) -testinput_DEPENDENCIES = $(TEST_DEPS) -testimage_DEPENDENCIES = $(TEST_DEPS) -testkineticscrolling_DEPENDENCIES = $(TEST_DEPS) -testlist_DEPENDENCIES = $(TEST_DEPS) -testlist2_DEPENDENCIES = $(TEST_DEPS) -testlevelbar_DEPENDENCIES = $(TEST_DEPS) -testlockbutton_DEPENDENCIES = $(TEST_DEPS) -testmenubutton_DEPENDENCIES = $(TEST_DEPS) -testmountoperation_DEPENDENCIES = $(TEST_DEPS) -testmultidisplay_DEPENDENCIES = $(TEST_DEPS) -testnotebookdnd_DEPENDENCIES = $(TEST_DEPS) -testnouiprint_DEPENDENCIES = $(TEST_DEPS) -testnumerableicon_DEPENDENCIES = $(TEST_DEPS) -testoffscreen_DEPENDENCIES = $(TEST_DEPS) -testoffscreenwindow_DEPENDENCIES = $(TEST_DEPS) -testappchooser_DEPENDENCIES = $(TEST_DEPS) -testappchooserbutton_DEPENDENCIES = $(TEST_DEPS) -testorientable_DEPENDENCIES = $(TEST_DEPS) -testoverlay_DEPENDENCIES = $(TEST_DEPS) -testoverlaystyleclass_DEPENDENCIES = $(TEST_DEPS) -testprint_DEPENDENCIES = $(TEST_DEPS) -testrecentchooser_DEPENDENCIES = $(TEST_DEPS) -testrecentchoosermenu_DEPENDENCIES = $(TEST_DEPS) -testrichtext_DEPENDENCIES = $(TEST_DEPS) -testscale_DEPENDENCIES = $(TEST_DEPS) -testselection_DEPENDENCIES = $(TEST_DEPS) -testsocket_DEPENDENCIES = $(DEPS) -testsocket_child_DEPENDENCIES = $(DEPS) -testspinbutton_DEPENDENCIES = $(TEST_DEPS) -teststatusicon_DEPENDENCIES = $(TEST_DEPS) -teststockbuttonmenu_DEPENDENCIES = $(TEST_DEPS) -testtreechanging_DEPENDENCIES = $(DEPS) -testtreednd_DEPENDENCIES = $(DEPS) -testtreeedit_DEPENDENCIES = $(DEPS) -testtreemodel_DEPENDENCIES = $(DEPS) -testtreeview_DEPENDENCIES = $(DEPS) -testtreefocus_DEPENDENCIES = $(DEPS) -testtreeflow_DEPENDENCIES = $(DEPS) -testtreecolumns_DEPENDENCIES = $(DEPS) -testtreecolumnsizing_DEPENDENCIES = $(DEPS) -testtreesort_DEPENDENCIES = $(DEPS) -testverticalcells_DEPENDENCIES = $(DEPS) -treestoretest_DEPENDENCIES = $(TEST_DEPS) -testxinerama_DEPENDENCIES = $(TEST_DEPS) -testmerge_DEPENDENCIES = $(TEST_DEPS) -testactions_DEPENDENCIES = $(TEST_DEPS) -testgrouping_DEPENDENCIES = $(TEST_DEPS) -testtooltips_DEPENDENCIES = $(TEST_DEPS) -testvolumebutton_DEPENDENCIES = $(TEST_DEPS) -testscrolledwindow_DEPENDENCIES = $(TEST_DEPS) -testscrolledge_DEPENDENCIES = $(TEST_DEPS) -testcellarea_DEPENDENCIES = $(TEST_DEPS) -testtreemenu_DEPENDENCIES = $(TEST_DEPS) -testwindows_DEPENDENCIES = $(TEST_DEPS) -testexpand_DEPENDENCIES = $(TEST_DEPS) -testexpander_DEPENDENCIES = $(TEST_DEPS) -testswitch_DEPENDENCIES = $(TEST_DEPS) -styleexamples_DEPENDENCIES = $(TEST_DEPS) -testtoplevelembed_DEPENDENCIES = $(TEST_DEPS) -testnoscreen_DEPENDENCIES = $(TEST_DEPS) -testtreepos_DEPENDENCIES = $(TEST_DEPS) -testsensitive_DEPENDENCIES = $(TEST_DEPS) -testtextview_DEPENDENCIES = $(TEST_DEPS) -testanimation_DEPENDENCIES = $(TEST_DEPS) -testpixbuf_save_DEPENDENCIES = $(TEST_DEPS) -testpixbuf_color_DEPENDENCIES = $(TEST_DEPS) -testpixbuf_scale_DEPENDENCIES = $(TEST_DEPS) -testgmenu_DEPENDENCIES = $(TEST_DEPS) -testlogout_DEPENDENCIES = $(TEST_DEPS) -teststack_DEPENDENCIES = $(TEST_DEPS) -testrevealer_DEPENDENCIES = $(TEST_DEPS) -testrevealer2_DEPENDENCIES = $(TEST_DEPS) -testtitlebar_DEPENDENCIES = $(TEST_DEPS) -testwindowsize_DEPENDENCIES = $(TEST_DEPS) -listmodel_DEPENDENCIES = $(TEST_DEPS) - -animated_resizing_SOURCES = \ - animated-resizing.c \ - frame-stats.c \ - frame-stats.h \ - variable.c \ - variable.h - -animated_revealing_SOURCES = \ - animated-revealing.c \ - frame-stats.c \ - frame-stats.h \ - variable.c \ - variable.h - -scrolling_performance_SOURCES = \ - scrolling-performance.c \ - frame-stats.c \ - frame-stats.h \ - variable.c \ - variable.h - -blur_performance_SOURCES = \ - blur-performance.c \ - ../gtk/gtkcairoblur.c - -video_timer_SOURCES = \ - video-timer.c \ - variable.c \ - variable.h - -testboxcss_SOURCES = \ - testboxcss.c - -testentrycompletion_SOURCES = \ - testentrycompletion.c - -testentryicons_SOURCES = \ - testentryicons.c - -testfilechooser_SOURCES = \ - testfilechooser.c - -testfilechooserbutton_SOURCES = \ - testfilechooserbutton.c - -testflowbox_SOURCES = \ - testflowbox.c - -testfontselection_SOURCES = \ - testfontselection.c - -testfontselectiondialog_SOURCES = \ - testfontselectiondialog.c - -testfontchooser_SOURCES = \ - testfontchooser.c - -testfontchooserdialog_SOURCES = \ - testfontchooserdialog.c - -testfontoptions_SOURCES = \ - testfontoptions.c - -testforeign_SOURCES = \ - testforeign.c - -testgrid_SOURCES = \ - testgrid.c - -testgtk_SOURCES = \ - testgtk.c - -testtreechanging_SOURCES = \ - testtreechanging.c - -testtreednd_SOURCES = \ - testtreednd.c - -testtreeedit_SOURCES = \ - testtreeedit.c - -testtreemodel_SOURCES = \ - testtreemodel.c - -testtreeview_SOURCES = \ - testtreeview.c - -testtoolbar_SOURCES = \ - testtoolbar.c - -testmenubutton_SOURCES = \ - testmenubutton.c - -testprint_SOURCES = \ - testprint.c \ - testprintfileoperation.h \ - testprintfileoperation.c - -testsocket_SOURCES = \ - testsocket.c \ - testsocket_common.c - -testsocket_child_SOURCES = \ - testsocket_child.c \ - testsocket_common.c - -testspinbutton_SOURCES = \ - testspinbutton.c - -teststatusicon_SOURCES = \ - teststatusicon.c - -testmerge_SOURCES = \ - testmerge.c - -testactions_SOURCES = \ - testactions.c - -testbaseline_SOURCES = \ - testbaseline.c - -testbbox_SOURCES = \ - testbbox.c - -testbuttons_SOURCES = \ - testbuttons.c - -testframe_SOURCES = \ - testframe.c - -testgeometry_SOURCES = \ - testgeometry.c - -testgiconpixbuf_SOURCES = \ - testgiconpixbuf.c - -testiconview_SOURCES = \ - testiconview.c - -testiconview_keynav_SOURCES = \ - testiconview-keynav.c - -testnumerableicon_SOURCES = \ - testnumerableicon.c - -testrecentchooser_SOURCES = \ - testrecentchooser.c - -testgrouping_SOURCES = \ - testgrouping.c - -testtooltips_SOURCES = \ - testtooltips.c - -testrecentchoosermenu_SOURCES = \ - testrecentchoosermenu.c - -testvolumebutton_SOURCES = \ - testvolumebutton.c - -testscrolledwindow_SOURCES = \ - testscrolledwindow.c - -testcellarea_SOURCES = \ - testcellarea.c - -testtreemenu_SOURCES = \ - testtreemenu.c - -testoffscreen_SOURCES = \ - gtkoffscreenbox.c \ - gtkoffscreenbox.h \ - testoffscreen.c - -testoffscreenwindow_SOURCES = \ - testoffscreenwindow.c - -testoverlay_SOURCES = \ - testoverlay.c - -testoverlaystyleclass_SOURCES = \ - testoverlaystyleclass.c - -testappchooser_SOURCES = \ - testappchooser.c - -testappchooserbutton_SOURCES = \ - testappchooserbutton.c - -testwindows_SOURCES = \ - testwindows.c - -testexpand_SOURCES = testexpand.c - -testexpander_SOURCES = testexpander.c - -testswitch_SOURCES = testswitch.c - -styleexamples_SOURCES = styleexamples.c - -testtoplevelembed_SOURCES = testtoplevelembed.c - -testtextview_SOURCES = testtextview.c - -testanimation_SOURCES = testanimation.c - -testpixbuf_scale_SOURCES = testpixbuf-scale.c - -testpixbuf_color_SOURCES = testpixbuf-color.c - -testpixbuf_save_SOURCES = testpixbuf-save.c - -testcolorchooser_SOURCES = testcolorchooser.c - -testcolorchooser2_SOURCES = testcolorchooser2.c - -testkineticscrolling_SOURCES = testkineticscrolling.c - -teststack_SOURCES = teststack.c - -testrevealer_SOURCES = testrevealer.c - -testrevealer2_SOURCES = testrevealer2.c - -testtitlebar_SOURCES = testtitlebar.c - -testwindowsize_SOURCES = testwindowsize.c - -gdkgears_SOURCES = \ - gdkgears.c \ - gtkgears.c \ - gtkgears.h - -testglblending_SOURCES = \ - testglblending.c \ - gtkgears.c \ - gtkgears.h - -listmodel_SOURCES = listmodel.c - -EXTRA_DIST += \ - apple-red.png \ - dialog.ui \ - gradient1.png \ - testgtk.1 \ - testgtk.css \ - testgtk2.css \ - 3DRings.xpm \ - FilesQueue.xpm \ - Modeller.xpm \ - check-y.xpm \ - check-n.xpm \ - marble.xpm \ - test.xpm \ - check-y.xpm \ - check-n.xpm \ - test.xpm \ - merge-1.ui \ - merge-2.ui \ - merge-3.ui \ - gnome-textfile.png \ - testsplitheaders.ui \ - teststackedheaders.ui \ - makefile.msc \ - mydialog.ui \ - mydialog2.ui \ - popover.ui \ - popover2.ui \ - popupat.ui \ - selectionmode.ui \ - meson.build \ - testapplication.desktop \ - testcolorchooser2.ui \ - testplacesview.c \ - testrc.c \ - testthreads.c \ - testtreeview-plan.txt - --include $(top_srcdir)/git.mk diff --git a/tests/makefile.msc b/tests/makefile.msc deleted file mode 100644 index 13b921a821..0000000000 --- a/tests/makefile.msc +++ /dev/null @@ -1,114 +0,0 @@ -## Makefile for building the gtk test apps with Microsoft C -## Use: nmake -f makefile.msc - -## There is no install target, you have to decide where and -## how to install for yourself. - -TOP = ..\.. -!INCLUDE $(TOP)/glib/build/win32/make.msc - -################################################################ - -# Possibly override versions from build/win32/module.defs -GTK_VER = 3.0 - -GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib -GTK_LIBS = ../gtk/gtk-win32-$(GTK_VER).lib - -INCLUDES = -I . -I .. -I ../gdk -I ../gtk $(GDK_PIXBUF_CFLAGS) -DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) -LDFLAGS = /link /machine:ix86 $(LINKDEBUG) -DEFINES = -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\" - -TOUCH = copy makefile.msc+nul - -!IFNDEF TESTAPP - -all : \ - ..\config.h \ - prop-editor.obj \ - all-test-apps - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - - -# -# Test programs: -# -TESTAPPS = \ -# buildertest floatingtest \ - flicker \ -# objecttests \ - testaccel testactions testassistant \ - testbbox testbuttons \ - testcairo testcalendar testcellrenderertext testclientmessage testcombo testcombochange \ - testdnd \ - testellipsise testentrycompletion testentryicons \ - testfilechooser testfilechooserbutton testframe \ - testgrouping testgtk \ - testicontheme testiconview testimage testinput \ - testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \ - testnouiprint testnotebookdnd \ - testoffscreen testorientable \ - testprint \ - testrecentchooser testrecentchoosermenu testrichtext \ - testscale testselection testspinbutton \ - testtoolbar testtooltips \ - testtreecolumns testtreecolumnsizing testtreeedit testtreeflow testtreefocus \ - testtreemodel testtreesort testtreeview treestoretest \ - teststatusicon \ - testthreads testvolumebutton testwindows testxinerama \ - simple - -# syntax error : illegal character '-' in macro -#stresstest-toolbar - - -all-test-apps: - @for %d in ($(TESTAPPS)) do @nmake -nologo -f makefile.msc one-test-app THIS=%d - -one-test-app: - @nmake -nologo -f makefile.msc $(THIS).exe TESTAPP=$(THIS) EXTRA_$(THIS)=1 - -!ELSE - -EXTRA_OBJETCS = prop-editor.obj - -!IFDEF EXTRA_buildertest -EXTRA_LIBS = $(ATK_LIBS) -!ENDIF - -!IFDEF EXTRA_testoffscreen -EXTRA_OBJETCS = gtkoffscreenbox.obj -!ENDIF - -!IFDEF EXTRA_testprint -EXTRA_OBJETCS = testprintfileoperation.obj -EXTRA_LIBS = $(PANGOCAIRO_LIBS) -!ENDIF - -!IFDEF EXTRA_testnouiprint -EXTRA_LIBS = $(PANGOCAIRO_LIBS) -!ENDIF - -!IFDEF EXTRA_testfilechooser -EXTRA_LIBS = gdi32.lib user32.lib shell32.lib -!ENDIF - -!IFDEF EXTRA_testsocket -EXTRA_OBJETCS = testsocket_common.obj -!ENDIF - -!IFDEF EXTRA_testsocket_child -EXTRA_OBJETCS = testsocket_common.obj -!ENDIF - -$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) - $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \ - $(PANGO_LIBS) $(PANGOCAIRO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS) - -$(TESTAPP).obj : $(TESTAPP).c - $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c - -!ENDIF diff --git a/tests/visuals/Makefile.am b/tests/visuals/Makefile.am deleted file mode 100644 index 6ea2e4a67e..0000000000 --- a/tests/visuals/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(GDK_DEP_CFLAGS) - -AM_CXXFLAGS = $(AM_CPPFLAGS) - -DEPS = \ - $(top_builddir)/gtk/libgtk-3.la - -LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) \ - -lm - -noinst_PROGRAMS = visuals - -visuals_DEPENDENCIES = $(TEST_DEPS) -visuals_LDADD = $(LDADDS) -visuals_SOURCES = visuals.c - -EXTRA_DIST = \ - inline-toolbar-horizontal.ui \ - inline-toolbar-vertical.ui \ - level-bar.ui \ - linked-buttons-horizontal.ui \ - linked-buttons-vertical.ui \ - osd-toolbars.ui \ - primary-toolbar.ui \ - suggested-action-buttons.ui \ - meson.build - --include $(top_srcdir)/git.mk diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am deleted file mode 100644 index e5a0636094..0000000000 --- a/testsuite/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -SUBDIRS = gdk gtk a11y css reftests tools - -EXTRA_DIST += \ - meson.build - --include $(top_srcdir)/git.mk - diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am deleted file mode 100644 index 73519e9dea..0000000000 --- a/testsuite/a11y/Makefile.am +++ /dev/null @@ -1,142 +0,0 @@ -include $(top_srcdir)/Makefile.decl -NULL = - -SUBDIRS = state - -check_PROGRAMS = $(TEST_PROGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_VERSION=\"$(GTK_VERSION)\"\ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -# work around random file systems showing up in the file chooser, -# breaking the 'pickers' test -TESTS_ENVIRONMENT = \ - GIO_USE_VOLUME_MONITOR=unix \ - GSETTINGS_BACKEND=memory \ - GTK_CSD=1 \ - G_ENABLE_DIAGNOSTIC=0 - -TEST_PROGS += accessibility-dump - -TEST_PROGS += tree-performance - -TEST_PROGS += text - -TEST_PROGS += children - -TEST_PROGS += derive - -TEST_PROGS += value - -TEST_PROGS += misc - -TEST_PROGS += tree-relationships - -TEST_PROGS += util - -noinst_PROGS = testfocus - -testdata = \ - hello-world.ui hello-world.txt \ - mnemonic.ui mnemonic.txt \ - accessible-name.ui accessible-name.txt \ - notebook.ui notebook.txt \ - range.ui range.txt \ - link.ui link.txt \ - text.ui text.txt \ - buttons.ui buttons.txt \ - colorchooser.ui colorchooser.txt \ - about.ui about.txt \ - messagedialog.ui messagedialog.txt \ - expander.ui expander.txt \ - assistant.ui assistant.txt \ - pickers.ui pickers.txt \ - label.ui label.txt \ - lockbutton.ui lockbutton.txt \ - spinner.ui spinner.txt \ - progress.ui progress.txt \ - infobar.ui infobar.txt \ - calendar.ui calendar.txt \ - statusbar.ui statusbar.txt \ - paned.ui paned.txt \ - iconview.ui iconview.txt \ - entries.ui entries.txt \ - scale-drawvalue.ui scale-drawvalue.txt \ - placeholder-text.ui placeholder-text.txt \ - menu.ui menu.txt \ - menubutton.ui menubutton.txt \ - menubutton2.ui menubutton2.txt \ - menubutton3.ui menubutton3.txt \ - combos.ui combos.txt \ - listbox.ui listbox.txt \ - stack.ui stack.txt \ - headerbar.ui headerbar.txt \ - tree.ui tree.txt \ - actionbar.ui actionbar.txt \ - tooltips.ui tooltips.txt \ - $(NULL) - -test_in_files = \ - a11ytests.test.in \ - a11ychildren.test.in \ - a11ytree.test.in \ - a11yvalue.test.in \ - a11yderive.test.in \ - a11ytext.test.in \ - a11yutil.test.in \ - a11ymisc.test.in \ - $(NULL) - -EXTRA_DIST += $(test_in_files) $(testdata) meson.build - -GTK_GSETTINGS_SCHEMAS = \ - $(top_srcdir)/gtk/org.gtk.Settings.ColorChooser.gschema.xml \ - $(top_srcdir)/gtk/org.gtk.Settings.FileChooser.gschema.xml \ - $(NULL) - -gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) \ - $(addprefix --schema-file=,$(GTK_GSETTINGS_SCHEMAS)) \ - --targetdir=$(builddir) - -BUILT_SOURCES = gschemas.compiled - -CLEANFILES = gschemas.compiled - -all-am: gschemas.compiled - -if BUILDOPT_INSTALL_TESTS -insttestdir=$(libexecdir)/installed-tests/$(PACKAGE) -insttest_PROGRAMS = $(TEST_PROGS) - -a11ytestdir = $(insttestdir)/a11ytests -a11ytest_DATA = $(testdata) - -substitutions = \ - -e s,@libexecdir\@,$(libexecdir),g \ - $(NULL) - -test_files = $(test_in_files:.test.in=.test) - -$(test_files): %.test: %.test.in - $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@ - -DISTCLEANFILES = $(test_files) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE) -testmeta_DATA = $(test_files) -endif - --include $(top_srcdir)/git.mk diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am deleted file mode 100644 index b0e265a6c5..0000000000 --- a/testsuite/a11y/state/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -check_PROGRAMS = $(TEST_PROGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_VERSION=\"$(GTK_VERSION)\"\ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -TESTS_ENVIRONMENT = \ - GIO_USE_VOLUME_MONITOR=unix \ - GSETTINGS_BACKEND=memory \ - G_ENABLE_DIAGNOSTIC=0 - -test_programs = state-record - -testdata = \ - focus1.ui focus1.in focus1.out \ - focus2.ui focus2.in focus2.out - -EXTRA_DIST += $(testdata) \ - meson.build \ - a11ystate.test.in - -if BUILDOPT_INSTALL_TESTS -insttestdir = $(libexecdir)/installed-tests/$(PACKAGE) -insttest_PROGRAMS = $(test_programs) - -statetestdir = $(insttestdir)/state -statetest_DATA = $(testdata) - -a11ystate.test: Makefile - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session-exclusive' >> $@.tmp; \ - echo 'Output=TAP' >> $@.tmp; \ - echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --tap --directory $(statetestdir)' >> $@.tmp; \ - mv $@.tmp $@) - -testfiles = a11ystate.test - -DISTCLEANFILES = \ - $(testfiles) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE) -testmeta_DATA = $(testfiles) -endif - --include $(top_srcdir)/git.mk diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am deleted file mode 100644 index 33c9473942..0000000000 --- a/testsuite/css/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -NULL = - -SUBDIRS = parser nodes style - -check_PROGRAMS = $(TEST_PROGS) -test_in_files = - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_VERSION=\"$(GTK_VERSION)\"\ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -TEST_PROGS += api -test_in_files += api.test.in - -EXTRA_DIST += \ - $(test_in_files) \ - meson.build - -if BUILDOPT_INSTALL_TESTS -insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css -insttest_PROGRAMS = $(TEST_PROGS) - -substitutions = \ - -e s,@libexecdir\@,$(libexecdir),g \ - $(NULL) - -test_files = $(test_in_files:.test.in=.test) - -$(test_files): %.test: %.test.in - $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@ - -DISTCLEANFILES = $(test_files) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css -testmeta_DATA = $(test_files) -endif - --include $(top_srcdir)/git.mk diff --git a/testsuite/css/nodes/Makefile.am b/testsuite/css/nodes/Makefile.am deleted file mode 100644 index af93ee0e60..0000000000 --- a/testsuite/css/nodes/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -NULL = - -CLEANFILES = - -TEST_PROGS += test-css-nodes -test_in_files = test-css-nodes.test.in - -check_PROGRAMS = $(TEST_PROGS) - -test_css_nodes_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(NULL) - -test_css_nodes_LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) \ - $(NULL) - -test_css_nodes_SOURCES = \ - test-css-nodes.c \ - $(NULL) - -test_data = \ - box.ltr.ui box.ltr.nodes \ - box.rtl.ui box.rtl.nodes \ - box-packing.ltr.ui box-packing.ltr.nodes \ - box-packing.rtl.ui box-packing.rtl.nodes \ - buttons.ui buttons.nodes \ - checkbutton.ltr.ui checkbutton.ltr.nodes \ - checkbutton.rtl.ui checkbutton.rtl.nodes \ - combobox.ui combobox.nodes \ - entries.ui entries.nodes \ - expander.ltr.ui expander.ltr.nodes \ - expander.rtl.ui expander.rtl.nodes \ - levelbar.ltr.ui levelbar.ltr.nodes \ - levelbar.rtl.ui levelbar.rtl.nodes \ - notebook-arrows.ui notebook-arrows.nodes \ - notebook-arrows2.ui notebook-arrows2.nodes \ - notebook.top.ltr.ui notebook.top.ltr.nodes \ - notebook.top.rtl.ui notebook.top.rtl.nodes \ - notebook.left.ltr.ui notebook.left.ltr.nodes \ - notebook.left.rtl.ui notebook.left.rtl.nodes \ - notebook.right.ltr.ui notebook.right.ltr.nodes \ - notebook.right.rtl.ui notebook.right.rtl.nodes \ - notebook.bottom.ltr.ui notebook.bottom.ltr.nodes \ - notebook.bottom.rtl.ui notebook.bottom.rtl.nodes \ - paned.ltr.ui paned.ltr.nodes \ - paned.rtl.ui paned.rtl.nodes \ - progressbar.ui progressbar.nodes \ - scale.ui scale.nodes \ - $(NULL) - -EXTRA_DIST += $(test_in_files) $(test_data) meson.build - -if BUILDOPT_INSTALL_TESTS -insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/nodes -insttest_PROGRAMS = $(TEST_PROGS) -insttest_DATA = $(test_data) - -substitutions = \ - -e s,@libexecdir\@,$(libexecdir),g \ - $(NULL) - -test_files = $(test_in_files:.test.in=.test) - -$(test_files): %.test: %.test.in - $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@ - -EXTRA_DIST += $(test_files) - -CLEANFILES += $(test_files) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css/nodes -testmeta_DATA = $(test_files) -endif - - --include $(top_srcdir)/git.mk diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am deleted file mode 100644 index fcef37a44c..0000000000 --- a/testsuite/css/parser/Makefile.am +++ /dev/null @@ -1,511 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -NULL = - -CLEANFILES = - -TEST_PROGS += test-css-parser -test_in_files = test-css-parser.test.in - -check_PROGRAMS = $(TEST_PROGS) - -test_css_parser_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -test_css_parser_LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) - -test_css_parser_SOURCES = \ - test-css-parser.c - -clean-local: - rm $(builddir)/*.out.css || true - -test_data = \ - animation-crash-3.12.css \ - animation-crash-3.12.errors \ - animation-crash-3.12.ref.css \ - animation-shorthand-crash.css \ - animation-shorthand-crash.ref.css \ - animation-delay.css \ - animation-delay.ref.css \ - animation-direction.css \ - animation-direction.ref.css \ - animation-duration.css \ - animation-duration.ref.css \ - animation-fill-mode.css \ - animation-fill-mode.ref.css \ - animation-iteration-count.css \ - animation-iteration-count.ref.css \ - animation-name.css \ - animation-name.ref.css \ - animation-play-state.css \ - animation-play-state.ref.css \ - animation-timing-function.css \ - animation-timing-function.ref.css \ - at-invalid-01.css \ - at-invalid-01.errors \ - at-invalid-01.ref.css \ - at-invalid-02.css \ - at-invalid-02.errors \ - at-invalid-02.ref.css \ - at-invalid-03.css \ - at-invalid-03.errors \ - at-invalid-03.ref.css \ - at-invalid-04.css \ - at-invalid-04.errors \ - at-invalid-04.ref.css \ - at-invalid-05.css \ - at-invalid-05.errors \ - at-invalid-05.ref.css \ - at-invalid-06.css \ - at-invalid-06.errors \ - at-invalid-06.ref.css \ - at-invalid-07.css \ - at-invalid-07.errors \ - at-invalid-07.ref.css \ - at-invalid-08.css \ - at-invalid-08.errors \ - at-invalid-08.ref.css \ - at-invalid-09.css \ - at-invalid-09.errors \ - at-invalid-09.ref.css \ - at-invalid-10.css \ - at-invalid-10.errors \ - at-invalid-10.ref.css \ - at-invalid-11.css \ - at-invalid-11.errors \ - at-invalid-11.ref.css \ - at-invalid-12.css \ - at-invalid-12.errors \ - at-invalid-12.ref.css \ - at-invalid-13.css \ - at-invalid-13.errors \ - at-invalid-13.ref.css \ - at-invalid-14.css \ - at-invalid-14.errors \ - at-invalid-14.ref.css \ - at-invalid-15.css \ - at-invalid-15.errors \ - at-invalid-15.ref.css \ - at-invalid-16.css \ - at-invalid-16.errors \ - at-invalid-16.ref.css \ - at-invalid-17.css \ - at-invalid-17.errors \ - at-invalid-17.ref.css \ - at-invalid-18.css \ - at-invalid-18.errors \ - at-invalid-18.ref.css \ - at-invalid-19.css \ - at-invalid-19.errors \ - at-invalid-19.ref.css \ - at-invalid-20.css \ - at-invalid-20.errors \ - at-invalid-20.ref.css \ - at-invalid-21.css \ - at-invalid-21.errors \ - at-invalid-21.ref.css \ - at-invalid-22.css \ - at-invalid-22.errors \ - at-invalid-22.ref.css \ - at-invalid-23.css \ - at-invalid-23.errors \ - at-invalid-23.ref.css \ - at-invalid-24.css \ - at-invalid-24.errors \ - at-invalid-24.ref.css \ - at-invalid-25.css \ - at-invalid-25.errors \ - at-invalid-25.ref.css \ - at-invalid-26.css \ - at-invalid-26.errors \ - at-invalid-26.ref.css \ - at-invalid-27.css \ - at-invalid-27.errors \ - at-invalid-27.ref.css \ - at-valid-01.css \ - at-valid-01.ref.css \ - at-valid-02.css \ - at-valid-02.ref.css \ - at-valid-03.css \ - at-valid-03.ref.css \ - at-valid-04.css \ - at-valid-04.ref.css \ - at-valid-05.css \ - at-valid-05.ref.css \ - at-valid-06.css \ - at-valid-06.ref.css \ - at-valid-07.css \ - at-valid-08.css \ - at-valid-08.ref.css \ - at-valid-09.css \ - at-valid-09.ref.css \ - at-valid-10.css \ - at-valid-10.ref.css \ - at-valid-11.css \ - at-valid-11.ref.css \ - at-valid-12.css \ - at-valid-12.ref.css \ - at-valid-13.css \ - at-valid-13.ref.css \ - at-valid-14.css \ - at-valid-14.ref.css \ - at-valid-15.css \ - at-valid-15.ref.css \ - at-valid-16.css \ - at-valid-16.ref.css \ - at-valid-17.css \ - at-valid-18.css \ - at-valid-18.ref.css \ - at-valid-19.css \ - at-valid-19.errors \ - at-valid-19.ref.css \ - at-valid-20.css \ - at-valid-20.errors \ - at-valid-20.ref.css \ - at-valid-21.css \ - at-valid-21.errors \ - at-valid-21.ref.css \ - background-blend-mode.css \ - background-blend-mode.ref.css \ - background-clip.css \ - background-clip.ref.css \ - background-image.css \ - background-image.ref.css \ - background-origin.css \ - background-origin.ref.css \ - background-position.css \ - background-position.errors \ - background-position.ref.css \ - background-position-errors.css \ - background-position-errors.errors \ - background-position-errors.ref.css \ - background-repeat.css \ - background-repeat.ref.css \ - background-shorthand.css \ - background-shorthand.ref.css \ - background-shorthand-single.css \ - background-shorthand-single.ref.css \ - background-size.css \ - background-size.ref.css \ - background-win32-color-is-no-error.css \ - background-win32-color-is-no-error.ref.css \ - border.css \ - border.errors \ - border.ref.css \ - border-color.css \ - border-color.ref.css \ - border-color-currentcolor.css \ - border-color-currentcolor.ref.css \ - border-crash-3.24.css \ - border-crash-3.24.errors \ - border-crash-3.24.ref.css \ - border-image-source.css \ - border-image-source.ref.css \ - border-image-repeat.css \ - border-image-repeat.ref.css \ - border-image-slice.css \ - border-image-slice.ref.css \ - border-image-width.css \ - border-image-width.ref.css \ - border-infloop-3.12.css \ - border-infloop-3.12.errors \ - border-infloop-3.12.ref.css \ - border-radius.css \ - border-radius.ref.css \ - border-radius-shorthand.css \ - border-radius-shorthand.errors \ - border-radius-shorthand.ref.css \ - border-shorthand.css \ - border-shorthand.ref.css \ - border-style.css \ - border-style.ref.css \ - border-width.css \ - border-width.ref.css \ - box-shadow.css \ - box-shadow.ref.css \ - calc.css \ - calc.ref.css \ - calc-errors.css \ - calc-errors.ref.css \ - calc-errors.errors \ - calc-simple.css \ - calc-simple.ref.css \ - close-at-end-of-file.css \ - close-at-end-of-file.errors \ - close-at-end-of-file.ref.css \ - color.css \ - color.ref.css \ - colors-errors.css \ - colors-errors.errors \ - colors-errors.ref.css \ - colors-red.css \ - colors-red.ref.css \ - comment-detection.css \ - comment-detection.ref.css \ - cross-fade-basic.css \ - css-21-malformed-declarations.css \ - css-21-malformed-declarations.errors \ - css-21-malformed-declarations.ref.css \ - css-21-malformed-statements.css \ - css-21-malformed-statements.errors \ - css-21-malformed-statements.ref.css \ - currentcolor-everywhere.css \ - declarations.css \ - declarations.errors \ - declarations.ref.css \ - declarations-invalid-01.css \ - declarations-invalid-01.errors \ - declarations-invalid-01.ref.css \ - declarations-invalid-02.css \ - declarations-invalid-02.errors \ - declarations-invalid-02.ref.css \ - declarations-invalid-03.css \ - declarations-invalid-03.errors \ - declarations-invalid-03.ref.css \ - declarations-invalid-04.css \ - declarations-invalid-04.errors \ - declarations-invalid-04.ref.css \ - declarations-invalid-05.css \ - declarations-invalid-05.errors \ - declarations-invalid-05.ref.css \ - declarations-invalid-06.css \ - declarations-invalid-06.errors \ - declarations-invalid-06.ref.css \ - declarations-invalid-07.css \ - declarations-invalid-07.errors \ - declarations-invalid-07.ref.css \ - declarations-invalid-08.css \ - declarations-invalid-08.errors \ - declarations-invalid-08.ref.css \ - declarations-valid-01.css \ - declarations-valid-01.ref.css \ - declarations-valid-02.css \ - declarations-valid-02.ref.css \ - declarations-valid-03.css \ - declarations-valid-03.ref.css \ - declarations-valid-04.css \ - declarations-valid-04.ref.css \ - declarations-valid-05.css \ - declarations-valid-05.ref.css \ - declarations-valid-06.css \ - declarations-valid-06.ref.css \ - declarations-valid-07.css \ - declarations-valid-07.ref.css \ - declarations-valid-08.css \ - declarations-valid-08.ref.css \ - declarations-valid-09.css \ - declarations-valid-09.ref.css \ - declarations-valid-10.css \ - declarations-valid-10.ref.css \ - declarations-valid-11.css \ - declarations-valid-11.ref.css \ - declarations-valid-12.css \ - declarations-valid-12.ref.css \ - declarations-valid-13.css \ - declarations-valid-13.ref.css \ - declarations-valid-14.css \ - declarations-valid-14.ref.css \ - declarations-valid-15.css \ - declarations-valid-15.ref.css \ - declarations-valid-16.css \ - declarations-valid-16.ref.css \ - declarations-valid-17.css \ - declarations-valid-17.ref.css \ - declarations-valid-18.css \ - declarations-valid-18.ref.css \ - declarations-valid-19.css \ - declarations-valid-19.ref.css \ - declarations-valid-20.css \ - declarations-valid-20.ref.css \ - declarations-valid-21.css \ - declarations-valid-21.ref.css \ - declarations-valid-22.css \ - declarations-valid-22.ref.css \ - declarations-valid-23.css \ - declarations-valid-23.ref.css \ - declarations-valid-24.css \ - declarations-valid-24.ref.css \ - declarations-valid-25.css \ - declarations-valid-25.ref.css \ - declarations-valid-26.css \ - declarations-valid-26.ref.css \ - deprecated.css \ - deprecated.errors \ - deprecated.ref.css \ - does-not-exist.css \ - does-not-exist.errors \ - does-not-exist.ref.css \ - doubled.css \ - doubled.ref.css \ - empty.css \ - font-family.css \ - font-family.ref.css \ - font-size.css \ - font-size.ref.css \ - font-stretch.css \ - font-stretch.ref.css \ - font-style.css \ - font-style.ref.css \ - font-variant.css \ - font-variant.ref.css \ - font-weight.css \ - font-weight.ref.css \ - freed-string-in-error-messages.css \ - freed-string-in-error-messages.errors \ - freed-string-in-error-messages.ref.css \ - import-cyclic-1.css \ - import-cyclic-1.errors \ - import-cyclic-1.ref.css \ - import-cyclic-2.css \ - import-cyclic-2.errors \ - import-cyclic-2.ref.css \ - import-cyclic-3.css \ - import-cyclic-3.errors \ - import-cyclic-3.ref.css \ - import-nonexistant.css \ - import-nonexistant.errors \ - import-nonexistant.ref.css \ - import-recursive.css \ - import-recursive.errors \ - import-recursive.ref.css \ - integer.css \ - integer.errors \ - integer.ref.css \ - keyframes-empty.css \ - keyframes-empty.ref.css \ - keyframes-ordering.css \ - keyframes-ordering.ref.css \ - letter-spacing.css \ - letter-spacing.ref.css \ - linear-gradient.css \ - linear-gradient.ref.css \ - margin.css \ - margin.ref.css \ - min-height.css \ - min-height.ref.css \ - min-width.css \ - min-width.ref.css \ - no-semicolon.css \ - no-semicolon.ref.css \ - not.css \ - not.ref.css \ - nth-child.css \ - nth-child.ref.css \ - opacity.css \ - opacity.ref.css \ - outline-color.css \ - outline-color.ref.css \ - outline-offset.css \ - outline-offset.ref.css \ - outline-radius.css \ - outline-radius.ref.css \ - outline-style.css \ - outline-style.ref.css \ - outline-width.css \ - outline-width.ref.css \ - padding.css \ - padding.ref.css \ - property-name-errors.css \ - property-name-errors.errors \ - property-name-errors.ref.css \ - pseudo-classes-known.css \ - pseudo-classes-known.errors \ - pseudo-classes-known.ref.css \ - pseudo-classes-unknown.css \ - pseudo-classes-unknown.errors \ - pseudo-classes-unknown.ref.css \ - radial.css \ - radial.ref.css \ - radial-background-position-error.css \ - radial-background-position-error.errors \ - radial-background-position-error.ref.css \ - radial-positions.css \ - radial-positions.errors \ - radial-positions.ref.css \ - selector.css \ - selector.ref.css \ - shadow.css \ - shadow.ref.css \ - shorthand.css \ - shorthand.ref.css \ - simple.css \ - single-slash.css \ - single-slash.errors\ - single-slash.ref.css \ - string-values.css \ - string-values.ref.css \ - text-decoration-color.css \ - text-decoration-color.ref.css \ - text-decoration-line.css \ - text-decoration-line.ref.css \ - text-decoration-style.css \ - text-decoration-style.ref.css \ - test.png \ - text-shadow.css \ - text-shadow.ref.css \ - text-shadow-invalid-but-worked-in-3.12.css \ - text-shadow-invalid-but-worked-in-3.12.errors \ - text-shadow-invalid-but-worked-in-3.12.ref.css \ - transition.css \ - transition.ref.css \ - transition-delay.css \ - transition-delay.ref.css \ - transition-duration.css \ - transition-duration.ref.css \ - transition-property.css \ - transition-property.ref.css \ - transition-timing-function.css \ - transition-timing-function.ref.css \ - value-inherit.css \ - value-inherit.errors \ - value-inherit-shorthand.css \ - value-inherit-shorthand.ref.css \ - value-initial.css \ - value-initial.errors \ - value-initial-shorthand.css \ - value-initial-shorthand.ref.css \ - value-none.css \ - value-none.errors \ - value-none.ref.css \ - widget-style-property.css \ - $(NULL) - -EXTRA_DIST += $(test_in_files) $(test_data) - -EXTRA_DIST += \ - meson.build - -if BUILDOPT_INSTALL_TESTS -insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/parser -insttest_PROGRAMS = $(TEST_PROGS) -insttest_DATA = $(test_data) - -substitutions = \ - -e s,@libexecdir\@,$(libexecdir),g \ - $(NULL) - -test_files = $(test_in_files:.test.in=.test) - -$(test_files): %.test: %.test.in - $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@ - -EXTRA_DIST += \ - $(test_in_files) - -CLEANFILES += $(test_files) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css/parser -testmeta_DATA = $(test_files) -endif - --include $(top_srcdir)/git.mk diff --git a/testsuite/css/style/Makefile.am b/testsuite/css/style/Makefile.am deleted file mode 100644 index 2ef0e55b61..0000000000 --- a/testsuite/css/style/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -NULL = - -CLEANFILES = - -TEST_PROGS += test-css-style -test_in_files = test-css-style.test.in - -check_PROGRAMS = $(TEST_PROGS) - -test_css_style_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(NULL) - -test_css_style_LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) \ - $(NULL) - -test_css_style_SOURCES = \ - test-css-style.c \ - resources.c \ - $(NULL) - -test_data = \ - adjacent-states.ui adjacent-states.css adjacent-states.nodes \ - colornames.ui colornames.css colornames.nodes \ - currentcolor.ui currentcolor.css currentcolor.nodes \ - font.ui font.css font.nodes \ - gradient.ui gradient.css gradient.nodes \ - inherit.ui inherit.css inherit.nodes \ - label.ui label.css label.nodes \ - nth-child.ui nth-child.css nth-child.nodes \ - $(NULL) - -BUILT_SOURCES = resources.c - -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/test-css-style.gresource.xml) - -resources.c: test-css-style.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/test-css-style.gresource.xml - -EXTRA_DIST += \ - test-css-style.gresource.xml \ - $(resource_files) \ - $(test_in_files) \ - $(test_data) \ - meson.build \ - $(NULL) - -if BUILDOPT_INSTALL_TESTS -insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/style -insttest_PROGRAMS = $(TEST_PROGS) -insttest_DATA = $(test_data) - -substitutions = \ - -e s,@libexecdir\@,$(libexecdir),g \ - $(NULL) - -test_files = $(test_in_files:.test.in=.test) - -$(test_files): %.test: %.test.in - $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@ - -EXTRA_DIST += \ - $(test_files) \ - $(NULL) - -CLEANFILES += $(test_files) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css/style -testmeta_DATA = $(test_files) -endif - - --include $(top_srcdir)/git.mk diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am deleted file mode 100644 index 1b5fc4fe41..0000000000 --- a/testsuite/gdk/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -NULL= - -noinst_PROGRAMS = $(TEST_PROGS) - -AM_CPPFLAGS = \ - $(GDK_DEP_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - $(NULL) - -LDADD = \ - $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk/libgdk-3.la \ - $(NULL) - -#TEST_PROGS += check-gdk-cairo - -TEST_PROGS += \ - cairo \ - display \ - encoding \ - keysyms \ - rectangle \ - rgba \ - seat \ - visual \ - $(NULL) - -CLEANFILES = \ - cairosurface.png \ - gdksurface.png \ - $(NULL) - -EXTRA_DIST += \ - check-gdk-cairo.c \ - meson.build - -if BUILDOPT_INSTALL_TESTS -insttestdir=$(libexecdir)/installed-tests/$(PACKAGE) -insttest_PROGRAMS = $(TEST_PROGS) - -%.test: %$(EXEEXT) Makefile - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session' >> $@.tmp; \ - echo 'Output=TAP' >> $@.tmp; \ - echo 'Exec=$(insttestdir)/$< --tap' >> $@.tmp; \ - mv $@.tmp $@) - -test_files = $(TEST_PROGRS:=.test) - -DISTCLEANFILES = $(test_files) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE) -testmeta_DATA = $(test_files) -endif - --include $(top_srcdir)/git.mk diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am deleted file mode 100644 index 843a5156a7..0000000000 --- a/testsuite/gtk/Makefile.am +++ /dev/null @@ -1,308 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -NULL = - -AM_CPPFLAGS = \ - -DGTK_LOCALEDIR=\"$(localedir)\"\ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gtk \ - -I$(top_srcdir)/gtk \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -if OS_UNIX -AM_CPPFLAGS += -DHAVE_UNIX_PRINT_WIDGETS -endif - -DEPS = \ - $(top_builddir)/gtk/libgtk-3.la - -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - -BUILT_SOURCES = - -CLEANFILES = - -noinst_PROGRAMS = $(TEST_PROGS) - -TESTS_ENVIRONMENT = \ - G_ENABLE_DIAGNOSTIC=0 \ - GIO_USE_VFS=local \ - GSETTINGS_BACKEND=memory - -TEST_PROGS += \ - accel \ - accessible \ - action \ - adjustment \ - bitmask \ - builder \ - builderparser \ - cellarea \ - check-icon-names \ - check-cursor-names \ - clipboard \ - cssprovider \ - defaultvalue \ - entry \ - firefox-stylecontext \ - floating \ - focus \ - gestures \ - grid \ - gtkmenu \ - icontheme \ - keyhash \ - listbox \ - notify \ - no-gtk-init \ - object \ - objects-finalize \ - papersize \ - rbtree \ - recentmanager \ - regression-tests \ - scrolledwindow \ - spinbutton \ - stylecontext \ - templates \ - textbuffer \ - textiter \ - treemodel \ - treepath \ - treeview \ - typename \ - window \ - displayclose \ - revealer-size \ - $(NULL) - -if OS_UNIX -#TEST_PROGS += defaultvalue -endif - -if HAVE_CXX - -AM_CXXFLAGS = $(AM_CPPFLAGS) - -TEST_PROGS += autotestkeywords - -autotestkeywords_SOURCES = autotestkeywords.cc -autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers - -if HAVE_OBJC -autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++ -endif - -endif - -treemodel_SOURCES = \ - treemodel.h \ - treemodel.c \ - liststore.c \ - treestore.c \ - filtermodel.c \ - sortmodel.c \ - modelrefcount.c \ - gtktreemodelrefcount.h \ - gtktreemodelrefcount.c \ - $(NULL) - -builder_LDFLAGS = -export-dynamic - -rbtree_CFLAGS = -DGTK_COMPILATION -UG_ENABLE_DEBUG -rbtree_LDADD = $(GTK_DEP_LIBS) -rbtree_SOURCES = \ - rbtree.c \ - gtkrbtree.c \ - $(NULL) - -gtkrbtree.c: $(top_srcdir)/gtk/gtkrbtree.c - $(AM_V_GEN) $(LN_S) $^ $@ - -CLEANFILES += gtkrbtree.c - -bitmask_CFLAGS = -DGTK_COMPILATION -UG_ENABLE_DEBUG -bitmask_LDADD = $(GTK_DEP_LIBS) -bitmask_SOURCES = \ - bitmask.c \ - gtkallocatedbitmask.c \ - $(NULL) - -gtkallocatedbitmask.c: $(top_srcdir)/gtk/gtkallocatedbitmask.c - $(AM_V_GEN) $(LN_S) $^ $@ - -CLEANFILES += gtkallocatedbitmask.c - -keyhash_CFLAGS = \ - -DGTK_COMPILATION \ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ - $(NULL) - -keyhash_SOURCES = \ - keyhash.c \ - gtkkeyhash.c \ - gtkresources.c \ - gtkprivate.c \ - $(NULL) - -gtkkeyhash.c: $(top_srcdir)/gtk/gtkkeyhash.c - $(AM_V_GEN) $(LN_S) $^ $@ - -gtkresources.c: $(top_builddir)/gtk/gtkresources.c - $(AM_V_GEN) $(LN_S) $^ $@ - -gtkprivate.c: $(top_srcdir)/gtk/gtkprivate.c - $(AM_V_GEN) $(LN_S) $^ $@ - -CLEANFILES += gtkkeyhash.c gtkresources.c gtkprivate.c - -test_icontheme = \ - icons/index.theme \ - icons/16x16/simple.png \ - icons/16x16/twosize-fixed.svg \ - icons/16x16s/twosize.svg \ - icons/32x32/only32-symbolic.svg \ - icons/32x32/twosize-fixed.svg \ - icons/32x32s/twosize.svg \ - icons/scalable/everything-justregular.svg \ - icons/scalable/everything-justrtl-rtl.svg \ - icons/scalable/everything-rtl.svg \ - icons/scalable/everything-symbolic-rtl.svg \ - icons/scalable/everything-justsymbolic-symbolic.svg \ - icons/scalable/everything.svg \ - icons/scalable/everything-symbolic.svg \ - icons/scalable/nonsquare-symbolic.svg \ - icons/15/size-test.png \ - icons/16-22/size-test.png \ - icons/25+/size-test.svg \ - icons/35+/size-test.svg \ - icons/scalable/one-two.svg \ - icons/scalable/one-two-rtl.svg \ - icons2/scalable/one-two-three-symbolic.svg \ - icons2/scalable/one-two-symbolic.svg \ - icons2/scalable/one-two-symbolic-rtl.svg \ - icons2/index.theme \ - $(NULL) - -test_ui = \ - ui/test1.ui ui/test1.expected \ - ui/test2.ui ui/test2.expected \ - ui/test3.ui ui/test3.expected \ - ui/test4.ui ui/test4.expected \ - ui/test5.ui ui/test5.expected \ - ui/test6.ui ui/test6.expected \ - ui/test7.ui ui/test7.expected \ - ui/label1.ui ui/label1.expected \ - ui/label2.ui ui/label2.expected \ - ui/label3.ui ui/label3.expected \ - ui/label4.ui ui/label4.expected \ - ui/label5.ui ui/label5.expected \ - ui/celllayout1.ui ui/celllayout1.expected \ - ui/celllayout2.ui ui/celllayout2.expected \ - ui/celllayout3.ui ui/celllayout3.expected \ - ui/celllayout4.ui ui/celllayout4.expected \ - ui/celllayout5.ui ui/celllayout5.expected \ - ui/celllayout6.ui ui/celllayout6.expected \ - ui/celllayout7.ui ui/celllayout7.expected \ - ui/container1.ui ui/container1.expected \ - ui/container2.ui ui/container2.expected \ - ui/container3.ui ui/container3.expected \ - ui/container4.ui ui/container4.expected \ - ui/container5.ui ui/container5.expected \ - ui/container6.ui ui/container6.expected \ - ui/container7.ui ui/container7.expected \ - ui/container8.ui ui/container8.expected \ - ui/scale1.ui ui/scale1.expected \ - ui/scale2.ui ui/scale2.expected \ - ui/scale3.ui ui/scale3.expected \ - ui/scale4.ui ui/scale4.expected \ - ui/scale5.ui ui/scale5.expected \ - ui/scale6.ui ui/scale6.expected \ - ui/scale7.ui ui/scale7.expected \ - ui/levelbar1.ui ui/levelbar1.expected \ - ui/levelbar2.ui ui/levelbar2.expected \ - ui/levelbar3.ui ui/levelbar3.expected \ - ui/levelbar4.ui ui/levelbar4.expected \ - ui/levelbar5.ui ui/levelbar5.expected \ - ui/levelbar6.ui ui/levelbar6.expected \ - ui/dialog1.ui ui/dialog1.expected \ - ui/dialog2.ui ui/dialog2.expected \ - ui/dialog3.ui ui/dialog3.expected \ - ui/dialog4.ui ui/dialog4.expected \ - ui/dialog5.ui ui/dialog5.expected \ - ui/dialog6.ui ui/dialog6.expected \ - ui/filefilter1.ui ui/filefilter1.expected \ - ui/filefilter2.ui ui/filefilter2.expected \ - ui/filefilter3.ui ui/filefilter3.expected \ - ui/filefilter4.ui ui/filefilter4.expected \ - ui/filefilter5.ui ui/filefilter5.expected \ - ui/filefilter6.ui ui/filefilter6.expected \ - ui/filefilter7.ui ui/filefilter7.expected \ - ui/filefilter8.ui ui/filefilter8.expected \ - ui/filefilter9.ui ui/filefilter9.expected \ - ui/filefilter10.ui ui/filefilter10.expected \ - ui/infobar1.ui ui/infobar1.expected \ - ui/infobar2.ui ui/infobar2.expected \ - ui/infobar3.ui ui/infobar3.expected \ - ui/infobar4.ui ui/infobar4.expected \ - ui/infobar5.ui ui/infobar5.expected \ - ui/infobar6.ui ui/infobar6.expected \ - ui/image1.ui ui/image1.expected \ - ui/image2.ui ui/image2.expected \ - $(NULL) - -EXTRA_DIST += \ - file-chooser-test-dir/empty \ - file-chooser-test-dir/text.txt \ - $(test_icontheme) \ - $(test_ui) \ - meson.build \ - gtk.test.in \ - $(NULL) - -GTK_GSETTINGS_SCHEMAS = \ - $(top_srcdir)/gtk/org.gtk.Settings.ColorChooser.gschema.xml \ - $(top_srcdir)/gtk/org.gtk.Settings.FileChooser.gschema.xml \ - $(NULL) - -BUILT_SOURCES += gschemas.compiled - -CLEANFILES += gschemas.compiled - -gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) \ - $(addprefix --schema-file=,$(GTK_GSETTINGS_SCHEMAS)) \ - --targetdir=$(builddir) - -all-am: gschemas.compiled - -if BUILDOPT_INSTALL_TESTS -insttestdir = $(libexecdir)/installed-tests/$(PACKAGE) -insttest_PROGRAMS = $(TEST_PROGS) -nobase_insttest_DATA = $(test_icontheme) $(test_ui) - -%.test: %$(EXEEXT) Makefile - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session' >> $@.tmp; \ - echo 'Output=TAP' >> $@.tmp; \ - echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$< --tap' >> $@.tmp; \ - mv $@.tmp $@) - -test_files = $(TEST_PROGS:=.test) - -DISTCLEANFILES = $(test_files) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE) -testmeta_DATA = $(test_files) -endif - --include $(top_srcdir)/git.mk diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build index 84a8cfc1c6..5e2324ae5b 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -112,7 +112,7 @@ foreach t : tests endforeach # FIXME: if objc autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++ -if add_languages('cpp', required: false) +if add_languages('cpp', required: false, native: false) test_exe = executable('autotestkeywords', 'autotestkeywords.cc', c_args : test_cargs + ['-Idummy-headers'], diff --git a/testsuite/meson.build b/testsuite/meson.build index 032baf2979..42f059095c 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -2,12 +2,10 @@ gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir')) installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk+') installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk+') -if meson.version().version_compare('>=0.57.0') - add_test_setup('default', - is_default: true, - exclude_suites: ['flaky', 'failing'], - ) -endif +add_test_setup('default', + is_default: true, + exclude_suites: ['flaky', 'failing'], +) subdir('gtk') subdir('gdk') diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am deleted file mode 100644 index 1f67e2f996..0000000000 --- a/testsuite/reftests/Makefile.am +++ /dev/null @@ -1,546 +0,0 @@ -include $(top_srcdir)/Makefile.decl -NULL = - -TESTS_ENVIRONMENT = \ - REFTEST_MODULE_DIR=$(abs_builddir) \ - GTK_IM_MODULE=gtk-im-context-simple \ - GSETTINGS_BACKEND=memory \ - G_ENABLE_DIAGNOSTIC=0 - -TEST_PROGS += gtk-reftest - -check_PROGRAMS = $(TEST_PROGS) - -gtk_reftest_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(GMODULE_CFLAGS) \ - $(NULL) - -gtk_reftest_LDADD = \ - libgtkreftestprivate.la \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) \ - $(GMODULE_LIBS) \ - $(NULL) - -if PLATFORM_WIN32 -noinst_LTLIBRARIES = -lib_LTLIBRARIES = \ - libgtkreftestprivate.la \ - $(NULL) -else -noinst_LTLIBRARIES = \ - libgtkreftestprivate.la \ - $(NULL) -endif - -libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS) -libgtkreftestprivate_la_LDFLAGS = $(no_undefined) -libgtkreftestprivate_la_LIBADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ - $(GTK_DEP_LIBS) \ - $(GMODULE_LIBS) \ - $(NULL) - -libgtkreftestprivate_la_SOURCES = \ - reftest-compare.c \ - reftest-compare.h \ - reftest-module.c \ - reftest-module.h \ - reftest-snapshot.c \ - reftest-snapshot.h \ - $(NULL) - -gtk_reftest_SOURCES = \ - gtk-reftest.c \ - gtk-reftest.h - -clean-local: - rm -rf output/ || true - -EXTRA_DIST += \ - align-expand.sh \ - meson.build \ - $(NULL) - -testdata = \ - 721800-0px-dotted-border.css \ - 721800-0px-dotted-border.ref.ui \ - 721800-0px-dotted-border.ui \ - actionbar.css \ - actionbar.ref.ui \ - actionbar.ui \ - alignment-props.css \ - alignment-props.ref.ui \ - alignment-props.ui \ - animation-direction.css \ - animation-direction.ref.ui \ - animation-direction.ui \ - animation-fill-mode-iteration-count.css \ - animation-fill-mode-iteration-count.ref.ui \ - animation-fill-mode-iteration-count.ui \ - background-area.css \ - background-area.ref.ui \ - background-area.ui \ - background-blend-mode-clip-interaction.css \ - background-blend-mode-clip-interaction.ref.ui \ - background-blend-mode-clip-interaction.ui \ - background-color-transparent.css \ - background-color-transparent.ref.ui \ - background-color-transparent.ui \ - background-image-multiple.css \ - background-image-multiple.ref.ui \ - background-image-multiple.ui \ - background-origin.css \ - background-origin.ref.ui \ - background-origin.ui \ - background-positioning-area-empty.ref.ui \ - background-positioning-area-empty.ui \ - background-position.css \ - background-position.ref.ui \ - background-position.ui \ - background-position-repeat.css \ - background-position-repeat.ref.ui \ - background-position-repeat.ui \ - background-position-repeat-bg.png \ - background-position-simple.css \ - background-position-simple.ref.ui \ - background-position-simple.ui \ - background-size.css \ - background-size.ref.ui \ - background-size.ui \ - background-size-keywords.css \ - background-size-keywords.ref.ui \ - background-size-keywords.ui \ - background-size-zero.css \ - background-size-zero.ref.ui \ - background-size-zero.ui \ - background-window-transparent.css \ - background-window-transparent.ref.ui \ - background-window-transparent.ui \ - bad-color-names.css \ - bad-color-names.ref.ui \ - bad-color-names.ui \ - reference-background-origin.png \ - border-color-default.css \ - border-color-default.ref.ui \ - border-color-default.ui \ - border-corner-zero-width-rendering.css \ - border-corner-zero-width-rendering.ref.ui \ - border-corner-zero-width-rendering.ui \ - border-half-pixel.css \ - border-half-pixel.ref.ui \ - border-half-pixel.ui \ - border-image-ball-green.png \ - border-image-ball-red.png \ - border-image-ball-yellow.png \ - border-image-balls.png \ - border-image-3-balls-green.png \ - border-image-3-balls-green-squished.png \ - border-image-3-balls-yellow.png \ - border-image-3-balls-yellow-squished.png \ - border-image-excess-size.css \ - border-image-excess-size.ref.ui \ - border-image-excess-size.ui \ - border-image-gradient.css \ - border-image-gradient.ref.ui \ - border-image-gradient.ui \ - border-image-url-scaled.css \ - border-image-url-scaled.ref.ui \ - border-image-url-scaled.ui \ - border-image-url.css \ - border-image-url.ref.ui \ - border-image-url.ui \ - border-radius-clamp.css \ - border-radius-clamp.ref.ui \ - border-radius-clamp.ui \ - border-rgb.png \ - border-rgb@2.png \ - border-style-none.css \ - border-style-none.ref.ui \ - border-style-none.ui \ - border-style.css \ - border-style.ref.ui \ - border-style.ui \ - box-child-expand.ref.ui \ - box-child-expand.ui \ - box-order.css \ - box-order.ref.ui \ - box-order.ui \ - box-packing.css \ - box-packing.ref.ui \ - box-packing.ui \ - box-pseudo-classes.css \ - box-pseudo-classes.ref.ui \ - box-pseudo-classes.ui \ - box-shadow-changes-modify-clip.css \ - box-shadow-changes-modify-clip.ref.ui \ - box-shadow-changes-modify-clip.ui \ - box-shadow-spec-inset.css \ - box-shadow-spec-inset.ref.ui \ - box-shadow-spec-inset.ui \ - box-shadow-spread.css \ - box-shadow-spread.ref.ui \ - box-shadow-spread.ui \ - box-shadow-with-blend-mode.css \ - box-shadow-with-blend-mode.ref.ui \ - box-shadow-with-blend-mode.ui \ - button-wrapping.ui \ - button-wrapping.ref.ui \ - cellrenderer-pixbuf-stock-rtl.css \ - cellrenderer-pixbuf-stock-rtl.ui \ - cellrenderer-pixbuf-stock-rtl.ref.ui \ - color-transition.css \ - color-transition.ref.ui \ - color-transition.ui \ - css-em-label-size.css \ - css-em-label-size.ui \ - css-em-label-size.ref.ui \ - css-currentcolor-alpha.css \ - css-currentcolor-alpha.ui \ - css-currentcolor-alpha.ref.ui \ - css-image-aspect-ratio.css \ - css-image-aspect-ratio.ui \ - css-image-aspect-ratio.ref.ui \ - css-image-color-aspect-ratio.css \ - css-image-color-aspect-ratio.ui \ - css-image-color-aspect-ratio.ref.ui \ - css-match-class.css \ - css-match-class.ref.ui \ - css-match-class.ui \ - css-match-descendant-later.css \ - css-match-descendant-later.ref.ui \ - css-match-descendant-later.ui \ - css-match-exact.css \ - css-match-exact.ref.ui \ - css-match-exact.ui \ - css-match-import.css \ - css-match-import-import.css \ - css-match-import.ui \ - css-match-import.ref.ui \ - css-match-inherit.css \ - css-match-inherit.ref.ui \ - css-match-inherit.ui \ - css-match-inherit-different-state.css \ - css-match-inherit-different-state.ref.ui \ - css-match-inherit-different-state.ui \ - css-match-name.css \ - css-match-name.ref.ui \ - css-match-name.ui \ - css-match-siblings.css \ - css-match-siblings.ref.ui \ - css-match-siblings.ui \ - css-match-type.css \ - css-match-type.ref.ui \ - css-match-type.ui \ - css-multi-state.css \ - css-multi-state.ref.ui \ - css-multi-state.ui \ - fixed-widget-stacking.ref.ui \ - fixed-widget-stacking.ui \ - flipping-icons.ref.ui \ - flipping-icons.ui \ - font-sizes-names.css \ - font-sizes-names.ref.ui \ - font-sizes-names.ui \ - gtk-image-effect-inherit.css \ - gtk-image-effect-inherit.ref.ui \ - gtk-image-effect-inherit.ui \ - green-20x20.png \ - grid-empty-with-spacing.ref.ui \ - grid-empty-with-spacing.ui \ - grid-expand.css \ - grid-expand.ref.ui \ - grid-expand.ui \ - grid-wfh.ui \ - grid-wfh.ref.ui \ - grid-homogeneous.css \ - grid-homogeneous.ref.ui \ - grid-homogeneous.ui \ - grid-spacing1.ref.ui \ - grid-spacing1.ui \ - grid-spacing2.ref.ui \ - grid-spacing2.ui \ - grid-spacing3.css \ - grid-spacing3.ref.ui \ - grid-spacing3.ui \ - gtk-icontheme-sizing.css \ - gtk-icontheme-sizing.ref.ui \ - gtk-icontheme-sizing.ui \ - icon-effect-missing.css \ - icon-effect-missing.ref.ui \ - icon-effect-missing.ui \ - icon-shadow-no-transform.css \ - icon-shadow-no-transform.ref.ui \ - icon-shadow-no-transform.ui \ - icon-style-basics.css \ - icon-style-basics.ref.ui \ - icon-style-basics.ui \ - icon-vfuncs.css \ - icon-vfuncs.ref.ui \ - icon-vfuncs.ui \ - iconview-empty.css \ - iconview-empty.ui \ - iconview-empty.ref.ui \ - image-icon-name-use-fallback.ui \ - image-icon-name-use-fallback.ref.ui \ - image-icon-shadow-clipping.css \ - image-icon-shadow-clipping.ref.ui \ - image-icon-shadow-clipping.ui \ - image-load-from-file.css \ - image-load-from-file.ref.ui \ - image-load-from-file.ui \ - image-recording-surface.ref.ui \ - image-recording-surface.ui \ - info-bar-message-types.css \ - info-bar-message-types.ref.ui \ - info-bar-message-types.ui \ - inherit-and-initial.css \ - inherit-and-initial.ref.ui \ - inherit-and-initial.ui \ - label-attribute-preference.css \ - label-attribute-preference.ref.ui \ - label-attribute-preference.ui \ - label-background.css \ - label-background.ref.ui \ - label-background.ui \ - label-box-shadow-clip.css \ - label-box-shadow-clip.ref.ui \ - label-box-shadow-clip.ui \ - label-clipping.css \ - label-clipping.ref.ui \ - label-clipping.ui \ - label-ellipsize-small.ref.ui \ - label-ellipsize-small.ui \ - label-ellipsize-with-big.ref.ui \ - label-ellipsize-with-big.ui \ - label-fonts.css \ - label-fonts.ref.ui \ - label-fonts.ui \ - label-shadows.css \ - label-shadows.ref.ui \ - label-shadows.ui \ - label-sizing.css \ - label-sizing.ref.ui \ - label-sizing.ui \ - label-small-ellipsized.ref.ui \ - label-small-ellipsized.ui \ - label-text-shadow-clipping.css \ - label-text-shadow-clipping.ref.ui \ - label-text-shadow-clipping.ui \ - label-width-chars-dont-shrink.ref.ui \ - label-width-chars-dont-shrink.ui \ - label-wrap-justify.ref.ui \ - label-wrap-justify.ui \ - letter-spacing.css \ - letter-spacing.ui \ - letter-spacing.ref.ui \ - linear-gradient.css \ - linear-gradient.ref.ui \ - linear-gradient.ui \ - linear-gradient-transition-to-other.css \ - linear-gradient-transition-to-other.ref.ui \ - linear-gradient-transition-to-other.ui \ - link-coloring.css \ - link-coloring.ref.ui \ - link-coloring.ui \ - marble.xpm \ - messagedialog-secondarytext.ui \ - messagedialog-secondarytext.ref.ui \ - misc-alignment.css \ - misc-alignment.ref.ui \ - misc-alignment.ui \ - named-colors.css \ - named-colors.ref.ui \ - named-colors.ui \ - no-colors.css \ - no-colors.ref.ui \ - no-colors.ui \ - nonresizable-size.ref.ui \ - nonresizable-size.ui \ - notebook-childproperties.css \ - notebook-childproperties.ui \ - notebook-childproperties.ref.ui \ - notebook-tab-position.css \ - notebook-tab-position.ui \ - notebook-tab-position.ref.ui \ - nth-child.css \ - nth-child.ref.ui \ - nth-child.ui \ - opacity.css \ - opacity.ui \ - opacity.ref.ui \ - opacity-initial.css \ - opacity-initial.ref.ui \ - opacity-initial.ui \ - overlay-no-main-widget.ref.ui \ - overlay-no-main-widget.ui \ - paned-undersized.css \ - paned-undersized.ref.ui \ - paned-undersized.ui \ - pseudoclass-on-box.css \ - pseudoclass-on-box.ref.ui \ - pseudoclass-on-box.ui \ - pseudoclass-on-parent.css \ - pseudoclass-on-parent.ref.ui \ - pseudoclass-on-parent.ui \ - quit-mnemonic.css \ - quit-mnemonic.ref.ui \ - quit-mnemonic.ui \ - reset-to-defaults.css \ - revealer-extra-size.ref.ui \ - revealer-extra-size.ui \ - revealer-wrappable-contents.ref.ui \ - revealer-wrappable-contents.ui \ - rotated-layout.ref.ui \ - rotated-layout.ui \ - separator-size.css \ - separator-size.ref.ui \ - separator-size.ui \ - set-default-direction.ui \ - set-default-direction.ref.ui \ - shadow-clip-rounding.css \ - shadow-clip-rounding.ref.ui \ - shadow-clip-rounding.ui \ - shorthand-entry-border.css \ - shorthand-entry-border.ref.ui \ - shorthand-entry-border.ui \ - sibling-pseudoclasses.css \ - sibling-pseudoclasses.ref.ui \ - sibling-pseudoclasses.ui \ - simple.ref.ui \ - simple.ui \ - sizegroups-basics.css \ - sizegroups-basics.ui \ - sizegroups-basics.ref.ui \ - sizegroups-evolution-identity-page.ui \ - sizegroups-evolution-identity-page.ref.ui \ - sizegroups-get-preferred-null.ui \ - sizegroups-get-preferred-null.ref.ui \ - statusbar-remove-all.ref.ui \ - statusbar-remove-all.ui \ - style-context-save-inheritance.css \ - style-context-save-inheritance.ref.ui \ - style-context-save-inheritance.ui \ - style-properties-nth-child.css \ - style-properties-nth-child.ref.ui \ - style-properties-nth-child.ui \ - style-properties-only-child.css \ - style-properties-only-child.ref.ui \ - style-properties-only-child.ui \ - symbolic-icon-translucent-color.css \ - symbolic-icon-translucent-color.ref.ui \ - symbolic-icon-translucent-color.ui \ - textview-border-windows.css \ - textview-border-windows.ref.ui \ - textview-border-windows.ui \ - textview-margins.css \ - textview-margins.ref.ui \ - textview-margins.ui \ - textview-tags.ref.ui \ - textview-tags.ui \ - treeview-fixed-height.css \ - treeview-fixed-height.ref.ui \ - treeview-fixed-height.ui \ - treeview-headers-hidden.ref.ui \ - treeview-headers-hidden.ui \ - unresolvable.css \ - unresolvable.ref.ui \ - unresolvable.ui \ - window-border-width.ref.ui \ - window-border-width.ui \ - window-default-size.ref.ui \ - window-default-size.ui \ - window-height-for-width.ref.ui \ - window-height-for-width.ui \ - window-show-contents-on-map.ref.ui \ - window-show-contents-on-map.ui \ - $(NULL) - -EXTRA_DIST += \ - $(testdata) \ - reftests-dark.test.in \ - reftests-hc.test.in \ - reftests-hci.test.in \ - reftests.test.in \ - $(NULL) - -GTK_GSETTINGS_SCHEMAS = \ - $(top_srcdir)/gtk/org.gtk.Settings.ColorChooser.gschema.xml \ - $(top_srcdir)/gtk/org.gtk.Settings.FileChooser.gschema.xml \ - $(NULL) - -BUILT_SOURCES = gschemas.compiled - -CLEANFILES = gschemas.compiled - -gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) \ - $(addprefix --schema-file=,$(GTK_GSETTINGS_SCHEMAS)) \ - --targetdir=$(builddir) - -all-am: gschemas.compiled - -if BUILDOPT_INSTALL_TESTS -insttestdir=$(libexecdir)/installed-tests/$(PACKAGE) -insttest_PROGRAMS = gtk-reftest - -reftestdir = $(insttestdir)/reftests -reftest_DATA = $(testdata) -reftest_LTLIBRARIES = \ - libreftest.la \ - $(NULL) - -libreftest_la_LDFLAGS = -rpath $(reftestdir) - -substitutions = \ - -e s,@libexecdir\@,$(libexecdir),g \ - $(NULL) - -%.test: %.test.in - $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@ - -built_tests = \ - reftests.test \ - reftests-dark.test \ - reftests-hc.test \ - reftests-hci.test \ - $(NULL) - -DISTCLEANFILES = $(built_tests) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE) -testmeta_DATA = $(built_tests) -else -noinst_LTLIBRARIES += \ - libreftest.la \ - $(NULL) - -libreftest_la_LDFLAGS = -rpath /iHaveNoIdeaWhatImDoing - -endif - -libreftest_la_LDFLAGS += -avoid-version -module $(no_undefined) -libreftest_la_CFLAGS = $(gtk_reftest_CFLAGS) -libreftest_la_LIBADD = $(gtk_reftest_LDADD) -libreftest_la_SOURCES = \ - expand-expander.c \ - frame-inhibitor.c \ - image-recording-surface.c \ - letter-spacing.c \ - set-default-direction.c \ - statusbar-remove-all.c \ - textview-border-windows.c \ - textview-tags.c \ - animation-direction.c \ - $(NULL) - --include $(top_srcdir)/git.mk diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am deleted file mode 100644 index 6893736d38..0000000000 --- a/testsuite/tools/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -NULL = - -test_simplify = \ - simplify/test1.ui simplify/test1.expected \ - simplify/test2.ui simplify/test2.expected \ - simplify/test3.ui simplify/test3.expected \ - simplify/test4.ui simplify/test4.expected \ - simplify/test5.ui simplify/test5.expected \ - simplify/test6.ui simplify/test6.expected \ - simplify/test7.ui simplify/test7.expected \ - simplify/test8.ui simplify/test8.expected \ - $(NULL) - -EXTRA_DIST += \ - $(test_simplify) \ - test-simplify.in \ - test-settings.in \ - tools.test.in \ - meson.build \ - $(NULL) - -TESTS_ENVIRONMENT = \ - GTK_BUILDER_TOOL="$(top_builddir)/gtk/gtk-builder-tool" \ - GTK_QUERY_SETTINGS="$(top_builddir)/gtk/gtk-query-settings" \ - $(NULL) - -TEST_PROGS += \ - test-simplify \ - test-settings \ - $(NULL) - -test-simplify:test-simplify.in - $(AM_V_GEN) cp $< $@ - -test-settings:test-settings.in - $(AM_V_GEN) cp $< $@ - -if BUILDOPT_INSTALL_TESTS -insttestdir = $(libexecdir)/installed-tests/$(PACKAGE) -insttest_SCRIPTS = $(TEST_PROGS) -nobase_insttest_DATA = $(test_simplify) - -%.test: % Makefile - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session' >> $@.tmp; \ - echo 'Output=TAP' >> $@.tmp; \ - echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR="$(insttestdir)/simplify" $(insttestdir)/$<' >> $@.tmp; \ - mv $@.tmp $@) - -test_files = $(TEST_PROGS:=.test) - -DISTCLEANFILES = \ - $(TEST_PROGS) \ - $(test_files) \ - $(NULL) - -testmetadir = $(datadir)/installed-tests/$(PACKAGE) -testmeta_DATA = $(test_files) -endif - --include $(top_srcdir)/git.mk diff --git a/win32/.gitignore b/win32/.gitignore deleted file mode 100644 index ff4ebff698..0000000000 --- a/win32/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config-msvc.mak diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am deleted file mode 100644 index 44c927a867..0000000000 --- a/win32/Makefile-newvs.am +++ /dev/null @@ -1,46 +0,0 @@ -# Centralized autotools file -# Create the Visual Studio 2012/2013/2015 project files -# from the Visual Studio 2010 project files - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support, and is copied into -# $(srcroot)/build/. - -# Author: Fan, Chun-wei -# November 05, 2012 - -# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017) -# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET) - -if MSVC_BASE_NO_TOOLSET_SET -MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 -endif - -if MSVC_NO_TOOLSET_SET -MSVC_TOOLSET = $(MSVC_VER)0 -endif - -%.sln: $(top_builddir)/win32/vs10/Makefile - sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - -%.txt: $(top_builddir)/win32/vs10/Makefile - sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - -%.vcxproj: $(top_builddir)/win32/vs10/Makefile - if test -e $(top_srcdir)/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi - -%.vcxproj.filters: $(top_builddir)/win32/vs10/Makefile - if test -e $(top_srcdir)/win32/vs10/$@; then \ - cp $(top_srcdir)/win32/vs10/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - else \ - cp $(top_builddir)/win32/vs10/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi diff --git a/win32/Makefile.am b/win32/Makefile.am deleted file mode 100644 index e82e257929..0000000000 --- a/win32/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -SUBDIRS = \ - vs9 \ - vs10 \ - vs11 \ - vs12 \ - vs14 \ - vs15 \ - vs16 \ - vs17 \ - vs1x-props - -EXTRA_DIST += \ - config-msvc.mak \ - config-msvc.mak.in \ - create-lists.bat \ - create-lists-msvc.mak \ - detectenv-msvc.mak \ - gen-version-items.py \ - generate-msvc.mak \ - generate-msvcprojs.mak \ - gtk-introspection-msvc.mak \ - introspection-msvc.mak \ - install-msvc.mak \ - replace.py \ - pc_base.py \ - gtkpc.py \ - README_FEATURES_MSVC.md - --include $(top_srcdir)/git.mk diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj deleted file mode 100644 index c341313aee..0000000000 --- a/win32/Makefile.msvcproj +++ /dev/null @@ -1,89 +0,0 @@ -# Author: Fan, Chun-wei -# Common Autotools file used to generate Visual Studio 2008+ -# Projects from their templates - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support, and is copied into -# $(srcroot)/build/. - -# * Input variables: -# -# MSVCPROJS - List of Projects that should be generated -# -# * Simple tutorial -# -# Add this to Makefile.am where your library/program is built: -# include $(top_srcdir)/build/Makefile.msvcproj -# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) -# YourProject_FILES = $(libyourlib_1_0_SOURCES) -# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none -# -# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) -# $(top_builddir)/win32/vs9/YourProject.vcproj - - -# Private functions - -## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable -## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 -_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) -_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) -_proj_path=$(subst /,\\,$(_proj_path_raw)) -_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) -_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) - -_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) -_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) -_proj_filters=$($(_proj_name)_EXCLUDES) - -# -# Creates Visual Studio 2008/2010 projects from items passed in from autotools files -# $(1) - Base Name of the MSVC project files (outputs) -# - -define msvcproj-builder - -$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj -$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj -$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj - -$(top_builddir)/win32/vs9/$(1).vcproj: Makefile - -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj - -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs15/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs15/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs16/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs16/$(1).vcxproj.filters - - for F in $(_proj_files); do \ - case $$$$F in \ - $(_proj_filters)) \ - ;; \ - *.c|*.cpp|*.cc|*.cxx) \ - echo ' ' >>$(1).sourcefiles && \ - echo ' ' >>$(1).vs10.sourcefiles && \ - echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ - ;; \ - esac; \ - done - - - $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj - $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters - $(RM) $(1).sourcefiles - $(RM) $(1).vs10.sourcefiles - $(RM) $(1).vs10.sourcefiles.filters - -endef - -$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/win32/README_FEATURES_MSVC.md b/win32/README_FEATURES_MSVC.md deleted file mode 100644 index fedcdb10b4..0000000000 --- a/win32/README_FEATURES_MSVC.md +++ /dev/null @@ -1,98 +0,0 @@ -Preameble ---- -This file attempts to give further info about how to enable features -that are not available in the Visual Studio project files shipped -with the source release archive, i.e. beyond building GTK with the GDK -Win32 backend, with or without the Broadway GDK backend. - -The following also apply to Visual Studio builds done with Meson in terms -of getting the required dependencies for the optional features. - -Notes on enabling EGL (ANGLE/D3D support) for Windows/Visual Studio builds ---- -There is now support in the GL context creation code for Windows in GDK for -creating and using EGL (OpenGL ES 3) contexts, which can be used instead of -the existing OpenGL (Desktop) support, especially when the graphics drivers -do not support OpenGL adequately. - -This support is not enabled by default in the project files. In order to -do so, please do the following: - -* Obtain or compile a build of recent version of ANGLE. The one that comes - with QT 5.10.x is sufficiently recent, but not the one that comes with - QT-5.6.x. Note that Visual Studio 2013 or later is required for building - ANGLE from QT-5.10.x, but the Visual Studio 2013-built ANGLE DLLs does - work without problems with GTK+ built with Visual Studio 2008~2013. - You may need to obtain `D3Dcompiler_[47|43|42].dll` if it does not come - with the system (which is part of the DirectX runtimes). Visual Studio - 2015 or later can use ANGLE from QT 5.11.x or later, or from Google's - GIT repos, which may require later version of Visual Studio to build. - Its headers and .lib needs to be set to be found by the compiler and - linker respectively before building libepoxy. - -* Build libepoxy with EGL support, which has to be enabled explicitly on - Windows builds. Pass in `-Degl=yes` when building libepoxy using Meson. - Build and install, making sure the headers and .lib can be located by the - compiler and linker respectively. - -* Either: - * Open the `vsX/gtk+.sln`, and open the project properties in the - `gdk3-win32` project. Under "C/C++", add `GDK_WIN32_ENABLE_EGL` in - the `Preprocessor Definitions` to the existing definitions in there - for the configuration that is being built. Then build the solution. -* Or: - * Run in a Visual Studio command prompt: - Go to `$(srcroot)\win32`, and run - `nmake /f generate-msvc.mak regenerate-gdk-vsproj USE_EGL=1`. - To undo that, run that command without `USE_EGL=1`. Python 3.x - must be present in your `%PATH%` or passed in via - `PYTHON=`. This will update all - `gdk3-win32` projects (i.e. VS2008~2022). - -* To force the use of the EGL code, set the envvar `GDK_GL=(...,)gles`, - where `(...,)` are the other `GDK_GL` options desired. - -Enabling the font tweaking features and the font features demo ---- -The font tweaking features in the GTK DLL is enabled automatically if -the Pango 1.44.0 and HarfBuzz 2.2.0 (or later) headers and libraries -(and hence DLLs) are found during compile time. Check in -`gtkfontchooserwidget.c` that the `#pragma comment(lib, "harfbuzz")` line -to ensure that you have your HarfBuzz .lib file named as such, which -is the default .lib name for HarfBuzz builds. - -Alternatively, they can be manually enabled by running `nmake /f generate-msvc.mak regenerate-gtk-vsproj FONT_FEATURES_USE_PANGOFT2=1` -meaning that PangoFT2 must be present, which depends on HarfBuzz, -FontConfig and FreeType. You will then need to ensure the `gtk-3` -projects have the correct .lib's of PangoFT2, HarfBuzz and FreeType -in the `Additional Libraries` entry under the linker settings, as they -assume the most common names are used there. - -Please note that the font features demo is not built into gtk3-demo -by default. To do that, run in a Visual Studio command prompt: - -* Go to `$(srcroot)\win32`, and run - `nmake /f generate-msvc.mak regenerate-demos-h-win32 FONT_FEATURES_DEMO=1`. - To undo that, run that command without `FONT_FEATURES_DEMO=1`. Python 3.x - must be present in your `%PATH%` or passed in via - `PYTHON=`. - -* If you are building the font features demo with the older PangoFT2-style - (i.e. pre-Pango-1.44.x and pre-HarfBuzz-2.2.0) support, pass in - `FONT_FEATURES_USE_PANGOFT2=1` in addition to `FONT_FEATURES_DEMO=1` in - the NMake command line. The gtk3-demo project files will also be updated - with the appropriate dependent libraries linked in-please check that the - project settings contain the correct .lib file names for your system, as - they assume the most common names are used there. - -Building the translations ---- -Building translations is supported via Meson builds or via the Visual -Studio projects, both of which require a working `msgfmt.exe` (from -`gettext-tools`, a part of gettext) in the `%PATH%`, or for the Visual -Studio projects, passed into the arguments in `InstallBuildsBase` -in `gtk3-build-defines.[props|vsprops]` with `MSGFMT=`. -For the Visual Studio projects, for this to work one needs to also supply -a `INSTALL_TRANSLATIONS=1` (without the quotes) argument to the same -`InstallBuildsBase` in the afore-mentioned property sheet. Using -`msgfmt.exe` from Cygwin or MSYS2 is supported as well. diff --git a/win32/bootstrap-msvc.mak b/win32/bootstrap-msvc.mak deleted file mode 100644 index bc3c03a1fe..0000000000 --- a/win32/bootstrap-msvc.mak +++ /dev/null @@ -1,59 +0,0 @@ -# NMake Makefile portion for generating Visual Studio -# projects and the other related items from a GIT checkout. -# Items in here should not need to be edited unless -# one is maintaining the NMake build files. - -!ifndef PYTHON -PYTHON=python -!endif -!ifndef PERL -PERL=perl -!endif - -NMAKE_ARGS = PYTHON=$(PYTHON) PERL=$(PERL) -!ifdef USE_EGL -NMAKE_ARGS = $(NMAKE_ARGS) USE_EGL=$(USE_EGL) -!endif -!ifdef FONT_FEATURES_DEMO -NMAKE_ARGS = $(NMAKE_ARGS) FONT_FEATURES_DEMO=$(FONT_FEATURES_DEMO) -!endif -!ifdef FONT_FEATURES_USE_PANGOFT2 -NMAKE_ARGS = $(NMAKE_ARGS) FONT_FEATURES_USE_PANGOFT2=$(FONT_FEATURES_USE_PANGOFT2) -!endif - -GENERATED_ITEMS = \ - config-msvc.mak \ - ..\config.h.win32 \ - vs9\gtk3-version-paths.vsprops \ - vs1x-props\gtk3-version-paths.props - -all: bootstrap-msvc-projects - -config-msvc.mak: config-msvc.mak.in ..\configure.ac gen-version-items.py -..\config.h.win32: ..\config.h.win32.in ..\configure.ac gen-version-items.py -vs9\gtk3-version-paths.vsprops: vs9\gtk3-version-paths.vsprops.in ..\configure.ac gen-version-items.py -vs1x-props\gtk3-version-paths.props: vs1x-props\gtk3-version-paths.props.in ..\configure.ac gen-version-items.py - -config-msvc.mak \ -..\config.h.win32 \ -vs9\gtk3-version-paths.vsprops \ -vs1x-props\gtk3-version-paths.props: - @echo Generating $@... - @$(PYTHON) .\gen-version-items.py --source=$@.in -o=$@ - -bootstrap-msvc-projects: $(GENERATED_ITEMS) - $(MAKE) /f generate-msvc.mak $(NMAKE_ARGS) generate-broadway-items regenerate-all-msvc-projs - -clean: - @-for %%v in (11 12 14 15 16 17) do @for %%x in (sln vcxproj vcxproj.filters) do @del vs%%v\*.%%x - @for %%x in (vcxproj vcxproj.filters) do @for %%f in (vs10\*.%%x) do @if exist %%fin del %%f - @for %%x in (vcxproj vcxproj.filters) do @for %%f in (vs10\*.%%x) do @if exist %%fin del %%f - @for %%x in (vcproj) do @for %%f in (vs9\*.%%x) do @if exist %%fin del %%f - @-del ..\gdk\broadway\broadwayjs.h ..\gdk\broadway\clienthtml.h - @-del ..\config.h.win32 config-msvc.mak - @-del vs9\gtk3-version-paths.vsprops - @-del vs1x-props\gtk3-version-paths.props - @-for %%v in (9 10 11 12 14 15 16 17) do for %%d in (Debug Release Debug_Broadway Release_Broadway .vs) do rmdir /s/q vs%%v\%%d - @-rmdir /s/q __pycache__ - @-del ..\gdk-*-build - @-for %%v in (9 10 11 12 14 15 16 17) do for %%f in (vs%%v\*.user vs%%v\gtk+.vc.db vs%%v\gtk+.suo) do del /f %%f diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in deleted file mode 100644 index 23f2913f4d..0000000000 --- a/win32/config-msvc.mak.in +++ /dev/null @@ -1,136 +0,0 @@ -# NMake Makefile portion for enabling features for Windows builds - -!include detectenv-msvc.mak - -# Default prefix if not defined -!ifndef PREFIX -PREFIX=..\..\vs$(VSVER)\$(PLAT) -!endif - -# Configurable paths to the various interpreters we need -!ifndef PERL -PERL = perl -!endif - -!ifndef PYTHON -PYTHON=python -!endif - -# Path to the pkg-config tool, if not already in the PATH -!if "$(PKG_CONFIG)" == "" -PKG_CONFIG=pkg-config -!endif - -# Configurable paths to the various scripts and tools that we are using -!ifndef GLIB_MKENUMS -GLIB_MKENUMS = $(PREFIX)\bin\glib-mkenums -!endif - -!ifndef GLIB_GENMARSHAL -GLIB_GENMARSHAL = $(PREFIX)\bin\glib-genmarshal -!endif - -!ifndef GLIB_COMPILE_RESOURCES -GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe -!endif - -!ifndef GDBUS_CODEGEN -GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen -!endif - -!ifndef GLIB_COMPILE_SCHEMAS -GLIB_COMPILE_SCHEMAS = $(PREFIX)\bin\glib-compile-schemas.exe -!endif - -!ifndef MSGFMT -MSGFMT = msgfmt -!endif - -!ifndef INCLUDEDIR -INCLUDEDIR=$(PREFIX)\include -!endif - -!ifndef LIBDIR -LIBDIR=$(PREFIX)\lib -!endif - -!if "$(PLAT)" == "x64" -AT_PLAT=x86_64 -!elseif "$(PLAT)" == "arm64" -AT_PLAT=aarch64 -!elseif "$(PLAT)" == "Win32" -AT_PLAT=i686 -!else -AT_PLAT=unknown -!endif - -demo_sources = $(demos_base) -more_demo_sources = \ - ..\demos\gtk-demo\gtkfishbowl.c \ - ..\demos\gtk-demo\main.c - -!ifdef FONT_FEATURES_DEMO -demo_sources = $(demo_sources) $(font_features_demo) -!endif - -# Please do not change anything beneath this line unless maintaining the NMake Makefiles -GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -GTK_VERSION = @GTK_VERSION@ - -GDK_PREPROCESSOR_FLAGS = \ - /DG_LOG_USE_STRUCTURED=1 \ - /DGDK_COMPILATION \ - /I.. \ - /I..\gdk \ - /I..\gdk\win32 - -GTK_PREPROCESSOR_FLAGS = \ - /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk \ - /I..\gtk \ - /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk \ - /I..\gdk \ - /I..\gdk\win32 \ - /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3 \ - /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3 \ - /I.. \ - /I$(INCLUDEDIR)\gdk-pixbuf-2.0 \ - /I$(INCLUDEDIR)\pango-1.0 \ - /I$(INCLUDEDIR)\atk-1.0 \ - /I$(INCLUDEDIR)\harfbuzz \ - /I$(INCLUDEDIR)\cairo \ - /I$(INCLUDEDIR)\gio-win32-2.0 \ - /I$(INCLUDEDIR)\glib-2.0 \ - /I$(LIBDIR)\glib-2.0\include \ - /I$(INCLUDEDIR) \ - /DHAVE_CONFIG_H \ - /DG_DISABLE_SINGLE_INCLUDES \ - /DATK_DISABLE_SINGLE_INCLUDES \ - /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \ - /DGTK_DISABLE_SINGLE_INCLUDES \ - /D_USE_MATH_DEFINES \ - /DGTK_COMPILATION \ - /DG_LOG_DOMAIN=\"Gtk\" \ - /DGTK_HOST=\"$(AT_PLAT)-pc-vs$(VSVER)\" \ - /DGTK_PRINT_BACKENDS=\"file\" \ - /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - /DINCLUDE_IM_am_et \ - /DINCLUDE_IM_cedilla \ - /DINCLUDE_IM_cyrillic_translit \ - /DINCLUDE_IM_ime \ - /DINCLUDE_IM_inuktitut \ - /DINCLUDE_IM_ipa \ - /DINCLUDE_IM_multipress \ - /DINCLUDE_IM_thai \ - /DINCLUDE_IM_ti_er \ - /DINCLUDE_IM_ti_et \ - /DINCLUDE_IM_viqr \ - /DGTK_LIBDIR=\"$(PREFIX:\=/)/lib\" \ - /DGTK_DATADIR=\"$(PREFIX:\=/)/share\" \ - /DGTK_DATA_PREFIX=\"$(PREFIX:\=/)\" \ - /DGTK_SYSCONFDIR=\"$(PREFIX:\=/)/etc\" \ - /DMULTIPRESS_CONFDIR=\"$(PREFIX:\=/)/etc/gtk-3.0\" \ - /DMULTIPRESS_LOCALEDIR=\"$(PREFIX:\=/)/share/locale\" \ - /DGTK_VERSION=\"$(GTK_VERSION)\" \ - /DGTK_BINARY_VERSION=\"3.0.0\" \ - /DGDK_DISABLE_DEPRECATED \ - /DISOLATION_AWARE_ENABLED diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak deleted file mode 100644 index f678e36d7e..0000000000 --- a/win32/create-lists-msvc.mak +++ /dev/null @@ -1,306 +0,0 @@ -# Convert the source listing to object (.obj) listing in -# another NMake Makefile module, include it, and clean it up. -# This is a "fact-of-life" regarding NMake Makefiles... -# This file does not need to be changed unless one is maintaining the NMake Makefiles - -# For those wanting to add things here: -# To add a list, do the following: -# # $(description_of_list) -# if [call create-lists.bat header $(makefile_snippet_file) $(variable_name)] -# endif -# -# if [call create-lists.bat file $(makefile_snippet_file) $(file_name)] -# endif -# -# if [call create-lists.bat footer $(makefile_snippet_file)] -# endif -# ... (repeat the if [call ...] lines in the above order if needed) -# !include $(makefile_snippet_file) -# -# (add the following after checking the entries in $(makefile_snippet_file) is correct) -# (the batch script appends to $(makefile_snippet_file), you will need to clear the file unless the following line is added) -#!if [del /f /q $(makefile_snippet_file)] -#!endif - -# In order to obtain the .obj filename that is needed for NMake Makefiles to build DLLs/static LIBs or EXEs, do the following -# instead when doing 'if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]' -# (repeat if there are multiple $(srcext)'s in $(source_list), ignore any headers): -# !if [for %c in ($(source_list)) do @if "%~xc" == ".$(srcext)" @call create-lists.bat file $(makefile_snippet_file) $(intdir)\%~nc.obj] -# -# $(intdir)\%~nc.obj needs to correspond to the rules added in build-rules-msvc.mak -# %~xc gives the file extension of a given file, %c in this case, so if %c is a.cc, %~xc means .cc -# %~nc gives the file name of a given file without extension, %c in this case, so if %c is a.cc, %~nc means a - -NULL= - -# For GDK public headers and sources -!include ..\gdk\gdk-sources.inc - -!if [call create-lists.bat header gdk_sources_msvc$(VSVER)_$(PLAT).mak GDK_PUBLIC_HEADERS] -!endif - -!if [for %f in ($(gdk_public_h_sources) $(gdk_deprecated_h_sources)) do @call create-lists.bat file gdk_sources_msvc$(VSVER)_$(PLAT).mak ../gdk/%f] -!endif - -!if [call create-lists.bat footer gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gdk_sources_msvc$(VSVER)_$(PLAT).mak GDK_C_SRCS] -!endif - -!if [for %f in ($(gdk_c_sources)) do @call create-lists.bat file gdk_sources_msvc$(VSVER)_$(PLAT).mak ../gdk/%f] -!endif - -!if [call create-lists.bat footer gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -# For GDK-Win32 public headers and sources -!include ..\gdk\win32\gdk-win32-sources.inc - -!if [call create-lists.bat header gdk_sources_msvc$(VSVER)_$(PLAT).mak GDK_WIN32_PUBLIC_HEADERS] -!endif - -!if [for %f in ($(libgdkwin32include_HEADERS)) do @call create-lists.bat file gdk_sources_msvc$(VSVER)_$(PLAT).mak ../gdk/win32/%f] -!endif - -!if [call create-lists.bat footer gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gdk_sources_msvc$(VSVER)_$(PLAT).mak GDK_WIN32_C_SRCS] -!endif - -!if [for %f in ($(libgdk_win32_la_SOURCES)) do @if "%~xf" == ".c" call create-lists.bat file gdk_sources_msvc$(VSVER)_$(PLAT).mak ..\gdk\win32\%f] -!endif - -!if [call create-lists.bat footer gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gdk_sources_msvc$(VSVER)_$(PLAT).mak GDK_WIN32_INTROSPECTION_SRCS] -!endif - -!if [for %f in ($(w32_introspection_files)) do @call create-lists.bat file gdk_sources_msvc$(VSVER)_$(PLAT).mak ../gdk/%f] -!endif - -!if [call create-lists.bat footer gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -# For GDK-Broadway public headers -!include ..\gdk\broadway\gdk-broadway-sources.inc - -!if [call create-lists.bat header gdk_sources_msvc$(VSVER)_$(PLAT).mak GDK_BROADWAY_C_SRCS] -!endif - -!if [for %f in ($(GDK_BROADWAY_NON_GENERATED_SOURCES)) do @if "%~xf" == ".c" call create-lists.bat file gdk_sources_msvc$(VSVER)_$(PLAT).mak ..\gdk\broadway\%f] -!endif - -!if [call create-lists.bat footer gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gdk_sources_msvc$(VSVER)_$(PLAT).mak BROADWAYD_C_SRCS] -!endif - -!if [for %f in ($(broadwayd_SOURCES)) do @if "%~xf" == ".c" call create-lists.bat file gdk_sources_msvc$(VSVER)_$(PLAT).mak ..\gdk\broadway\%f] -!endif - -!if [call create-lists.bat footer gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!include gdk_sources_msvc$(VSVER)_$(PLAT).mak - -!if [del /f /q gdk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -# For GDK resources - -!if [call create-lists.bat header resource_sources_msvc$(VSVER)_$(PLAT).mak GDK_RESOURCES] -!endif - -!if [for %f in (..\gdk\resources\glsl\*.glsl) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f] -!endif - -!if [call create-lists.bat footer resource_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header resource_sources_msvc$(VSVER)_$(PLAT).mak GTK_RESOURCES] -!endif - -# For GTK public headers and sources -!include ..\gtk\gtk-sources.inc -!include ..\gtk\a11y\Makefile.inc -!include ..\gtk\deprecated\Makefile.inc -!include ..\gtk\inspector\Makefile.inc - -# For the libgail-util public headers -!include ..\libgail-util\libgail-util-sources.inc - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_PUBLIC_ENUM_HEADERS] -!endif - -!if [for %f in ($(GTK_PUB_HDRS:.h=)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f.h] -!endif - -!if [for %f in ($(a11y_h_sources) $(gtk_deprecated_h_sources)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_PRIVATE_ENUM_HEADERS] -!endif - -!if [for %f in ($(GTK_PRIVATE_TYPE_HDRS)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_SEMI_PRIVATE_HEADERS] -!endif - -!if [for %f in ($(gtk_semi_private_h_sources)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_MISC_C_SRCS] -!endif - -!if [for %f in ($(a11y_c_sources) $(gtk_deprecated_c_sources) $(inspector_c_sources)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_C_SRCS_A_H] -!endif - -!if [for %f in ($(gtk_base_c_sources_base_gtka_gtkh:.c=)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f.c] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_C_SRCS_I_W] -!endif - -!if [for %f in ($(gtk_base_c_sources_base_gtki_gtkw:.c=)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f.c] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_OS_WIN32_C_SRCS] -!endif - -!if [for %f in ($(gtk_os_win32_c_sources)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [echo GTK_C_SRCS = ^$(GTK_MISC_C_SRCS) ^$(GTK_C_SRCS_A_H) ^$(GTK_C_SRCS_I_W) ^$(GTK_OS_WIN32_C_SRCS)>>gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_MORE_C_SRCS] -!endif - -!if [for %f in ($(gtk_use_win32_c_sources) $(gtk_clipboard_dnd_c_sources_generic)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ..\gtk\%f] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GAILUTIL_C_SRCS] -!endif - -!if [for %f in ($(util_c_sources)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ..\libgail-util\%f] -!endif - -!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!include gtk_sources_msvc$(VSVER)_$(PLAT).mak - -!if [del /f /q gtk_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -# For GTK resources - -!if [for %f in ($(adwaita_theme_css_sources:/=\)) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak ..\gtk\%f] -!endif - -!if [for %x in (png svg) do @(for %f in (..\gtk\theme\Adwaita\assets\*.%x) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f)] -!endif - -!if [for %f in ($(highcontrast_theme_css_sources:/=\)) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak ..\gtk\%f] -!endif - -!if [for %x in (png svg) do @(for %f in (..\gtk\theme\HighContrast\assets\*.%x) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f)] -!endif - -!if [for %f in ($(win32_theme_css_sources:/=\)) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak ..\gtk\%f] -!endif - -!if [for %f in (..\gtk\cursor\*.png ..\gtk\gesture\*.symbolic.png ..\gtk\ui\*.ui) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f] -!endif - -!if [for %s in (16 22 24 32 48) do @(for %c in (actions status categories) do @(for %f in (..\gtk\icons\%sx%s\%c\*.png) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f))] -!endif - -!if [for %s in (scalable) do @(for %c in (status) do @(for %f in (..\gtk\icons\%s\%c\*.svg) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f))] -!endif - -!if [for %f in (..\gtk\inspector\*.ui ..\gtk\inspector\logo.png ..\gtk\emoji\*.data) do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f] -!endif - -!if [call create-lists.bat footer resource_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -# For gtk demo program resources - -!if [call create-lists.bat header resource_sources_msvc$(VSVER)_$(PLAT).mak GTK_DEMO_RESOURCES] -!endif - -!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=..\demos\gtk-demo ..\demos\gtk-demo\demo.gresource.xml') do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f] -!endif - -!if [call create-lists.bat footer resource_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header resource_sources_msvc$(VSVER)_$(PLAT).mak ICON_BROWSER_RESOURCES] -!endif - -!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\demos\icon-browser --generate-dependencies ..\demos\icon-browser\iconbrowser.gresource.xml') do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f] -!endif - -!if [call create-lists.bat footer resource_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header resource_sources_msvc$(VSVER)_$(PLAT).mak WIDGET_FACTORY_RESOURCES] -!endif - -!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\demos\widget-factory --generate-dependencies ..\demos\widget-factory\widget-factory.gresource.xml') do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f] -!endif - -!if [call create-lists.bat footer resource_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!include resource_sources_msvc$(VSVER)_$(PLAT).mak - -!if [del /f /q resource_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!if [call create-lists.bat header demo_sources_msvc$(VSVER)_$(PLAT).mak demo_actual_sources] -!endif - -!if [for %f in ($(demo_sources)) do @call create-lists.bat file demo_sources_msvc$(VSVER)_$(PLAT).mak ..\demos\gtk-demo\%f] -!endif - -!if [call create-lists.bat footer demo_sources_msvc$(VSVER)_$(PLAT).mak] -!endif - -!include demo_sources_msvc$(VSVER)_$(PLAT).mak - -!if [del /f /q demo_sources_msvc$(VSVER)_$(PLAT).mak] -!endif diff --git a/win32/create-lists.bat b/win32/create-lists.bat deleted file mode 100644 index ef60d5ce11..0000000000 --- a/win32/create-lists.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo off -rem Simple .bat script for creating the NMake Makefile snippets. - -if not "%1" == "header" if not "%1" == "file" if not "%1" == "footer" goto :error_cmd -if "%2" == "" goto error_no_destfile - -if "%1" == "header" goto :header -if "%1" == "file" goto :addfile -if "%1" == "footer" goto :footer - -:header -if "%3" == "" goto error_var -echo %3 = \>>%2 -goto done - -:addfile -if "%3" == "" goto error_file -echo. %3 \>>%2 -goto done - -:footer -echo. $(NULL)>>%2 -echo.>>%2 -goto done - -:error_cmd -echo Specified command '%1' was invalid. Valid commands are: header file footer. -goto done - -:error_no_destfile -echo Destination NMake snippet file must be specified -goto done - -:error_var -echo A name must be specified for using '%1'. -goto done - -:error_file -echo A file must be specified for using '%1'. -goto done - -:done \ No newline at end of file diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak deleted file mode 100644 index 4c25954102..0000000000 --- a/win32/detectenv-msvc.mak +++ /dev/null @@ -1,86 +0,0 @@ -# Common NMake Makefile module for checking the build environment -# This can be copied from $(glib_srcroot)\build\win32 for GNOME items -# that support MSVC builds and introspection under MSVC, and can be used -# for building test programs as well. - -# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or -# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) -!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR) -MSG = ^ -This Makefile is only for Visual Studio 2008 and later.^ -You need to ensure that the Visual Studio Environment is properly set up^ -before running this Makefile. -!error $(MSG) -!endif - -ERRNUL = 2>NUL -_HASH=^# - -!if ![echo VCVERSION=_MSC_VER > vercl.x] \ - && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \ - && ![echo PLAT=Win32 >> vercl.x] \ - && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ - && ![echo PLAT=x64 >> vercl.x] \ - && ![echo $(_HASH)elif defined(_M_ARM64) >> vercl.x] \ - && ![echo PLAT=arm64 >> vercl.x] \ - && ![echo $(_HASH)endif >> vercl.x] \ - && ![cl -nologo -TC -P vercl.x $(ERRNUL)] -!include vercl.i -!if ![echo VCVER= ^\> vercl.vc] \ - && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] -!include vercl.vc -!endif -!endif -!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] -!endif - -!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600 -VSVER = 9 -!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700 -VSVER = 10 -!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800 -VSVER = 11 -!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 -VSVER = 12 -!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 -VSVER = 14 -!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920 -VSVER = 15 -!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 -VSVER = 16 -!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 -VSVER = 17 -!else -VSVER = 0 -!endif - -!if "$(VSVER)" == "0" -MSG = ^ -This NMake Makefile set supports Visual Studio^ -9 (2008) through 17 (2022). Your Visual Studio^ -version is not supported. -!error $(MSG) -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" -VALID_CFGSET = TRUE -!endif - -# We want debugging symbols logged for all builds, -# using .pdb files for release builds -CFLAGS_BASE = /Zi - -!if "$(CFG)" == "release" || "$(CFG)" == "Release" -CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE) -!else -CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE) -!endif - -!if "$(PLAT)" == "x64" -LDFLAGS_ARCH = /machine:x64 -!elseif "$(PLAT)" == "arm64" -LDFLAGS_ARCH = /machine:arm64 -!else -LDFLAGS_ARCH = /machine:x86 -!endif diff --git a/win32/gen-version-items.py b/win32/gen-version-items.py deleted file mode 100644 index 2a5ba35933..0000000000 --- a/win32/gen-version-items.py +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/python3 - -# Generate various items with version info - -# Author: Fan, Chun-wei -# Date: July 25, 2019 - -import argparse -import os -import re -import sys - -from replace import replace_multi, replace - -def get_srcroot(): - if not os.path.isabs(__file__): - path = os.path.abspath(__file__) - else: - path = __file__ - dirname = os.path.dirname(path) - return os.path.abspath(os.path.join(dirname, '..')) - -def get_version(srcroot): - ver = {} - RE_VERSION = re.compile(r'^m4_define\(\[(gtk_\w+)\],\s*\[(\d+)\]\)') - with open(os.path.join(srcroot, 'configure.ac'), 'r') as ac: - for i in ac: - mo = RE_VERSION.search(i) - if mo: - ver[mo.group(1).upper()] = int(mo.group(2)) - ver['GTK_VERSION'] = '%d.%d.%d' % (ver['GTK_MAJOR_VERSION'], - ver['GTK_MINOR_VERSION'], - ver['GTK_MICRO_VERSION']) - return ver - -def main(argv): - srcdir = os.path.dirname(__file__) - top_srcdir = os.path.join(srcdir, os.pardir) - parser = argparse.ArgumentParser(description='Generate various items with version info') - parser.add_argument('--version', help='Version of the package') - parser.add_argument('--interface-age', help='Interface age of the package') - parser.add_argument('--source', help='Source file template to process', - required=True) - parser.add_argument('--output', '-o', help='Output generated file location', - required=True) - args = parser.parse_args() - version_info = get_version(get_srcroot()) - - # If version and/or interface-age were specified, use them, - # otherwise use the info we have from configure.ac. - if args.version is not None: - gtk_version = args.version - else: - gtk_version = version_info['GTK_VERSION'] - if args.interface_age is not None: - interface_age = args.interface_age - else: - interface_age = version_info['GTK_INTERFACE_AGE'] - - version_parts = gtk_version.split('.') - # (100 * gtk_minor_version + gtk_micro_version - gtk_interface_age) - binary_age = (int(version_parts[1]) * 100) + int(version_parts[2]) - lt_current = (int(version_parts[1]) * 100) + int(version_parts[2]) - int(interface_age) - lt_age = binary_age - int(interface_age) - - version_info_replace_items = {'@GTK_MAJOR_VERSION@': version_parts[0], - '@GTK_MINOR_VERSION@': version_parts[1], - '@GTK_MICRO_VERSION@': version_parts[2], - '@GTK_API_VERSION@': '3.0', - '@GTK_VERSION@': gtk_version, - '@GTK_BINARY_AGE@': str(binary_age), - '@GTK_INTERFACE_AGE@': str(interface_age), - '@GETTEXT_PACKAGE@': 'gtk30', - '@LT_CURRENT_MINUS_AGE@': str(lt_current - lt_age)} - - replace_multi(args.source, args.output, version_info_replace_items) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak deleted file mode 100644 index 8eb73c4bdd..0000000000 --- a/win32/generate-msvc.mak +++ /dev/null @@ -1,388 +0,0 @@ -# NMake Makefile portion for code generation and -# intermediate build directory creation -# Items in here should not need to be edited unless -# one is maintaining the NMake build files. - -!include config-msvc.mak -!include ../demos/gtk-demo/demos-sources.mak -!include create-lists-msvc.mak -!include generate-msvcprojs.mak - -# Copy the pre-defined gdkconfig.h.[win32|win32_broadway] -!if "$(CFG)" == "release" || "$(CFG)" == "Release" -GDK_OLD_CFG = debug -!else -GDK_OLD_CFG = release -!endif - -!ifdef BROADWAY -GDK_CONFIG = broadway -GDK_DEL_CONFIG = win32 -GDK_CONFIG_TEMPLATE = ..\gdk\gdkconfig.h.win32_broadway -!else -GDK_CONFIG = win32 -GDK_DEL_CONFIG = broadway -GDK_CONFIG_TEMPLATE = ..\gdk\gdkconfig.h.win32 -!endif - -GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers -GDK_RESOURCES_ARGS = --target=$@ --sourcedir=..\gdk --c-name _gdk --manual-register -GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers -GTK_RESOURCES_ARGS = --target=$@ --sourcedir=..\gtk --c-name _gtk --manual-register - -GDK_GENERATED_SOURCES = \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h - -GTK_VERSION_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h - -GTK_TYPEBUILTIN_SOURCES = \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c - -GTK_GENERATED_SOURCES = \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypefuncs.inc \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c \ - $(GTK_TYPEBUILTIN_SOURCES) \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c \ - $(GTK_VERSION_H) - -EMOJI_GRESOURCE_XML = \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\de.gresource.xml \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\es.gresource.xml \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\fr.gresource.xml \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\zh.gresource.xml - -EMOJI_GRESOURCE = $(EMOJI_GRESOURCE_XML:.gresource.xml=.gresource) - -generate-base-sources: \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ - $(GDK_GENERATED_SOURCES) \ - $(GTK_GENERATED_SOURCES) \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\libgtk3.manifest \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demo_resources.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-widget-factory\widget_factory_resources.c \ - $(EMOJI_GRESOURCE) - -# Copy the pre-defined config.h.win32 and demos.h.win32 -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h: ..\config.h.win32 -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h: ..\demos\gtk-demo\demos.h.win32 - -# Generate the versioned headers and resource scripts (*.rc) -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h: ..\gdk\gdkversionmacros.h.in -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h: ..\gtk\gtkversion.h.in -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc: ..\gdk\win32\rc\gdk.rc.in -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc: ..\gtk\gtk-win32.rc.body.in - -..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE) - @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build - @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build - @if exist ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build - @copy $** $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h: ..\gdk-$(CFG)-$(GDK_CONFIG)-build - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h: - @echo Copying $@... - @if not exist $(@D)\ md $(@D) - @copy $** $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c: ..\gdk\gdkenumtypes.c.template $(GDK_PUBLIC_HEADERS) -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h: ..\gdk\gdkenumtypes.h.template $(GDK_PUBLIC_HEADERS) -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c: ..\gtk\gtktypebuiltins.c.template $(GTK_PUBLIC_ENUM_HEADERS) -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h: ..\gtk\gtktypebuiltins.h.template $(GTK_PUBLIC_ENUM_HEADERS) -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c: ..\gtk\gtkprivatetypebuiltins.c.template $(GTK_PRIVATE_ENUM_HEADERS) -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h: ..\gtk\gtkprivatetypebuiltins.h.template $(GTK_PRIVATE_ENUM_HEADERS) - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h: - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @cd ..\gdk - @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(gdk_public_h_sources) $(gdk_deprecated_h_sources) > ..\win32\$@ - @cd ..\win32 - -# Generate the private headers needed for broadway-server.c -generate-broadway-items: ..\gdk\broadway\clienthtml.h ..\gdk\broadway\broadwayjs.h - -..\gdk\broadway\clienthtml.h: ..\gdk\broadway\client.html - @echo Generating $@... - @$(PERL) ..\gdk\broadway\toarray.pl client_html $**>$@ - -..\gdk\broadway\broadwayjs.h: \ -..\gdk\broadway\broadway.js \ -..\gdk\broadway\rawinflate.min.js - @echo Generating $@... - @$(PERL) ..\gdk\broadway\toarray.pl broadway_js $**>$@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c: - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @cd ..\gtk - @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(GTK_PUB_HDRS) $(a11y_h_sources) $(gtk_deprecated_h_sources) > ..\win32\$@ - @cd ..\win32 - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h: - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @cd ..\gtk - @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(GTK_PRIVATE_TYPE_HDRS) > ..\win32\$@ - @cd ..\win32 - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc: - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @$(PYTHON) gen-version-items.py --version=$(GTK_VERSION) --interface-age=$(GTK_INTERFACE_AGE) --source=$** --output=$@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.h: ..\gdk\gdkmarshalers.list - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp - @move $@.tmp $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.c: ..\gdk\gdkmarshalers.list - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp - @move $@.tmp $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml: $(GDK_RESOURCES) - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @echo ^ >$@ - @echo ^ >> $@ - @echo ^ >> $@ - @for %%f in (..\gdk\resources\glsl\*.glsl) do @echo ^resources/glsl/%%~nxf^ >> $@ - @echo ^ >> $@ - @echo ^ >> $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.h: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $** $(GDK_RESOURCES_ARGS) --generate-header - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $** $(GDK_RESOURCES_ARGS) --generate-source - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\libgtk3.manifest: ..\gtk\libgtk3.manifest.in - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @$(PYTHON) replace.py \ - --action=replace-var \ - --input=$** --output=$@ \ - --var=EXE_MANIFEST_ARCHITECTURE \ - --outstring=* - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h: ..\gtk\gtkdbusinterfaces.xml - @echo Generating GTK DBus sources... - @if not exist $(@D)\ md $(@D) - @$(PYTHON) $(GDBUS_CODEGEN) \ - --interface-prefix org.Gtk. --c-namespace _Gtk \ - --generate-c-code gtkdbusgenerated $** \ - --output-directory $(@D) - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.c: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypefuncs.inc: \ -..\gtk\gentypefuncs.py \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h \ -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @echo #undef GTK_COMPILATION > $(@R).preproc.c - @echo #include "gtkx.h" >> $(@R).preproc.c - @cl /EP $(GTK_PREPROCESSOR_FLAGS) $(@R).preproc.c > $(@R).combined.c - @$(PYTHON) ..\gtk\gentypefuncs.py $@ $(@R).combined.c - @del $(@R).preproc.c $(@R).combined.c - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml: $(GTK_RESOURCES) - @echo Generating $@... - @echo ^> $@ - @echo ^>> $@ - @echo ^>> $@ - @echo ^theme/Adwaita/gtk.css^>> $@ - @echo ^theme/Adwaita/gtk-dark.css^>> $@ - @echo ^theme/Adwaita/gtk-contained.css^>> $@ - @echo ^theme/Adwaita/gtk-contained-dark.css^>> $@ - @for %%f in (..\gtk\theme\Adwaita\assets\*.png) do @echo ^theme/Adwaita/assets/%%~nxf^>> $@ - @for %%f in (..\gtk\theme\Adwaita\assets\*.svg) do @echo ^theme/Adwaita/assets/%%~nxf^>> $@ - @echo ^theme/HighContrast/gtk.css^>> $@ - @echo ^theme/HighContrast/gtk-inverse.css^>> $@ - @echo ^theme/HighContrast/gtk-contained.css^>> $@ - @echo ^theme/HighContrast/gtk-contained-inverse.css^>> $@ - @for %%f in (..\gtk\theme\HighContrast\assets\*.png) do @echo ^theme/HighContrast/assets/%%~nxf^>> $@ - @for %%f in (..\gtk\theme\HighContrast\assets\*.svg) do @echo ^theme/HighContrast/assets/%%~nxf^>> $@ - @echo ^theme/win32/gtk-win32-base.css^>> $@ - @echo ^theme/win32/gtk.css^>> $@ - @for %%f in (..\gtk\cursor\*.png) do @echo ^cursor/%%~nxf^>> $@ - @for %%f in (..\gtk\gesture\*.symbolic.png) do @echo ^gesture/%%~nxf^>> $@ - @for %%f in (..\gtk\ui\*.ui) do @echo ^ui/%%~nxf^>> $@ - @for %%s in (16 22 24 32 48) do @(for %%c in (actions status categories) do @(for %%f in (..\gtk\icons\%%sx%%s\%%c\*.png) do @echo ^icons/%%sx%%s/%%c/%%~nxf^>> $@)) - @for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\gtk\icons\%%s\%%c\*.svg) do @echo ^icons/%%s/%%c/%%~nxf^>> $@)) - @for %%f in (..\gtk\inspector\*.ui) do @echo ^inspector/%%~nxf^>> $@ - @echo ^inspector/logo.png^>> $@ - @for %%f in (..\gtk\emoji\*.data) do @echo ^emoji/%%~nxf^>> $@ - @echo ^>> $@ - @echo ^>> $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.h: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) $** --generate-header - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) $** --generate-source - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.h: ..\gtk\gtkmarshalers.list - @echo Generating $@... - @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp - @move $@.tmp $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.c: ..\gtk\gtkmarshalers.list - @echo Generating $@... - @echo #undef G_ENABLE_DEBUG> $@.tmp - @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp - @move $@.tmp $@ - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demo_resources.c: ..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES) - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=..\demos\gtk-demo \ - --generate-source ..\demos\gtk-demo\demo.gresource.xml - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c: ..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES) - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=..\demos\icon-browser \ - --generate-source ..\demos\icon-browser\iconbrowser.gresource.xml - -.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-widget-factory\widget_factory_resources.c: \ -..\demos\icon-browser\iconbrowser.gresource.xml $(WIDGET_FACTORY_RESOURCES) - @echo Generating $@... - @if not exist $(@D)\ md $(@D) - @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=..\demos\widget-factory \ - --generate-source ..\demos\widget-factory\widget-factory.gresource.xml - -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\de.gresource.xml: ..\gtk\emoji\gresource.xml.in -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\es.gresource.xml: ..\gtk\emoji\gresource.xml.in -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\fr.gresource.xml: ..\gtk\emoji\gresource.xml.in -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\zh.gresource.xml: ..\gtk\emoji\gresource.xml.in - -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\de.gresource: .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\de.gresource.xml ..\gtk\emoji\de.data -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\es.gresource: .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\es.gresource.xml ..\gtk\emoji\es.data -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\fr.gresource: .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\fr.gresource.xml ..\gtk\emoji\fr.data -.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\zh.gresource: .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\zh.gresource.xml ..\gtk\emoji\zh.data - -$(EMOJI_GRESOURCE_XML): - @echo Generating $@... - @if not exist $(@D)\ mkdir $(@D) - @$(PYTHON) replace.py -i=$** -o=$@ --action=replace-var --var=lang --outstring=$(@B:.gresource=) - -$(EMOJI_GRESOURCE): - @echo Generating $@... - @$(GLIB_COMPILE_RESOURCES) --sourcedir=..\gtk\emoji $@.xml --target=$@ - -regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) regenerate-demos-h-win32-msg $(GTK3_DEMO_VCPROJS) - @-del ..\demos\gtk-demo\demos.h.win32 - @cd ..\demos\gtk-demo - @$(PYTHON) geninclude.py demos.h.win32 $(demo_sources) - @cd ..\..\win32 - -..\po\gtk30.pot: ..\gtk\gtkbuilder.its - $(XGETTEXT) --default-domain="$(@B)" \ - --copyright-holder="GTK+ Team and others. See AUTHORS" \ - --package-name="gtk+" \ - --package-version="$(GTK_VERSION)" \ - --msgid-bugs-address="https://gitlab.gnome.org/GNOME/gtk/-/issues/" \ - --directory=".." \ - --add-comments=TRANSLATORS: --from-code=UTF-8 --keyword=_ --keyword=N_ \ - --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments \ - --files-from="$(@D:\=/)/POTFILES.in" --output=$(@F) - @move $(@F) $@ - -..\po-properties\gtk30-properties.pot: - $(XGETTEXT) --default-domain="$(@B)" \ - --copyright-holder="GTK+ Team and others. See AUTHORS" \ - --package-name="gtk+" \ - --package-version="$(GTK_VERSION)" \ - --msgid-bugs-address="https://gitlab.gnome.org/GNOME/gtk/-/issues/" \ - --directory=".." \ - --from-code=UTF-8 --keyword --keyword=P_ --add-comments \ - --files-from="$(@D:\=/)/POTFILES.in" - @move $(@B).po $@ - -# Remove the generated files -clean: - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gresource - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gresource.xml - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demo_resources.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypefuncs.inc - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\libgtk3.manifest - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc - @-rd .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.c - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h - @if exist ..\gdk-$(CFG)-$(GDK_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_CONFIG)-build - @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build - @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build - @if exist ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build - @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h - @-rd .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk diff --git a/win32/generate-msvcprojs.mak b/win32/generate-msvcprojs.mak deleted file mode 100644 index ef2f5d0a13..0000000000 --- a/win32/generate-msvcprojs.mak +++ /dev/null @@ -1,616 +0,0 @@ -# NMake Makefile portion for (re-)generating Visual Studio -# projects. Items in here should not need to be edited unless -# one is maintaining the NMake build files. - - -GTK3_VS10_STATIC_PROJS = \ - vs10\gtk+.sln \ - vs10\gtk-builder-tool.vcxproj \ - vs10\gtk-encode-symbolic-svg.vcxproj \ - vs10\gtk-query-settings.vcxproj \ - vs10\gtk-update-icon-cache.vcxproj \ - vs10\gtk3-demo-application.vcxproj \ - vs10\gtk3-icon-browser.vcxproj \ - vs10\gtk3-install.vcxproj \ - vs10\gtk3-introspect.vcxproj \ - vs10\gtk3-prebuild.vcxproj \ - vs10\gtk3-widget-factory.vcxproj \ - vs10\gtk-builder-tool.vcxproj.filters \ - vs10\gtk-encode-symbolic-svg.vcxproj.filters \ - vs10\gtk-query-settings.vcxproj.filters \ - vs10\gtk-update-icon-cache.vcxproj.filters \ - vs10\gtk3-demo-application.vcxproj.filters \ - vs10\gtk3-icon-browser.vcxproj.filters \ - vs10\gtk3-widget-factory.vcxproj.filters - -GTK3_VS11_STATIC_PROJS = $(GTK3_VS10_STATIC_PROJS:vs10\=vs11\) -GTK3_VS12_STATIC_PROJS = $(GTK3_VS10_STATIC_PROJS:vs10\=vs12\) -GTK3_VS14_STATIC_PROJS = $(GTK3_VS10_STATIC_PROJS:vs10\=vs14\) -GTK3_VS15_STATIC_PROJS = $(GTK3_VS10_STATIC_PROJS:vs10\=vs15\) -GTK3_VS16_STATIC_PROJS = $(GTK3_VS10_STATIC_PROJS:vs10\=vs16\) -GTK3_VS17_STATIC_PROJS = $(GTK3_VS10_STATIC_PROJS:vs10\=vs17\) - -GDK_VS9_PROJ = gdk-3.vcproj -GDKWIN32_VS9_PROJ = gdk3-win32.vcproj -GDKBROADWAY_VS9_PROJ = $(GDKWIN32_VS9_PROJ:-win32=-broadway) -GTK_VS9_PROJ = gtk-3.vcproj -GAILUTIL_VS9_PROJ = gailutil-3.vcproj -BROADWAYD_VS9_PROJ = broadwayd.vcproj -DEMO_VS9_PROJ = gtk3-demo.vcproj - -GDK_VS1X_PROJ = $(GDK_VS9_PROJ:.vcproj=.vcxproj) -GDKWIN32_VS1X_PROJ = $(GDKWIN32_VS9_PROJ:.vcproj=.vcxproj) -GDKBROADWAY_VS1X_PROJ = $(GDKBROADWAY_VS9_PROJ:.vcproj=.vcxproj) -GTK_VS1X_PROJ = $(GTK_VS9_PROJ:.vcproj=.vcxproj) -GAILUTIL_VS1X_PROJ = $(GAILUTIL_VS9_PROJ:.vcproj=.vcxproj) -BROADWAYD_VS1X_PROJ = $(BROADWAYD_VS9_PROJ:.vcproj=.vcxproj) -DEMO_VS1X_PROJ = $(DEMO_VS9_PROJ:.vcproj=.vcxproj) - -GDK_VS1X_PROJ_FILTERS = $(GDK_VS9_PROJ:.vcproj=.vcxproj.filters) -GDKWIN32_VS1X_PROJ_FILTERS = $(GDKWIN32_VS9_PROJ:.vcproj=.vcxproj.filters) -GDKBROADWAY_VS1X_PROJ_FILTERS = $(GDKBROADWAY_VS9_PROJ:.vcproj=.vcxproj.filters) -GTK_VS1X_PROJ_FILTERS = $(GTK_VS9_PROJ:.vcproj=.vcxproj.filters) -GAILUTIL_VS1X_PROJ_FILTERS = $(GAILUTIL_VS9_PROJ:.vcproj=.vcxproj.filters) -BROADWAYD_VS1X_PROJ_FILTERS = $(BROADWAYD_VS9_PROJ:.vcproj=.vcxproj.filters) -DEMO_VS1X_PROJ_FILTERS = $(DEMO_VS9_PROJ:.vcproj=.vcxproj.filters) - -GTK3_GDK_VC1X_PROJS = \ - vs10\$(GDK_VS1X_PROJ) \ - vs11\$(GDK_VS1X_PROJ) \ - vs12\$(GDK_VS1X_PROJ) \ - vs14\$(GDK_VS1X_PROJ) \ - vs15\$(GDK_VS1X_PROJ) \ - vs16\$(GDK_VS1X_PROJ) \ - vs17\$(GDK_VS1X_PROJ) - -GTK3_GDK_VC1X_PROJ_FILTERS = \ - vs11\$(GDK_VS1X_PROJ_FILTERS) \ - vs12\$(GDK_VS1X_PROJ_FILTERS) \ - vs14\$(GDK_VS1X_PROJ_FILTERS) \ - vs15\$(GDK_VS1X_PROJ_FILTERS) \ - vs16\$(GDK_VS1X_PROJ_FILTERS) \ - vs17\$(GDK_VS1X_PROJ_FILTERS) - -GTK3_GDK_WIN32_VC1X_PROJS = \ - vs10\$(GDKWIN32_VS1X_PROJ) \ - vs11\$(GDKWIN32_VS1X_PROJ) \ - vs12\$(GDKWIN32_VS1X_PROJ) \ - vs14\$(GDKWIN32_VS1X_PROJ) \ - vs15\$(GDKWIN32_VS1X_PROJ) \ - vs16\$(GDKWIN32_VS1X_PROJ) \ - vs17\$(GDKWIN32_VS1X_PROJ) - -GTK3_GDK_WIN32_VC1X_PROJ_FILTERS = \ - vs11\$(GDKWIN32_VS1X_PROJ_FILTERS) \ - vs12\$(GDKWIN32_VS1X_PROJ_FILTERS) \ - vs14\$(GDKWIN32_VS1X_PROJ_FILTERS) \ - vs15\$(GDKWIN32_VS1X_PROJ_FILTERS) \ - vs16\$(GDKWIN32_VS1X_PROJ_FILTERS) \ - vs17\$(GDKWIN32_VS1X_PROJ_FILTERS) - -GTK3_GDK_BROADWAY_VC1X_PROJS = \ - vs10\$(GDKBROADWAY_VS1X_PROJ) \ - vs11\$(GDKBROADWAY_VS1X_PROJ) \ - vs12\$(GDKBROADWAY_VS1X_PROJ) \ - vs14\$(GDKBROADWAY_VS1X_PROJ) \ - vs15\$(GDKBROADWAY_VS1X_PROJ) \ - vs16\$(GDKBROADWAY_VS1X_PROJ) \ - vs17\$(GDKBROADWAY_VS1X_PROJ) - -GTK3_GDK_BROADWAY_VC1X_PROJ_FILTERS = \ - vs11\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \ - vs12\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \ - vs14\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \ - vs15\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \ - vs16\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \ - vs17\$(GDKBROADWAY_VS1X_PROJ_FILTERS) - -GTK3_GTK_VC1X_PROJS = \ - vs10\$(GTK_VS1X_PROJ) \ - vs11\$(GTK_VS1X_PROJ) \ - vs12\$(GTK_VS1X_PROJ) \ - vs14\$(GTK_VS1X_PROJ) \ - vs15\$(GTK_VS1X_PROJ) \ - vs16\$(GTK_VS1X_PROJ) \ - vs17\$(GTK_VS1X_PROJ) - -GTK3_GTK_VC1X_PROJ_FILTERS = \ - vs11\$(GTK_VS1X_PROJ_FILTERS) \ - vs12\$(GTK_VS1X_PROJ_FILTERS) \ - vs14\$(GTK_VS1X_PROJ_FILTERS) \ - vs15\$(GTK_VS1X_PROJ_FILTERS) \ - vs16\$(GTK_VS1X_PROJ_FILTERS) \ - vs17\$(GTK_VS1X_PROJ_FILTERS) - -GTK3_GAILUTIL_VC1X_PROJS = \ - vs10\$(GAILUTIL_VS1X_PROJ) \ - vs11\$(GAILUTIL_VS1X_PROJ) \ - vs12\$(GAILUTIL_VS1X_PROJ) \ - vs14\$(GAILUTIL_VS1X_PROJ) \ - vs15\$(GAILUTIL_VS1X_PROJ) \ - vs16\$(GAILUTIL_VS1X_PROJ) \ - vs17\$(GAILUTIL_VS1X_PROJ) - -GTK3_GAILUTIL_VC1X_PROJ_FILTERS = \ - vs11\$(GAILUTIL_VS1X_PROJ_FILTERS) \ - vs12\$(GAILUTIL_VS1X_PROJ_FILTERS) \ - vs14\$(GAILUTIL_VS1X_PROJ_FILTERS) \ - vs15\$(GAILUTIL_VS1X_PROJ_FILTERS) \ - vs16\$(GAILUTIL_VS1X_PROJ_FILTERS) \ - vs17\$(GAILUTIL_VS1X_PROJ_FILTERS) - -GTK3_BROADWAYD_VC1X_PROJS = \ - vs10\$(BROADWAYD_VS1X_PROJ) \ - vs11\$(BROADWAYD_VS1X_PROJ) \ - vs12\$(BROADWAYD_VS1X_PROJ) \ - vs14\$(BROADWAYD_VS1X_PROJ) \ - vs15\$(BROADWAYD_VS1X_PROJ) \ - vs16\$(BROADWAYD_VS1X_PROJ) \ - vs17\$(BROADWAYD_VS1X_PROJ) - -GTK3_BROADWAYD_VC1X_PROJ_FILTERS = \ - vs11\$(BROADWAYD_VS1X_PROJ_FILTERS) \ - vs12\$(BROADWAYD_VS1X_PROJ_FILTERS) \ - vs14\$(BROADWAYD_VS1X_PROJ_FILTERS) \ - vs15\$(BROADWAYD_VS1X_PROJ_FILTERS) \ - vs16\$(BROADWAYD_VS1X_PROJ_FILTERS) \ - vs17\$(BROADWAYD_VS1X_PROJ_FILTERS) - -GTK3_DEMO_VC1X_PROJS = \ - vs10\$(DEMO_VS1X_PROJ) \ - vs11\$(DEMO_VS1X_PROJ) \ - vs12\$(DEMO_VS1X_PROJ) \ - vs14\$(DEMO_VS1X_PROJ) \ - vs15\$(DEMO_VS1X_PROJ) \ - vs16\$(DEMO_VS1X_PROJ) \ - vs17\$(DEMO_VS1X_PROJ) - -GTK3_DEMO_VC1X_PROJ_FILTERS = \ - vs11\$(DEMO_VS1X_PROJ_FILTERS) \ - vs12\$(DEMO_VS1X_PROJ_FILTERS) \ - vs14\$(DEMO_VS1X_PROJ_FILTERS) \ - vs15\$(DEMO_VS1X_PROJ_FILTERS) \ - vs16\$(DEMO_VS1X_PROJ_FILTERS) \ - vs17\$(DEMO_VS1X_PROJ_FILTERS) - -GTK3_GDK_WIN32_VCPROJS = \ - vs9\$(GDKWIN32_VS9_PROJ) \ - $(GTK3_GDK_WIN32_VC1X_PROJS) \ - $(GTK3_GDK_WIN32_VC1X_PROJ_FILTERS) - -GTK3_GDK_BROADWAY_VCPROJS = \ - vs9\$(GDKBROADWAY_VS9_PROJ) \ - $(GTK3_GDK_BROADWAY_VC1X_PROJS) \ - $(GTK3_GDK_BROADWAY_VC1X_PROJ_FILTERS) - -GTK3_BROADWAYD_VCPROJS = \ - vs9\$(BROADWAYD_VS9_PROJ) \ - $(GTK3_BROADWAYD_VC1X_PROJS) \ - $(GTK3_BROADWAYD_VC1X_PROJ_FILTERS) - -GTK3_GDK_VCPROJS = \ - vs9\$(GDK_VS9_PROJ) \ - $(GTK3_GDK_VC1X_PROJS) \ - $(GTK3_GDK_VC1X_PROJ_FILTERS) \ - $(GTK3_GDK_WIN32_VCPROJS) \ - $(GTK3_GDK_BROADWAY_VCPROJS) \ - $(GTK3_BROADWAYD_VCPROJS) - -GTK3_GTK_VCPROJS = \ - vs9\$(GTK_VS9_PROJ) \ - $(GTK3_GTK_VC1X_PROJS) \ - $(GTK3_GTK_VC1X_PROJ_FILTERS) - -GTK3_GAILUTIL_VCPROJS = \ - vs9\$(GAILUTIL_VS9_PROJ) \ - $(GTK3_GAILUTIL_VC1X_PROJS) \ - $(GTK3_GAILUTIL_VC1X_PROJ_FILTERS) - -GTK3_DEMO_VCPROJS = \ - vs9\$(DEMO_VS9_PROJ) \ - $(GTK3_DEMO_VC1X_PROJS) \ - $(GTK3_DEMO_VC1X_PROJ_FILTERS) - -DEMO_DEP_LIBS_NEW_PANGO=harfbuzz.lib -DEMO_DEP_LIBS_PANGOFT2_VS1X=pangoft2-1.0.lib;harfbuzz.lib;freetype.lib -DEMO_DEP_LIBS_PANGOFT2_VS9=$(DEMO_DEP_LIBS_PANGOFT2_VS1X:;= ) - -# (Re-) generate Visual Studio projects -# Dependencies for library projects -gdk-3.sourcefiles \ -gdk-3.vs10.sourcefiles \ -gdk-3.vs10.sourcefiles.filters: $(GDK_C_SRCS:/=\) - -gdk3-win32.sourcefiles \ -gdk3-win32.vs10.sourcefiles \ -gdk3-win32.vs10.sourcefiles.filters: $(GDK_WIN32_C_SRCS) - -gdk3-broadway.sourcefiles \ -gdk3-broadway.vs10.sourcefiles \ -gdk3-broadway.vs10.sourcefiles.filters: $(GDK_BROADWAY_C_SRCS) - -# GTK projects-Darn the fatal error U1095...! -gtk-3.misc.sourcefiles \ -gtk-3.misc.vs10.sourcefiles \ -gtk-3.misc.vs10.sourcefiles.filters: $(GTK_MISC_C_SRCS:/=\) - -gtk-3.a-h.sourcefiles \ -gtk-3.a-h.vs10.sourcefiles \ -gtk-3.a-h.vs10.sourcefiles.filters: $(GTK_C_SRCS_A_H:/=\) - -gtk-3.i-w.sourcefiles \ -gtk-3.i-w.vs10.sourcefiles \ -gtk-3.i-w.vs10.sourcefiles.filters: $(GTK_C_SRCS_I_W:/=\) - -gtk-3.win32.sourcefiles \ -gtk-3.win32.vs10.sourcefiles \ -gtk-3.win32.vs10.sourcefiles.filters: $(GTK_OS_WIN32_C_SRCS:/=\) $(GTK_MORE_C_SRCS) - -gtk-3.sourcefiles: \ - gtk-3.a-h.sourcefiles \ - gtk-3.i-w.sourcefiles \ - gtk-3.misc.sourcefiles \ - gtk-3.win32.sourcefiles - -gtk-3.vs10.sourcefiles: \ - gtk-3.a-h.vs10.sourcefiles \ - gtk-3.i-w.vs10.sourcefiles \ - gtk-3.misc.vs10.sourcefiles \ - gtk-3.win32.vs10.sourcefiles - -gtk-3.vs10.sourcefiles.filters: \ - gtk-3.a-h.vs10.sourcefiles.filters \ - gtk-3.i-w.vs10.sourcefiles.filters \ - gtk-3.misc.vs10.sourcefiles.filters \ - gtk-3.win32.vs10.sourcefiles.filters - -gtk-3.sourcefiles gtk-3.vs10.sourcefiles gtk-3.vs10.sourcefiles.filters: - @echo Genarating the final $@ from $**... - @for %%f in ($**) do @type %%f>>$@ & del %%f - -gailutil-3.sourcefiles \ -gailutil-3.vs10.sourcefiles \ -gailutil-3.vs10.sourcefiles.filters: $(GAILUTIL_C_SRCS) - -# Dependencies for executable projects -broadwayd.sourcefiles \ -broadwayd.vs10.sourcefiles \ -broadwayd.vs10.sourcefiles.filters: $(BROADWAYD_C_SRCS) - -gtk3-demo.sourcefiles \ -gtk3-demo.vs10.sourcefiles \ -gtk3-demo.vs10.sourcefiles.filters: $(demo_actual_sources) $(more_demo_sources) - -gdk-3.sourcefiles gdk3-win32.sourcefiles \ -gdk3-broadway.sourcefiles gailutil-3.sourcefiles \ -broadwayd.sourcefiles gtk3-demo.sourcefiles: - @-del vs9\$(@B).vcproj - @for %%s in ($**) do @echo. ^>>$@ - -gtk-3.a-h.sourcefiles gtk-3.i-w.sourcefiles \ -gtk-3.misc.sourcefiles gtk-3.win32.sourcefiles: - @echo Generating $@... - @if exist vs9\$(GTK_VS9_PROJ) del vs9\$(GTK_VS9_PROJ) - @for %%s in ($(**:..\gtk\=)) do @echo. ^>>$@ - -gdk-3.vs10.sourcefiles \ -gdk3-win32.vs10.sourcefiles \ -gdk3-broadway.vs10.sourcefiles \ -gailutil-3.vs10.sourcefiles \ -broadwayd.vs10.sourcefiles \ -gtk3-demo.vs10.sourcefiles: - @echo Generating $@... - @-del vs10\$(@B:.vs10=.vcxproj) - @for %%s in ($**) do @echo. ^>>$@ - -gtk-3.a-h.vs10.sourcefiles \ -gtk-3.i-w.vs10.sourcefiles \ -gtk-3.misc.vs10.sourcefiles \ -gtk-3.win32.vs10.sourcefiles: - @echo Generating $@... - @if exist vs10\$(GTK_VS1X_PROJ) del vs10\$(GTK_VS1X_PROJ) - @for %%s in ($(**:..\gtk\=)) do @echo. ^>>$@ - -gdk-3.vs10.sourcefiles.filters \ -gdk3-win32.vs10.sourcefiles.filters \ -gdk3-broadway.vs10.sourcefiles.filters \ -gailutil-3.vs10.sourcefiles.filters \ -broadwayd.vs10.sourcefiles.filters \ -gtk3-demo.vs10.sourcefiles.filters: - @-del vs10\$(@F:.vs10.sourcefiles=.vcxproj) - @for %%s in ($**) do @echo. ^^Source Files^^>>$@ - -gtk-3.a-h.vs10.sourcefiles.filters \ -gtk-3.i-w.vs10.sourcefiles.filters \ -gtk-3.misc.vs10.sourcefiles.filters \ -gtk-3.win32.vs10.sourcefiles.filters: - @if exist vs10\$(GTK_VS1X_PROJ_FILTERS) del vs10\$(GTK_VS1X_PROJ_FILTERS) - @for %%s in ($(**:..\gtk\=)) do @echo. ^^Source Files^^>>$@ - -# Dependencies for GDK projects -vs9\$(GDK_VS9_PROJ): gdk-3.sourcefiles vs9\$(GDK_VS9_PROJ)in -vs9\$(GDKWIN32_VS9_PROJ).pre: gdk3-win32.sourcefiles vs9\$(GDKWIN32_VS9_PROJ)in -vs9\$(GDKBROADWAY_VS9_PROJ): gdk3-broadway.sourcefiles vs9\$(GDKBROADWAY_VS9_PROJ)in -vs9\$(GTK_VS9_PROJ).pre: gtk-3.sourcefiles vs9\$(GTK_VS9_PROJ)in -vs9\$(GAILUTIL_VS9_PROJ): gailutil-3.sourcefiles vs9\$(GAILUTIL_VS9_PROJ)in - -vs10\$(GDK_VS1X_PROJ): gdk-3.vs10.sourcefiles vs10\$(GDK_VS1X_PROJ)in -vs10\$(GDKWIN32_VS1X_PROJ).pre: gdk3-win32.vs10.sourcefiles vs10\$(GDKWIN32_VS1X_PROJ)in -vs10\$(GDKBROADWAY_VS1X_PROJ): gdk3-broadway.vs10.sourcefiles vs10\$(GDKBROADWAY_VS1X_PROJ)in -vs10\$(GTK_VS1X_PROJ).pre: gtk-3.vs10.sourcefiles vs10\$(GTK_VS1X_PROJ)in -vs10\$(GAILUTIL_VS1X_PROJ): gailutil-3.vs10.sourcefiles vs10\$(GAILUTIL_VS1X_PROJ)in - -vs10\$(GDK_VS1X_PROJ_FILTERS): gdk-3.vs10.sourcefiles.filters vs10\$(GDK_VS1X_PROJ_FILTERS)in -vs10\$(GDKWIN32_VS1X_PROJ_FILTERS): gdk3-win32.vs10.sourcefiles.filters vs10\$(GDKWIN32_VS1X_PROJ_FILTERS)in -vs10\$(GDKBROADWAY_VS1X_PROJ_FILTERS): gdk3-broadway.vs10.sourcefiles.filters vs10\$(GDKBROADWAY_VS1X_PROJ_FILTERS)in -vs10\$(GTK_VS1X_PROJ_FILTERS): gtk-3.vs10.sourcefiles.filters vs10\$(GTK_VS1X_PROJ_FILTERS)in -vs10\$(GAILUTIL_VS1X_PROJ_FILTERS): gailutil-3.vs10.sourcefiles.filters vs10\$(GAILUTIL_VS1X_PROJ_FILTERS)in - -# Dependencies for tool executables -vs9\$(BROADWAYD_VS9_PROJ): broadwayd.sourcefiles vs9\$(BROADWAYD_VS9_PROJ)in -vs10\$(BROADWAYD_VS1X_PROJ): broadwayd.vs10.sourcefiles vs10\$(BROADWAYD_VS1X_PROJ)in -vs10\$(BROADWAYD_VS1X_PROJ_FILTERS): broadwayd.vs10.sourcefiles.filters vs10\$(BROADWAYD_VS1X_PROJ_FILTERS)in - -# Dependencies for demos -vs9\$(DEMO_VS9_PROJ).pre: gtk3-demo.sourcefiles vs9\$(DEMO_VS9_PROJ)in -vs10\$(DEMO_VS1X_PROJ).pre: gtk3-demo.vs10.sourcefiles vs10\$(DEMO_VS1X_PROJ)in -vs10\$(DEMO_VS1X_PROJ_FILTERS): gtk3-demo.vs10.sourcefiles.filters vs10\$(DEMO_VS1X_PROJ_FILTERS)in - -# Create the project files themselves without customization with options -vs9\$(GDKWIN32_VS9_PROJ).pre \ -vs9\$(GDKBROADWAY_VS9_PROJ) \ -vs9\$(GDK_VS9_PROJ) \ -vs9\$(GTK_VS9_PROJ).pre \ -vs9\$(GAILUTIL_VS9_PROJ) \ -vs9\$(BROADWAYD_VS9_PROJ) \ -vs9\$(DEMO_VS9_PROJ).pre \ -vs10\$(GDKWIN32_VS1X_PROJ).pre \ -vs10\$(GDKBROADWAY_VS1X_PROJ) \ -vs10\$(GDK_VS1X_PROJ) \ -vs10\$(GTK_VS1X_PROJ).pre \ -vs10\$(GAILUTIL_VS1X_PROJ) \ -vs10\$(BROADWAYD_VS1X_PROJ) \ -vs10\$(DEMO_VS1X_PROJ).pre \ -vs10\$(GDKWIN32_VS1X_PROJ_FILTERS) \ -vs10\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \ -vs10\$(GDK_VS1X_PROJ_FILTERS) \ -vs10\$(GTK_VS1X_PROJ_FILTERS) \ -vs10\$(GAILUTIL_VS1X_PROJ_FILTERS) \ -vs10\$(BROADWAYD_VS1X_PROJ_FILTERS) \ -vs10\$(DEMO_VS1X_PROJ_FILTERS): - @$(CPP) /nologo /EP /I. $(@:.pre=)in>$(@F:.pre=).tmp - @for /f "usebackq tokens=* delims=" %%l in ($(@F:.pre=).tmp) do @echo %%l>>$@ - @-del $(@F:.pre=).tmp - @-for %%f in ($**) do @if not "%%f" == "$(@:.pre=)in" del %%f - -vs9\$(GDKWIN32_VS9_PROJ): vs9\$(GDKWIN32_VS9_PROJ).pre -vs10\$(GDKWIN32_VS1X_PROJ): vs10\$(GDKWIN32_VS1X_PROJ).pre - -vs9\$(DEMO_VS9_PROJ): vs9\$(DEMO_VS9_PROJ).pre -vs10\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ).pre - -!ifdef USE_EGL -regenerate-gdk-vsproj-msg: - @echo Regenerating GDK Visual Studio projects with EGL support... - -vs9\$(GDKWIN32_VS9_PROJ): - @echo Generating $@... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring=";INSIDE_GDK_WIN32\"" \ - --outstring=";INSIDE_GDK_WIN32;GDK_WIN32_ENABLE_EGL\"" - @-del $** - -vs10\$(GDKWIN32_VS1X_PROJ): - @echo Generating $@... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring=";INSIDE_GDK_WIN32;%" \ - --outstring=";INSIDE_GDK_WIN32;GDK_WIN32_ENABLE_EGL;%" - @-del $** -!else -regenerate-gdk-vsproj-msg: - @echo Regenerating GDK Visual Studio projects without EGL support... - -vs9\$(GDKWIN32_VS9_PROJ) vs10\$(GDKWIN32_VS1X_PROJ): - @echo Renaming $** to $@... - @move $** $@ -!endif - -# Generate the gtk-3 project with or without using the older PangoFT2 + -# HarfBuzz APIs for the font features support (this code is not used if -# Pango 1.44.0 and HarfBuzz 2.2.0 or later are used) -!ifdef FONT_FEATURES_USE_PANGOFT2 -vs9\$(GTK_VS9_PROJ): vs9\$(GTK_VS9_PROJ).pre2 - @echo Generating final $@ using older PangoFT2 APIs... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring="AdditionalDependencies=\"$$(" \ - --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_PANGOFT2_VS9) $$(" - @del $** - -vs10\$(GTK_VS1X_PROJ): vs10\$(GTK_VS1X_PROJ).pre2 - @echo Generating final $@ using older PangoFT2 APIs... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring=";%(AdditionalDependencies)<" \ - --outstring=";$(DEMO_DEP_LIBS_PANGOFT2_VS1X);%(AdditionalDependencies)<" - @del $** - -vs9\$(GTK_VS9_PROJ).pre2: vs9\$(GTK_VS9_PROJ).pre - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring="$$(GtkDefines" \ - --outstring="HAVE_HARFBUZZ;HAVE_PANGOFT;$$(GtkDefines" - @del $** - -vs10\$(GTK_VS1X_PROJ).pre2: vs10\$(GTK_VS1X_PROJ).pre - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring="$$(GtkDefines);%" \ - --outstring="HAVE_HARFBUZZ;HAVE_PANGOFT;$$(GtkDefines);%" - @del $** -!else -vs9\$(GTK_VS9_PROJ): vs9\$(GTK_VS9_PROJ).pre -vs10\$(GTK_VS1X_PROJ): vs10\$(GTK_VS1X_PROJ).pre - -vs9\$(GTK_VS9_PROJ) vs10\$(GTK_VS1X_PROJ): - @echo Generating final $@... - @move $** $@ -!endif - -!ifdef FONT_FEATURES_DEMO -!ifdef FONT_FEATURES_USE_PANGOFT2 -DEMO_MSG = with font features demo using PangoFT2 -vs9\$(DEMO_VS9_PROJ): - @echo (Re-)Generating $@ $(DEMO_MSG)... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring="AdditionalDependencies=\"\"" \ - --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_PANGOFT2_VS9)\"" - @-del $** - -vs10\$(DEMO_VS1X_PROJ): - @echo (Re-)Generating $@ $(DEMO_MSG)... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring=">%(AdditionalDependencies)<" \ - --outstring=">$(DEMO_DEP_LIBS_PANGOFT2_VS1X);%(AdditionalDependencies)<" - @-del $** -!else -DEMO_MSG = with font features demo -vs9\$(DEMO_VS9_PROJ): - @echo (Re-)Generating $@ $(DEMO_MSG)... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring="AdditionalDependencies=\"\"" \ - --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_NEW_PANGO)\"" - @-del $** - -vs10\$(DEMO_VS1X_PROJ): - @echo (Re-)Generating $@ $(DEMO_MSG)... - @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ - --instring=">%(AdditionalDependencies)<" \ - --outstring=">$(DEMO_DEP_LIBS_NEW_PANGO);%(AdditionalDependencies)<" - @-del $** -!endif -!else -DEMO_MSG = without font features demo -vs9\$(DEMO_VS9_PROJ) vs10\$(DEMO_VS1X_PROJ): - @echo (Re-)Generating $@ $(DEMO_MSG)... - @move $** $@ -!endif - -regenerate-demos-h-win32-msg: - @echo (Re-)Generating demos.h.win32 $(DEMO_MSG)... - -# VS2012+ .vcxproj: Update the toolset version as appropriate -{vs10\}.vcxproj{vs11\}.vcxproj: - @echo Copying and updating $< for VS2012 - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@ --instring=">v100<" --outstring=">v110<" - -{vs10\}.vcxproj{vs12\}.vcxproj: - @echo Copying and updating $< for VS2013 - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@ --instring=">v100<" --outstring=">v120<" - -{vs10\}.vcxproj{vs14\}.vcxproj: - @echo Copying and updating $< for VS2015 - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@ --instring=">v100<" --outstring=">v140<" - -{vs10\}.vcxproj{vs15\}.vcxproj: - @echo Copying and updating $< for VS2017 - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@ --instring=">v100<" --outstring=">v141<" - -{vs10\}.vcxproj{vs16\}.vcxproj: - @echo Copying and updating $< for VS2019 - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@ --instring=">v100<" --outstring=">v142<" - -{vs10\}.vcxproj{vs17\}.vcxproj: - @echo Copying and updating $< for VS2022 - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@ --instring=">v100<" --outstring=">v143<" - -# VS2012+ .vcxproj.filters: We simply copy the VS2010 ones -{vs10\}.filters{vs11\}.filters: - @echo Copying $< to $@... - @copy $< $@ - -{vs10\}.filters{vs12\}.filters: - @echo Copying $< to $@... - @copy $< $@ - -{vs10\}.filters{vs14\}.filters: - @echo Copying $< to $@... - @copy $< $@ - -{vs10\}.filters{vs15\}.filters: - @echo Copying $< to $@... - @copy $< $@ - -{vs10\}.filters{vs16\}.filters: - @echo Copying $< to $@... - @copy $< $@ - -{vs10\}.filters{vs17\}.filters: - @echo Copying $< to $@... - @copy $< $@ - -{vs10\}.sln{vs11\}.sln: - @echo Copying and updating $< for VS2012... - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@.tmp \ - --instring="Format Version 11.00" --outstring="Format Version 12.00" - @$(PYTHON) replace.py -a=replace-str -i=$@.tmp -o=$@ \ - --instring="# Visual Studio 2010" --outstring="# Visual Studio 2012" - @del $@.tmp - -{vs10\}.sln{vs12\}.sln: - @echo Copying and updating $< for VS2013... - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@.tmp \ - --instring="Format Version 11.00" --outstring="Format Version 12.00" - @$(PYTHON) replace.py -a=replace-str -i=$@.tmp -o=$@ \ - --instring="# Visual Studio 2010" --outstring="# Visual Studio 2013" - @del $@.tmp - -{vs10\}.sln{vs14\}.sln: - @echo Copying and updating $< for VS2015... - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@.tmp \ - --instring="Format Version 11.00" --outstring="Format Version 12.00" - @$(PYTHON) replace.py -a=replace-str -i=$@.tmp -o=$@ \ - --instring="# Visual Studio 2010" --outstring="# Visual Studio 14" - @del $@.tmp - -{vs10\}.sln{vs15\}.sln: - @echo Copying and updating $< for VS2017... - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@.tmp \ - --instring="Format Version 11.00" --outstring="Format Version 12.00" - @$(PYTHON) replace.py -a=replace-str -i=$@.tmp -o=$@ \ - --instring="# Visual Studio 2010" --outstring="# Visual Studio 15" - @del $@.tmp - -{vs10\}.sln{vs16\}.sln: - @echo Copying and updating $< for VS2019... - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@.tmp \ - --instring="Format Version 11.00" --outstring="Format Version 12.00" - @$(PYTHON) replace.py -a=replace-str -i=$@.tmp -o=$@ \ - --instring="# Visual Studio 2010" --outstring="# Visual Studio 16" - @del $@.tmp - -{vs10\}.sln{vs17\}.sln: - @echo Copying and updating $< for VS2022... - @$(PYTHON) replace.py -a=replace-str -i=$< -o=$@.tmp \ - --instring="Format Version 11.00" --outstring="Format Version 12.00" - @$(PYTHON) replace.py -a=replace-str -i=$@.tmp -o=$@ \ - --instring="# Visual Studio 2010" --outstring="# Visual Studio 17" - @del $@.tmp - -copy-update-static-projects: \ -$(GTK3_VS11_STATIC_PROJS) \ -$(GTK3_VS12_STATIC_PROJS) \ -$(GTK3_VS14_STATIC_PROJS) \ -$(GTK3_VS15_STATIC_PROJS) \ -$(GTK3_VS16_STATIC_PROJS) \ -$(GTK3_VS17_STATIC_PROJS) - -regenerate-gtk-vsproj-msg: - @echo Regenerating GTK and gailutil projects... - -regenerate-gdk-vsproj: regenerate-gdk-vsproj-msg $(GTK3_GDK_VCPROJS) -regenerate-gtk-vsproj: regenerate-gtk-vsproj-msg $(GTK3_GTK_VCPROJS) $(GTK3_GAILUTIL_VCPROJS) - -regenerate-all-msvc-projs: \ - copy-update-static-projects \ - regenerate-gdk-vsproj \ - regenerate-gtk-vsproj \ - regenerate-demos-h-win32 - -.SUFFIXES: .vcxproj .filters .sln diff --git a/win32/gtk-introspection-msvc.mak b/win32/gtk-introspection-msvc.mak deleted file mode 100644 index abf122e0e0..0000000000 --- a/win32/gtk-introspection-msvc.mak +++ /dev/null @@ -1,150 +0,0 @@ -# NMake Makefile to build Introspection Files for GTK+ - -!include detectenv-msvc.mak -!include generate-msvc.mak - -APIVERSION = 3.0 - -CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0 - -built_install_girs = \ - vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir \ - vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir \ - vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir - -built_install_typelibs = \ - vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).typelib \ - vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).typelib \ - vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).typelib - -!include introspection-msvc.mak - -!if "$(BUILD_INTROSPECTION)" == "TRUE" - -!if "$(PLAT)" == "x64" -AT_PLAT=x86_64 -!elseif "$(PLAT)" == "arm64" -AT_PLAT=aarch64 -!else -AT_PLAT=i686 -!endif - -vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\Gdk-$(APIVERSION).gir.filelist: $(GDK_PUBLIC_HEADERS) $(GDK_C_SRCS) $(GDK_GENERATED_SOURCES) - @if exist $@ del $@ - @for %f in ($(gdk_h_sources:/=\) $(gdk_c_sources:/=\)) do @if not "%f" == "gdkkeysyms-compat.h" echo ..\gdk\%f>>$@ - @for %f in ($(GDK_GENERATED_SOURCES)) do @if not "%~nxf" == "gdkconfig.h" echo %f>>$@ - -vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist: $(GDK_WIN32_INTROSPECTION_SRCS) - @if exist $@ del $@ - @for %f in ($(w32_introspection_files:/=\)) do @echo ..\gdk\%f>>$@ - -vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist: \ -$(GTK_PUBLIC_ENUM_HEADERS) $(GTK_SEMI_PRIVATE_HEADERS) \ -$(GTK_GENERATED_PUB_HDRS) $(GTK_C_SRCS) - @if exist $@ del $@ - @for %f in ($(GTK_PUB_HDRS:.h=)) do @if not "%f" == "gtktextdisplay" if not "%f" == "gtkx" echo ..\gtk\%f.h>>$@ - @for %f in ($(a11y_h_sources:/=\) $(gtk_deprecated_h_sources:/=\) $(gtk_semi_private_h_sources)) do @if not "%f" == "gtktextlayout.h" echo ..\gtk\%f>>$@ - @for %f in ($(a11y_c_sources:/=\) $(gtk_deprecated_c_sources:/=\) $(inspector_c_sources:/=\)) do @echo ..\gtk\%f>>$@ - @for %f in ($(gtk_base_c_sources_base_gtka_gtkh:.c=)) do @echo ..\gtk\%f.c>>$@ - @for %f in ($(gtk_base_c_sources_base_gtki_gtkw:.c=)) do @echo ..\gtk\%f.c>>$@ - @for %f in ($(gtk_clipboard_dnd_c_sources_generic) $(gtk_os_win32_c_sources)) do @echo ..\gtk\%f>>$@ - @for %f in ($(GTK_TYPEBUILTIN_SOURCES) $(GTK_VERSION_H)) do @echo %f>>$@ - -vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir: vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\Gdk-$(APIVERSION).gir.filelist - @-echo Generating $@... - @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection - @set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) - @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) - @set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) - @$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool \ - --namespace=Gdk --nsversion=$(APIVERSION) \ - --library=gdk-$(APIVERSION) \ - --add-include-path=./vs$(VSVER)/$(CFG)/$(PLAT)/bin \ - --add-include-path=$(G_IR_INCLUDEDIR) \ - --include=Gio-2.0 --include=GdkPixbuf-2.0 --include=Pango-1.0 --include=cairo-1.0 \ - --cflags-begin \ - -DG_LOG_USE_STRUCTURED=1 -DGDK_COMPILATION -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3 \ - -I.. -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3/gdk -I../gdk -I../gdk/win32 \ - --cflags-end \ - --c-include=gdk/gdk.h \ - --filelist=$** \ - -L.\vs$(VSVER)\$(CFG)\$(PLAT)\bin \ - -o $@ - -vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir: \ -./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ -vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist - @-echo Generating $@... - @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection - @set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) - @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) - @set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) - $(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool \ - --namespace=GdkWin32 --nsversion=$(APIVERSION) \ - --library=gdk-$(APIVERSION) \ - --add-include-path=./vs$(VSVER)/$(CFG)/$(PLAT)/bin \ - --add-include-path=$(G_IR_INCLUDEDIR) \ - --cflags-begin \ - -DG_LOG_USE_STRUCTURED=1 -DGDK_COMPILATION -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3 \ - -I.. -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3/gdk -I../gdk -I../gdk/win32 \ - --cflags-end \ - --identifier-prefix=Gdk --c-include=gdk/gdkwin32.h \ - --include-uninstalled=./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ - --filelist=vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist \ - -L.\vs$(VSVER)\$(CFG)\$(PLAT)\bin \ - -o $@ - -vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir: \ -./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ -vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist - @-echo Generating $@... - @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection - @set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) - @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) - @set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) - $(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool \ - --namespace=Gtk --nsversion=$(APIVERSION) \ - --library=gtk-$(APIVERSION) --library=gdk-$(APIVERSION) \ - --add-include-path=./vs$(VSVER)/$(CFG)/$(PLAT)/bin \ - --add-include-path=$(G_IR_INCLUDEDIR) \ - --include=Atk-1.0 \ - --pkg-export=gtk+-$(APIVERSION) \ - --cflags-begin \ - -DG_LOG_USE_STRUCTURED=1 -DGTK_VERSION="$(GTK_VERSION)" -DGTK_BINARY_VERSION="3.0.0" -DGTK_COMPILATION \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED -DGTK_LIBDIR=\"/dummy/lib\" -DGTK_DATADIR=\"/dummy/share\" \ - -DGTK_DATA_PREFIX=\"/dummy\" -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_HOST=\"$(AT_PLAT)-pc-vs$(VSVER)\" \ - -DGTK_PRINT_BACKENDS=\"file\" -DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit \ - -DINCLUDE_IM_ime -DINCLUDE_IM_inuktitu -DINCLUDE_IM_ipa -DINCLUDE_IM_multipress -DINCLUDE_IM_thai \ - -DINCLUDE_IM_ti_er -DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr \ - -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \ - -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gtk-3 \ - -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3 \ - -I.. -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gtk-3/gtk -I../gtk \ - -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3/gdk -I../gdk \ - --cflags-end \ - --warn-all --include-uninstalled=./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ - --filelist=vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist \ - -L.\vs$(VSVER)\$(CFG)\$(PLAT)\bin \ - -o $@ - -vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir -vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir -vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir - -$(built_install_typelibs): - @-echo Compiling $@... - $(G_IR_COMPILER) --includedir=$(@D:\=/) --debug --verbose $(@R:\=/).gir -o $@ - -introspect: $(built_install_girs) $(built_install_typelibs) - -!else -introspect: - @-echo $(ERROR_MSG) -!endif - -introspect-clean: - @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist - @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist - @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\Gdk-$(APIVERSION).gir.filelist - @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib - @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir diff --git a/win32/gtkpc.py b/win32/gtkpc.py deleted file mode 100644 index 57ec2096eb..0000000000 --- a/win32/gtkpc.py +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/python -# -# Utility script to generate .pc files for GTK+ -# for Visual Studio builds, to be used for -# building introspection files - -# Author: Fan, Chun-wei -# Date: April 26, 2016 - -import os -import sys -import argparse - -from replace import replace_multi, replace -from pc_base import BasePCItems - -def main(argv): - base_pc = BasePCItems() - - gdk_parser = argparse.ArgumentParser(description='Setup basic .pc file info') - gdk_parser.add_argument('--broadway', - action='store_const', - const=1, - help='GDK with Broadway backend') - gdk_parser.add_argument('--host', - required=True, - help='Build type') - base_pc.setup(argv, gdk_parser) - - atk_min_ver = '2.15.1' - cairo_min_ver = '1.14.0' - gdk_pixbuf_min_ver = '2.30.0' - gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi -lwinspool -lcomctl32 -lcomdlg32' - cairo_libs = '-lcairo-gobject -lcairo ' - glib_min_ver = '2.45.8' - - gdk_backends = 'win32' - gio_package = 'gio-2.0 >= ' + glib_min_ver - broadway_extra_libs = '' - - gdk_args = gdk_parser.parse_args() - if getattr(gdk_args, 'broadway', None) is 1: - # On Visual Studio, we link to zlib1.lib - broadway_extra_libs = ' -lzlib1' - gdk_backends += ' broadway' - - pkg_replace_items = {'@GTK_API_VERSION@': '3.0', - '@GDK_BACKENDS@': gdk_backends} - - pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver - - gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \ - 'pangowin32 pangocairo' + ' ' + \ - pkg_required_packages, - '@GDK_PRIVATE_PACKAGES@': gio_package, - '@GDK_EXTRA_LIBS@': cairo_libs + gdk_win32_sys_libs + broadway_extra_libs, - '@GDK_EXTRA_CFLAGS@': '', - 'gdk-3': 'gdk-3.0'} - - gtk_pc_replace_items = {'@host@': gdk_args.host, - '@GTK_BINARY_VERSION@': '3.0.0', - '@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \ - pkg_required_packages + ' ' + \ - gio_package, - '@GTK_PRIVATE_PACKAGES@': 'atk', - '@GTK_EXTRA_CFLAGS@': '', - '@GTK_EXTRA_LIBS@': '', - '@GTK_EXTRA_CFLAGS@': '', - 'gtk-3': 'gtk-3.0'} - - gail_pc_replace_items = {'gailutil-3': 'gailutil-3.0'} - - pkg_replace_items.update(base_pc.base_replace_items) - gdk_pc_replace_items.update(pkg_replace_items) - gtk_pc_replace_items.update(pkg_replace_items) - gail_pc_replace_items.update(base_pc.base_replace_items) - - # Generate gdk-3.0.pc - replace_multi(base_pc.top_srcdir + '/gdk-3.0.pc.in', - base_pc.srcdir + '/gdk-3.0.pc', - gdk_pc_replace_items) - - # Generate gtk+-3.0.pc - replace_multi(base_pc.top_srcdir + '/gtk+-3.0.pc.in', - base_pc.srcdir + '/gtk+-3.0.pc', - gtk_pc_replace_items) - - # Generate gail-3.0.pc - replace_multi(base_pc.top_srcdir + '/gail-3.0.pc.in', - base_pc.srcdir + '/gail-3.0.pc', - gail_pc_replace_items) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/install-msvc.mak b/win32/install-msvc.mak deleted file mode 100644 index b39764727a..0000000000 --- a/win32/install-msvc.mak +++ /dev/null @@ -1,145 +0,0 @@ -# NMake Makefile portion for copying the built files to directories as appropriate -# under $(PREFIX) - -!include config-msvc.mak -!include create-lists-msvc.mak - -GTK_API_VERSION = 3 -BASE_BUILT_BIN_DIR = .\vs$(VSVER)\$(CFG)\$(PLAT)\bin - -!ifdef BROADWAY -GDK_OUTPUT_CONFIGDIR = $(CFG)_Broadway -GDK_BROADWAY_BIN = .\vs$(VSVER)\$(GDK_OUTPUT_CONFIGDIR)\$(PLAT)\bin\broadwayd.exe -GDK_BROADWAY_PDB = $(GDK_BROADWAY_BIN:.exe=.pdb) -GEN_PC_BROADWAY_FLAG = --broadway -!else -GDK_OUTPUT_CONFIGDIR = $(CFG) -GDK_BROADWAY_BIN = -GDK_BROADWAY_PDB = -GEN_PC_BROADWAY_FLAG = -!endif - -IMPLIB_SUFFIX = $(GTK_API_VERSION).0.lib -GDK_DLL = .\vs$(VSVER)\$(GDK_OUTPUT_CONFIGDIR)\$(PLAT)\bin\gdk-$(GTK_API_VERSION)-vs$(VSVER).dll -GDK_PDB = $(GDK_DLL:.dll=.pdb) -GDK_LIB = .\vs$(VSVER)\$(GDK_OUTPUT_CONFIGDIR)\$(PLAT)\bin\gdk-$(IMPLIB_SUFFIX) -GDK_BIN_ITEMS = $(GDK_DLL) $(GDK_PDB) $(GDK_BROADWAY_BIN) $(GDK_BROADWAY_PDB) -GTK_DLL_FILENAME = gtk-$(GTK_API_VERSION)-vs$(VSVER) -GTK_LIB = $(BASE_BUILT_BIN_DIR)\gtk-$(IMPLIB_SUFFIX) -LIBGAIL_UTIL_DLL_FILENAME = gailutil-$(GTK_API_VERSION)-vs$(VSVER) -LIBGAIL_UTIL_LIB = $(BASE_BUILT_BIN_DIR)\gailutil-$(IMPLIB_SUFFIX) -GTK_PROGRAMS_NAMES = builder-tool encode-symbolic-svg query-settings update-icon-cache -GTK3_PROGRAMS_NAMES = demo demo-application icon-browser widget-factory -GDK_GIR_FILE = $(BASE_BUILT_BIN_DIR)\Gdk-$(IMPLIB_SUFFIX:.lib=.gir) -GDKWIN32_GIR_FILE = $(BASE_BUILT_BIN_DIR)\GdkWin32-$(IMPLIB_SUFFIX:.lib=.gir) -GTK_GIR_FILE = $(BASE_BUILT_BIN_DIR)\Gtk-$(IMPLIB_SUFFIX:.lib=.gir) -GDK_TYPELIB_FILE = $(GDK_GIR_FILE:.gir=.typelib) -GDKWIN32_TYPELIB_FILE = $(GDKWIN32_GIR_FILE:.gir=.typelib) -GTK_TYPELIB_FILE = $(GTK_GIR_FILE:.gir=.typelib) - -GTK_HEADERS_BASE_INSTALL_DIR = $(PREFIX)\include\gtk-$(GTK_API_VERSION).0 -GAILUTIL_HEADERS_BASE_INSTALL_DIR = $(PREFIX)\include\gail-$(GTK_API_VERSION).0 - -GDK_BASE_HEADERS = $(gdk_public_h_sources) - -GDK_CONFIG_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-$(GTK_API_VERSION)\gdk\gdkconfig.h -GDK_ENUM_TYPES_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-$(GTK_API_VERSION)\gdk\gdkenumtypes.h -GDK_VERSION_MACROS_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-$(GTK_API_VERSION)\gdk\gdkversionmacros.h -GDK_GENERATED_PUBLIC_H = $(GDK_CONFIG_H) $(GDK_ENUM_TYPES_H) $(GDK_VERSION_MACROS_H) - -GTK_TYPE_BULITINS_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-$(GTK_API_VERSION)\gtk\gtktypebuiltins.h -GTK_VERSION_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-$(GTK_API_VERSION)\gtk\gtkversion.h -GTK_GENERATED_PUBLIC_H = $(GTK_TYPE_BULITINS_H) $(GTK_VERSION_H) - -!ifdef INSTALL_TRANSLATIONS -DATA_TARGETS = install-data install-translations -!else -DATA_TARGETS = install-data -!endif - -all: install-bin install-headers $(DATA_TARGETS) - -# Copy the built files -install-bin: - @echo Copying built binaries and data files... - -# Copy the DLLs and programs and their .pdb's - @for %d in (bin lib) do @if not exist $(PREFIX)\%d\ mkdir $(PREFIX)\%d - @for %f in ($(GDK_BIN_ITEMS)) do @copy /b %f "$(PREFIX)\bin" - @for %f in ($(GTK_DLL_FILENAME) $(LIBGAIL_UTIL_DLL_FILENAME)) do @for %x in (dll pdb) do @copy /b $(BASE_BUILT_BIN_DIR)\%f.%x "$(PREFIX)\bin" - @for %f in ($(GTK_PROGRAMS_NAMES)) do @for %x in (exe pdb) do @copy /b $(BASE_BUILT_BIN_DIR)\gtk-%f.%x "$(PREFIX)\bin" - @for %f in ($(GTK3_PROGRAMS_NAMES)) do @for %x in (exe pdb) do @copy /b $(BASE_BUILT_BIN_DIR)\gtk3-%f.%x "$(PREFIX)\bin" - -# Copy the .lib's - @for %f in ($(GDK_LIB) $(GTK_LIB) $(LIBGAIL_UTIL_LIB)) do @copy /b %f "$(PREFIX)\lib" - @for %f in (gdk gtk gailutil) do @copy /b "$(PREFIX)\lib\%f-$(IMPLIB_SUFFIX)" "$(PREFIX)\lib\%f-$(GTK_API_VERSION).lib" - -# Generate the pkg-config files, if Python is callable and if it is not disabled - @if "$(NO_PKGCONFIG)" == "" if not exist $(PREFIX)\lib\pkgconfig\ mkdir $(PREFIX)\lib\pkgconfig - @-if "$(NO_PKGCONFIG)" == "" if exist $(PYTHON) $(PYTHON) gtkpc.py --prefix=$(PREFIX) --version=$(GTK_VERSION) --host=$(AT_PLAT)-pc-vs$(VSVER) $(GEN_PC_BROADWAY_FLAG) - @-if "$(NO_PKGCONFIG)" == "" if exist $(PYTHON).exe $(PYTHON) gtkpc.py --prefix=$(PREFIX) --version=$(GTK_VERSION) --host=$(AT_PLAT)-pc-vs$(VSVER) $(GEN_PC_BROADWAY_FLAG) - @for %f in (gdk gtk+) do @if exist %f-$(GTK_API_VERSION).0.pc copy "%f-$(GTK_API_VERSION).0.pc" "$(PREFIX)\lib\pkgconfig" - @for %f in (gail) do @if exist %f-$(GTK_API_VERSION).0.pc move %f-$(GTK_API_VERSION).0.pc $(PREFIX)\lib\pkgconfig - @for %f in (gdk gtk+) do @if exist %f-$(GTK_API_VERSION).0.pc move %f-$(GTK_API_VERSION).0.pc $(PREFIX)\lib\pkgconfig\%f-win32-$(GTK_API_VERSION).0.pc - -# Copy the introspection files, if built - @if exist $(GTK_TYPELIB_FILE) @for %d in (lib\girepository-1.0 share\gir-1.0) do @if not exist $(PREFIX)\%d\ mkdir $(PREFIX)\%d - @for %f in ($(GDK_GIR_FILE) $(GDKWIN32_GIR_FILE) $(GTK_GIR_FILE)) do @if exist %f copy /b %f "$(PREFIX)\share\gir-1.0" - @for %f in ($(GDK_TYPELIB_FILE) $(GDKWIN32_TYPELIB_FILE) $(GTK_TYPELIB_FILE)) do @if exist %f copy /b %f "$(PREFIX)\lib\girepository-1.0" - -# Copy the public headers -install-headers: - @echo Copying the headers... - -# Create the GDK header directories - @for %d in (gdk gdk\deprecated gdk\win32) do @if not exist $(GTK_HEADERS_BASE_INSTALL_DIR)\%d\ mkdir $(GTK_HEADERS_BASE_INSTALL_DIR)\%d - @if not "$(BROADWAY)" == "" if not exist $(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\broadway\ mkdir $(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\broadway - -# Create the GTK header directories - @for %d in (gtk gtk\a11y gtk\deprecated) do @if not exist $(GTK_HEADERS_BASE_INSTALL_DIR)\%d\ mkdir $(GTK_HEADERS_BASE_INSTALL_DIR)\%d - -# Create the libgail-util header directories - @for %d in (libgail-util) do @if not exist $(GAILUTIL_HEADERS_BASE_INSTALL_DIR)\%d\ mkdir $(GAILUTIL_HEADERS_BASE_INSTALL_DIR)\%d - -# Copy the GDK headers (with GdkWin32 and with Gdk-Broadway, if built) - @for %f in ($(GDK_GENERATED_PUBLIC_H)) do @copy %f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" - @for %f in ($(gdk_public_h_sources)) do @copy ..\gdk\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" - @for %f in ($(gdk_deprecated_h_sources:/=\)) do @copy ..\gdk\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\deprecated" - @for %f in ($(GDK_PUBLIC_H_SRCS_WIN32)) do @copy ..\gdk\win32\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" - @for %f in ($(libgdkwin32include_HEADERS)) do @copy ..\gdk\win32\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\win32" - @if not "$(BROADWAY)" == "" for %f in ($(GDK_PUBLIC_H_SRCS_BROADWAY)) do @copy ..\gdk\broadway\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" - @if not "$(BROADWAY)" == "" for %f in ($(libgdkbroadwayinclude_HEADERS)) do @copy ..\gdk\broadway\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\broadway" - -# Copy the GTK headers - @for %f in ($(GTK_GENERATED_PUBLIC_H)) do @copy %f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk" -# I hate the U1095 command line too long fatal error :|, work around it... - @for %f in ($(GTK_PUB_HDRS:.h=) $(gtk_semi_private_h_sources:.h=)) do @copy ..\gtk\%f.h "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk" - @for %f in ($(a11y_h_sources:a11y/=)) do @copy ..\gtk\a11y\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk\a11y" - @for %f in ($(gtk_deprecated_h_sources:deprecated/=)) do @copy ..\gtk\deprecated\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk\deprecated" - -# Copy the libgail-util headers - @for %f in ($(util_public_h_sources)) do @copy ..\libgail-util\%f "$(GAILUTIL_HEADERS_BASE_INSTALL_DIR)\libgail-util" - -# install the data files -install-data: - @echo Copying the non-generated data files... -# GSettings schemas - @if not exist $(PREFIX)\share\glib-2.0\schemas\ mkdir $(PREFIX)\share\glib-2.0\schemas - @for %f in (..\gtk\org.gtk.Settings.*.gschema.xml ..\demos\gtk-demo\org.gtk.Demo.gschema.xml) do @copy %f "$(PREFIX)\share\glib-2.0\schemas" - @-$(GLIB_COMPILE_SCHEMAS) $(PREFIX)\share\glib-2.0\schemas -# Demo icons - @for %t in (16 22 24 32 48 256) do @for %d in ($(PREFIX)\share\icons\hicolor\%tx%t\apps) do @((if not exist %d\ mkdir %d) & copy /b ..\demos\gtk-demo\data\%tx%t\gtk3-demo*.png "%d") - @for %t in (16 22 24 32 48 256) do @for %d in ($(PREFIX)\share\icons\hicolor\%tx%t\apps) do @((if not exist %d\ mkdir %d) & copy /b ..\demos\widget-factory\data\%tx%t\gtk3-widget-factory*.png "%d") - @-$(BASE_BUILT_BIN_DIR)\gtk-update-icon-cache.exe --ignore-theme-index --force "$(PREFIX)\share\icons\hicolor" -# Auxiliary build-related data files (m4, ITS files, RelaxNG files) - @for %d in (aclocal gettext\its gtk-3.0\emoji) do @if not exist $(PREFIX)\share\%d\ mkdir $(PREFIX)\share\%d - @copy ..\m4macros\gtk-3.0.m4 $(PREFIX)\share\aclocal - @for %x in (its loc) do @copy ..\gtk\gtkbuilder.%x $(PREFIX)\share\gettext\its - @for %x in (rng) do @copy ..\gtk\gtkbuilder.%x $(PREFIX)\share\gtk-3.0 - @for %l in (de es fr zh) do @for %f in ($(BASE_BUILT_BIN_DIR)\%l.gresource) do @copy %f $(PREFIX)\share\gtk-3.0\emoji - -# Generate and install the translations -install-translations: - @for %d in (po po-properties) do @for %l in (..\%d\*.po) do @if not exist $(PREFIX)\share\locale\%~nl\LC_MESSAGES\ md $(PREFIX)\share\locale\%~nl\LC_MESSAGES - @for %l in (..\po\*.po) do @$(MSGFMT) -c -v -o $(PREFIX)\share\locale\%~nl\LC_MESSAGES\gtk30.mo %l - @for %l in (..\po-properties\*.po) do @$(MSGFMT) -c -v -o $(PREFIX)\share\locale\%~nl\LC_MESSAGES\gtk30-properties.mo %l diff --git a/win32/introspection-msvc.mak b/win32/introspection-msvc.mak deleted file mode 100644 index 26501f5251..0000000000 --- a/win32/introspection-msvc.mak +++ /dev/null @@ -1,94 +0,0 @@ -# Common NMake Makefile module for checking the build environment is sane -# for building introspection files under MSVC/NMake. -# This can be copied from $(gi_srcroot)\build\win32 for GNOME items -# that support MSVC builds and introspection under MSVC. - -# Can override with env vars as needed -# You will need to have built gobject-introspection for this to work. -# Change or pass in or set the following to suit your environment - -!if "$(PREFIX)" == "" -PREFIX = ..\..\vs$(VSVER)\$(PLAT) -!endif - -!if ![setlocal] && \ - ![set PFX=$(PREFIX)] && \ - ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x] -!endif -!include pfx.x - -!if "$(PKG_CONFIG_PATH)" == "" -PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig -!else -PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH) -!endif - -!if ![del $(ERRNUL) /q/f pfx.x] -!endif - -# Note: The PYTHON must be the Python release series that was used to build -# the GObject-introspection scanner Python module! -# Either having python.exe your PATH will work or passing in -# PYTHON= will do - -# This is required, and gobject-introspection needs to be built -# before this can be successfully run. -!if "$(PYTHON)" == "" -PYTHON=python -!endif - -# Path to the pkg-config tool, if not already in the PATH -!if "$(PKG_CONFIG)" == "" -PKG_CONFIG=pkg-config -!endif - -# Don't change anything following this line! - -GIR_SUBDIR = share\gir-1.0 -GIR_TYPELIBDIR = lib\girepository-1.0 -G_IR_SCANNER = $(PREFIX)\bin\g-ir-scanner -G_IR_COMPILER = $(PREFIX)\bin\g-ir-compiler.exe -G_IR_INCLUDEDIR = $(PREFIX)\$(GIR_SUBDIR) -G_IR_TYPELIBDIR = $(PREFIX)\$(GIR_TYPELIBDIR) - -VALID_PKG_CONFIG_PATH = FALSE - -MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH -MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files - -ERROR_MSG = - -BUILD_INTROSPECTION = TRUE - -!if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)] \ - && ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x] \ - && ![setlocal] \ - && ![set file="pkgconfig.x"] \ - && ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize] \ - && ![del $(ERRNUL) /q/f pkgconfig.x] -!endif - -!include pkgconfig.chksize -!if "$(PKG_CHECK_SIZE)" == "0" -VALID_PKG_CONFIG_PATH = TRUE -!else -VALID_PKG_CONFIG_PATH = FALSE -!endif - -!if ![del $(ERRNUL) /q/f pkgconfig.chksize] -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" -VALID_CFGSET = TRUE -!endif - -!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE" -BUILD_INTROSPECTION = FALSE -ERROR_MSG = $(MSG_INVALID_PKGCONFIG) -!endif - -!if "$(VALID_CFGSET)" != "TRUE" -BUILD_INTROSPECTION = FALSE -ERROR_MSG = $(MSG_INVALID_CFG) -!endif diff --git a/win32/pc_base.py b/win32/pc_base.py deleted file mode 100644 index 25d6e42c99..0000000000 --- a/win32/pc_base.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to generate the basic info -# needed in a .pc (pkg-config) file, used especially -# for introspection purposes - -# This can be used in various projects where -# there is the need to generate .pc files, -# and is copied from GLib's $(srcroot)/build/win32 - -# Author: Fan, Chun-wei -# Date: March 10, 2016 - -import os -import sys -import argparse - -class BasePCItems: - def __init__(self): - self.base_replace_items = {} - self.exec_prefix = '' - self.includedir = '' - self.libdir = '' - self.prefix = '' - self.srcdir = os.path.dirname(__file__) - self.top_srcdir = os.path.join(self.srcdir, os.pardir) - self.version = '' - - def setup(self, argv, parser=None): - if parser is None: - parser = argparse.ArgumentParser(description='Setup basic .pc file info') - parser.add_argument('--prefix', help='prefix of the installed library', - required=True) - parser.add_argument('--exec-prefix', - help='prefix of the installed programs, \ - if different from the prefix') - parser.add_argument('--includedir', - help='includedir of the installed library, \ - if different from ${prefix}/include') - parser.add_argument('--libdir', - help='libdir of the installed library, \ - if different from ${prefix}/lib') - parser.add_argument('--version', help='Version of the package', - required=True) - args = parser.parse_args() - - self.version = args.version - - # check whether the prefix and exec_prefix are valid - if not os.path.exists(args.prefix): - raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix) - - # use absolute paths for prefix - self.prefix = os.path.abspath(args.prefix).replace('\\','/') - - # check and setup the exec_prefix - if getattr(args, 'exec_prefix', None) is None: - exec_prefix_use_shorthand = True - self.exec_prefix = '${prefix}' - else: - if args.exec_prefix.startswith('${prefix}'): - exec_prefix_use_shorthand = True - input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):] - else: - exec_prefix_use_shorthand = False - input_exec_prefix = args.exec_prefix - if not os.path.exists(input_exec_prefix): - raise SystemExit('Specified exec_prefix \'%s\' is invalid' % - args.exec_prefix) - if exec_prefix_use_shorthand is True: - self.exec_prefix = args.exec_prefix.replace('\\','/') - else: - self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/') - - # check and setup the includedir - if getattr(args, 'includedir', None) is None: - self.includedir = '${prefix}/include' - else: - if args.includedir.startswith('${prefix}'): - includedir_use_shorthand = True - input_includedir = args.prefix + args.includedir[len('${prefix}'):] - else: - if args.includedir.startswith('${exec_prefix}'): - includedir_use_shorthand = True - input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):] - else: - includedir_use_shorthand = False - input_includedir = args.includedir - if not os.path.exists(input_includedir): - raise SystemExit('Specified includedir \'%s\' is invalid' % - args.includedir) - if includedir_use_shorthand is True: - self.includedir = args.includedir.replace('\\','/') - else: - self.includedir = os.path.abspath(input_includedir).replace('\\','/') - - # check and setup the libdir - if getattr(args, 'libdir', None) is None: - self.libdir = '${prefix}/lib' - else: - if args.libdir.startswith('${prefix}'): - libdir_use_shorthand = True - input_libdir = args.prefix + args.libdir[len('${prefix}'):] - else: - if args.libdir.startswith('${exec_prefix}'): - libdir_use_shorthand = True - input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):] - else: - libdir_use_shorthand = False - input_libdir = args.libdir - if not os.path.exists(input_libdir): - raise SystemExit('Specified libdir \'%s\' is invalid' % - args.libdir) - if libdir_use_shorthand is True: - self.libdir = args.libdir.replace('\\','/') - else: - self.libdir = os.path.abspath(input_libdir).replace('\\','/') - - # setup dictionary for replacing items in *.pc.in - self.base_replace_items.update({'@VERSION@': self.version}) - self.base_replace_items.update({'@prefix@': self.prefix}) - self.base_replace_items.update({'@exec_prefix@': self.exec_prefix}) - self.base_replace_items.update({'@libdir@': self.libdir}) - self.base_replace_items.update({'@includedir@': self.includedir}) diff --git a/win32/replace.py b/win32/replace.py deleted file mode 100644 index f215cce584..0000000000 --- a/win32/replace.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to manipulate -# certain types of strings in a file - -# This can be used in various projects where -# there is the need to replace strings in files, -# and is copied from GLib's $(srcroot)/build/win32 - -# Author: Fan, Chun-wei -# Date: September 03, 2014 - -import os -import sys -import re -import string -import argparse - -valid_actions = ['remove-prefix', - 'replace-var', - 'replace-str', - 'remove-str'] - -def open_file(filename, mode): - if sys.version_info[0] < 3: - return open(filename, mode=mode) - else: - return open(filename, mode=mode, encoding='utf-8') - -def replace_multi(src, dest, replace_items): - with open_file(src, 'r') as s: - with open_file(dest, 'w') as d: - for line in s: - replace_dict = dict((re.escape(key), value) \ - for key, value in replace_items.items()) - replace_pattern = re.compile("|".join(replace_dict.keys())) - d.write(replace_pattern.sub(lambda m: \ - replace_dict[re.escape(m.group(0))], line)) - -def replace(src, dest, instring, outstring): - replace_item = {instring: outstring} - replace_multi(src, dest, replace_item) - -def check_required_args(args, params): - for param in params: - if getattr(args, param, None) is None: - raise SystemExit('%s: error: --%s argument is required' % (__file__, param)) - -def warn_ignored_args(args, params): - for param in params: - if getattr(args, param, None) is not None: - print('%s: warning: --%s argument is ignored' % (__file__, param)) - -def main(argv): - - parser = argparse.ArgumentParser(description='Process strings in a file.') - parser.add_argument('-a', - '--action', - help='Action to carry out. Can be one of:\n' - 'remove-prefix\n' - 'replace-var\n' - 'replace-str\n' - 'remove-str', - choices=valid_actions) - parser.add_argument('-i', '--input', help='Input file') - parser.add_argument('-o', '--output', help='Output file') - parser.add_argument('--instring', help='String to replace or remove') - parser.add_argument('--var', help='Autotools variable name to replace') - parser.add_argument('--outstring', - help='New String to replace specified string or variable') - parser.add_argument('--removeprefix', help='Prefix of string to remove') - - args = parser.parse_args() - - input_string = '' - output_string = '' - - # We must have action, input, output for all operations - check_required_args(args, ['action','input','output']) - - # Build the arguments by the operation that is to be done, - # to be fed into replace() - - # Get rid of prefixes from a string - if args.action == 'remove-prefix': - check_required_args(args, ['instring','removeprefix']) - warn_ignored_args(args, ['outstring','var']) - input_string = args.removeprefix + args.instring - output_string = args.instring - - # Replace an m4-style variable (those surrounded by @...@) - if args.action == 'replace-var': - check_required_args(args, ['var','outstring']) - warn_ignored_args(args, ['instring','removeprefix']) - input_string = '@' + args.var + '@' - output_string = args.outstring - - # Replace a string - if args.action == 'replace-str': - check_required_args(args, ['instring','outstring']) - warn_ignored_args(args, ['var','removeprefix']) - input_string = args.instring - output_string = args.outstring - - # Remove a string - if args.action == 'remove-str': - check_required_args(args, ['instring']) - warn_ignored_args(args, ['var','outstring','removeprefix']) - input_string = args.instring - output_string = '' - - replace(args.input, args.output, input_string, output_string) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/vs10/.gitignore b/win32/vs10/.gitignore deleted file mode 100644 index 5f2df27914..0000000000 --- a/win32/vs10/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -broadwayd.vcxproj.filters -broadwayd.vcxproj -gailutil-3.vcxproj.filters -gailutil-3.vcxproj -gdk-3.vcxproj.filters -gdk-3.vcxproj -gdk3-broadway.vcxproj.filters -gdk3-broadway.vcxproj -gdk3-win32.vcxproj.filters -gdk3-win32.vcxproj -gtk-3.vcxproj.filters -gtk-3.vcxproj -gtk3-demo.vcxproj.filters -gtk3-demo.vcxproj diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am deleted file mode 100644 index 37346a8f77..0000000000 --- a/win32/vs10/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -GENERATED_ITEMS = \ - gdk3-win32.vcxproj \ - gdk3-win32.vcxproj.filters \ - gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - broadwayd.vcxproj \ - broadwayd.vcxproj.filters \ - gdk-3.vcxproj \ - gdk-3.vcxproj.filters \ - gtk-3.vcxproj \ - gtk-3.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters - -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcxproj \ - gdk3-win32.vcxprojin \ - gdk3-win32.vcxproj.filtersin \ - gdk3-broadway.vcxprojin \ - gdk3-broadway.vcxproj.filtersin \ - broadwayd.vcxprojin \ - broadwayd.vcxproj.filtersin \ - gdk-3.vcxprojin \ - gdk-3.vcxproj.filtersin \ - gtk-3.vcxprojin \ - gtk-3.vcxproj.filtersin \ - gtk-builder-tool.vcxproj \ - gtk-builder-tool.vcxproj.filters \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk-query-settings.vcxproj \ - gtk-query-settings.vcxproj.filters \ - gtk-update-icon-cache.vcxproj \ - gtk-update-icon-cache.vcxproj.filters \ - gtk3-demo.vcxprojin \ - gtk3-demo.vcxproj.filtersin \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ - gtk3-widget-factory.vcxproj \ - gtk3-widget-factory.vcxproj.filters \ - gailutil-3.vcxprojin \ - gailutil-3.vcxproj.filtersin \ - gtk3-install.vcxproj \ - gtk3-introspect.vcxproj \ - $(GENERATED_ITEMS) - -DISTCLEANFILES = \ - $(GENERATED_ITEMS) - --include $(top_srcdir)/git.mk diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt deleted file mode 100644 index ef9c39c34f..0000000000 --- a/win32/vs10/README.txt +++ /dev/null @@ -1,116 +0,0 @@ -Please do not compile this package (GTK+) in paths that contain -spaces in them-as strange problems may occur during compilation or during -the use of the library. - -A more detailed outline for instructions on building the GTK+ with Visual -C++ can be found in the following GNOME Live! page: - -https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack - -This VS10 solution and the projects it includes are intented to be used -in a GTK+ source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or manual work to expand -the files needed, like config.h.win32.in into config.h.win32 and the -.vcxprojin and .vcxproj.filtersin files here into corresponding actual -.vcxproj and vcxproj.filters files. - -You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango, -ATK and GLib. External dependencies are at least Cairo -(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng, -gettext-runtime, fontconfig*, freetype*, expat*. See the -build/win32/vs10/README.txt file in glib for details where to unpack them. - -You will also need a Python 2.6+/3.x interpretor installed on your system, -which can be obtained from the official installers available from -http://www.python.org. Please note that the Python interpretor (python.exe) -either needs to be in your PATH before attempting the build of GTK+, or it -can be found in the path specified by PythonDir in gtk-version-paths.props. -If you happen to change the PythonDir setting in gtk-version-paths.props after -opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution, -delete all the *.sdf, *.suo and *.user files before re-attempting the build. - -It is recommended that one builds the dependencies with VS10 as far as -possible, especially those from and using the GTK+ stack (i.e. GLib, -Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls -to different CRTs can be kept at a minimum. - -zlib, libpng, and Cairo do contain support for compiling under VS10 -using VS project files and/or makefiles at this time of writing, For the -GTK+ stack, VS10 project files are either available under -$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK -(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next -unstable version of Pango. There is no known official VS10 build -support for fontconfig (along with freetype and expat) and -gettext-runtime, so please use the binaries from: - -ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) -ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) - -Unzip the binaries obtained from ftp.gnome.org in \vs10\, -and build the following, if not already done so: - -Note: put the resulting zlib, libpng, pcre and Cairo files as follows: - .dll files: \vs10\\bin - .lib files: \vs10\\lib - .h files: \vs10\\include - -The recommended build order for these dependencies: -(first unzip any dependent binaries downloaded from the ftp.gnome.org - as described in the README.txt file in the build/win32/vs10 folder) --zlib --libpng --(for GDK-Pixbuf, if not using GDI+) IJG JPEG or libjpeg-turbo --(for GDK-Pixbuf, if not using GDI+) libtiff - [libtiff requires zlib and IJG JPEG or libjpeg-turbo] --(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library] --(optional for GLib) PCRE (version 8.12 or later, use of CMake to - build PCRE is recommended-see build/win32/vs10/README.txt of GLib) --GLib ** --Cairo (inclusive of Cairo-GObject) --ATK** --Pango** --GDK-Pixbuf** -(note the last 3 dependencies are not interdependent, so the last 3 - dependencies can be built in any order) - -The "install" project will copy build results and headers into their -appropriate location under \vs10\. For instance, -built DLLs go into \vs10\\bin, built LIBs into -\vs10\\lib and GTK+ headers into -\vs10\\include\gtk-3.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific GLib source tree. - -There is now a "gtk3-introspect" project that is used to build the -introspection files. In order for this to work, check that the paths for -PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your -system. Note that it must be the same Python installation that was used to -build GObject-Introspection (G-I), and a complete G-I build/installation -needs to be found in \vs10\\, with the introspection files -for ATK, Pango and GDK-Pixbuf. Note also that this is not built by default, -so you will need to right-click on the project to build it, which will build -and "install" the other projects that are normally built, if those were not yet -built. The introspection files that are built will be "installed" to -\vs10\\share\gir-1.0 (the .gir file(s)) and -\vs10\\lib\girepository-1.0 (the .typelib files(s)) upon -successful build. for building this in a different configuration, therefore, -you will need to clean this project specifically and then rebuild. - -Please note, as GTK+ uses the Adwaita theme for all platforms by default, -most icons used are not included with GTK+ (which *are* needed), so please see -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the -GTK+ section) on how to get those icons set up for use with GTK+. - -*About the dependencies marked with *: These dependencies are optional - as those are not compulsory components for building and running GTK+ - itself, but note that they are needed for people running and building - GIMP or those who need complex script support via fontconfig. They - are referred to by components in Cairo and Pango mainly. - Decide whether you need fontconfig support prior to building Cairo - and Pango. - -**:Put the sources of the packages marked with ** in \, and build with VS10 from there. - ---Tor Lillqvist ---Updated by Chun-wei Fan diff --git a/win32/vs10/broadwayd.vcxproj.filtersin b/win32/vs10/broadwayd.vcxproj.filtersin deleted file mode 100644 index ad496bc438..0000000000 --- a/win32/vs10/broadwayd.vcxproj.filtersin +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "broadwayd.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/broadwayd.vcxprojin b/win32/vs10/broadwayd.vcxprojin deleted file mode 100644 index c291510b44..0000000000 --- a/win32/vs10/broadwayd.vcxprojin +++ /dev/null @@ -1,95 +0,0 @@ -ďťż - - - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - - - - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5} - broadwayd - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - X64 - - - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - $(GdkDefines);%(PreprocessorDefinitions) - true - MultiThreadedDLL - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - - - true - true - - MachineX86 - MachineX64 - - - -#include "broadwayd.vs10.sourcefiles" - - - - {b98fbe68-b03c-48e3-8f32-c3c010720d30} - false - - - - - - diff --git a/win32/vs10/gailutil-3.vcxproj.filtersin b/win32/vs10/gailutil-3.vcxproj.filtersin deleted file mode 100644 index 5f3a5bcad4..0000000000 --- a/win32/vs10/gailutil-3.vcxproj.filtersin +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "gailutil-3.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/gailutil-3.vcxprojin b/win32/vs10/gailutil-3.vcxprojin deleted file mode 100644 index 423b338b97..0000000000 --- a/win32/vs10/gailutil-3.vcxprojin +++ /dev/null @@ -1,101 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A1FCED61-4E51-4015-A70C-5373404D1BA0} - gailutil - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - MultiThreadedDLL - true - ProgramDatabase - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - - - true - true - - MachineX86 - MachineX64 - - - -#include "gailutil-3.vs10.sourcefiles" - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gdk-3.vcxproj.filtersin b/win32/vs10/gdk-3.vcxproj.filtersin deleted file mode 100644 index edb543dba8..0000000000 --- a/win32/vs10/gdk-3.vcxproj.filtersin +++ /dev/null @@ -1,24 +0,0 @@ -ďťż - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - Resource Files - - -#include "gdk-3.vs10.sourcefiles.filters" - Source Files - - diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin deleted file mode 100644 index 96b8cd137b..0000000000 --- a/win32/vs10/gdk-3.vcxprojin +++ /dev/null @@ -1,167 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - - - - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - gdk3 - Win32Proj - - - - DynamicLibrary - MultiByte - true - true - v100 - - - - - - - - - - - true - false - true - false - - - - - Level3 - - - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - - - $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) - $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) - - - Disabled - Disabled - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - true - EnableFastChecks - EnableFastChecks - MultiThreadedDebugDLL - MultiThreadedDebugDLL - EditAndContinue - EditAndContinue - ProgramDatabase - ProgramDatabase - - - $(GdkDefines);%(PreprocessorDefinitions) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - MultiThreadedDLL - ProgramDatabase - ProgramDatabase - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - $(TargetDir)$(ProjectName).0.lib - /EXPORT:gdk_win32_display_manager_get_type - - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(GdkAdditionalLibs);%(AdditionalDependencies) - - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - - - true - true - true - true - - MachineX86 - MachineX64 - - - - - -if not exist $(OutDir)\..\..\..\Debug\$(Platform)\bin\ mkdir $(OutDir)\..\..\..\Debug\$(Platform)\bin -copy /b "$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" "$(OutDir)\..\..\..\Debug\$(Platform)\bin" -copy /b "$(TargetDir)$(ProjectName).0.lib" "$(OutDir)\..\..\..\Debug\$(Platform)\bin" - -if not exist $(OutDir)\..\..\..\Release\$(Platform)\bin\ mkdir $(OutDir)\..\..\..\Release\$(Platform)\bin -copy /b "$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" "$(OutDir)\..\..\..\Release\$(Platform)\bin" -copy /b "$(TargetDir)$(ProjectName).0.lib" "$(OutDir)\..\..\..\Release\$(Platform)\bin" - - - - - - -#include "gdk-3.vs10.sourcefiles" - - - - - - - - {1df4c475-4472-4ee4-ac2b-3ab5a4c1a453} - false - false - false - - - {aba7685a-7cbb-4626-b5e5-6eeea5b489ef} - false - - - - - - diff --git a/win32/vs10/gdk3-broadway.vcxproj.filtersin b/win32/vs10/gdk3-broadway.vcxproj.filtersin deleted file mode 100644 index 539d51140b..0000000000 --- a/win32/vs10/gdk3-broadway.vcxproj.filtersin +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - -#include "gdk3-broadway.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/gdk3-broadway.vcxprojin b/win32/vs10/gdk3-broadway.vcxprojin deleted file mode 100644 index 123d6d70e8..0000000000 --- a/win32/vs10/gdk3-broadway.vcxprojin +++ /dev/null @@ -1,74 +0,0 @@ -ďťż - - - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - - - - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453} - gdkbroadway - Win32Proj - - - - StaticLibrary - MultiByte - true - v100 - - - - - - - - - - - - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - ProgramDatabase - - - -#include "gdk3-broadway.vs10.sourcefiles" - - - - {b98fbe68-b03c-48e3-8f32-c3c010720d30} - false - - - - - - diff --git a/win32/vs10/gdk3-win32.vcxproj.filtersin b/win32/vs10/gdk3-win32.vcxproj.filtersin deleted file mode 100644 index f81bd0585d..0000000000 --- a/win32/vs10/gdk3-win32.vcxproj.filtersin +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - -#include "gdk3-win32.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/gdk3-win32.vcxprojin b/win32/vs10/gdk3-win32.vcxprojin deleted file mode 100644 index f49e8de447..0000000000 --- a/win32/vs10/gdk3-win32.vcxprojin +++ /dev/null @@ -1,74 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF} - gdkwin32 - Win32Proj - - - - StaticLibrary - MultiByte - true - v100 - - - - - - - - - - - - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - ProgramDatabase - - - -#include "gdk3-win32.vs10.sourcefiles" - - - - {b98fbe68-b03c-48e3-8f32-c3c010720d30} - false - - - - - - diff --git a/win32/vs10/gtk+.sln b/win32/vs10/gtk+.sln deleted file mode 100644 index 7fadabdc7c..0000000000 --- a/win32/vs10/gtk+.sln +++ /dev/null @@ -1,309 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-prebuild", "gtk3-prebuild.vcxproj", "{B98FBE68-B03C-48E3-8F32-C3C010720D30}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-win32", "gdk3-win32.vcxproj", "{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-broadway", "gdk3-broadway.vcxproj", "{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxproj", "{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-3", "gdk-3.vcxproj", "{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-3", "gtk-3.vcxproj", "{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcxproj", "{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-icon-browser.vcxproj", "{343333C4-D46C-4C97-A986-959CCA6F1DE0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-widget-factory", "gtk3-widget-factory.vcxproj", "{BE6B4973-C6FF-4C8F-8E97-A70793C50F44}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{F280BF1A-777A-4FB5-8005-DFBE04621EDB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcxproj", "{A1FCED61-4E51-4015-A70C-5373404D1BA0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcxproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcxproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcxproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcxproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug_Broadway|Win32 = Debug_Broadway|Win32 - Debug|x64 = Debug|x64 - Debug_Broadway|x64 = Debug_Broadway|x64 - Release|Win32 = Release|Win32 - Release_Broadway|Win32 = Release_Broadway|Win32 - Release|x64 = Release|x64 - Release_Broadway|x64 = Release_Broadway|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.ActiveCfg = Debug|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.Build.0 = Debug|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.ActiveCfg = Debug|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.Build.0 = Debug|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.ActiveCfg = Release|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.Build.0 = Release|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.ActiveCfg = Release|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.Build.0 = Release|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.Build.0 = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.ActiveCfg = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.Build.0 = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.ActiveCfg = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.Build.0 = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.ActiveCfg = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.Build.0 = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.Build.0 = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.Build.0 = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.ActiveCfg = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.Build.0 = Release|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug|x64.ActiveCfg = Debug_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release|Win32.ActiveCfg = Release_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release|x64.ActiveCfg = Release_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug|x64.ActiveCfg = Debug_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release|Win32.ActiveCfg = Release_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release|x64.ActiveCfg = Release_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.Build.0 = Debug|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.ActiveCfg = Debug|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.Build.0 = Debug|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.ActiveCfg = Release|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.Build.0 = Release|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.ActiveCfg = Release|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.Build.0 = Release|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.Build.0 = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.ActiveCfg = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.Build.0 = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.ActiveCfg = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.Build.0 = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.ActiveCfg = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.Build.0 = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.Build.0 = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.ActiveCfg = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.Build.0 = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.ActiveCfg = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.Build.0 = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.ActiveCfg = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.Build.0 = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.Build.0 = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|Win32.Build.0 = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|x64.ActiveCfg = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|x64.Build.0 = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|Win32.ActiveCfg = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|Win32.Build.0 = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|x64.ActiveCfg = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|x64.Build.0 = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|x64.Build.0 = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|Win32.Build.0 = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|x64.ActiveCfg = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|x64.Build.0 = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.ActiveCfg = Debug|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.Build.0 = Debug|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.ActiveCfg = Debug|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.Build.0 = Debug|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.ActiveCfg = Release|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.Build.0 = Release|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.ActiveCfg = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.Build.0 = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.Build.0 = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.ActiveCfg = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.Build.0 = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.ActiveCfg = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.Build.0 = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.ActiveCfg = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.Build.0 = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.ActiveCfg = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.Build.0 = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.Build.0 = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.Build.0 = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.ActiveCfg = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.Build.0 = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.ActiveCfg = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.Build.0 = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.ActiveCfg = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.Build.0 = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.ActiveCfg = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.Build.0 = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.ActiveCfg = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.Build.0 = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.Build.0 = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.Build.0 = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs10/gtk-3.vcxproj.filtersin b/win32/vs10/gtk-3.vcxproj.filtersin deleted file mode 100644 index e198ed17d6..0000000000 --- a/win32/vs10/gtk-3.vcxproj.filtersin +++ /dev/null @@ -1,41 +0,0 @@ -ďťż - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - Resource Files - - -#include "gtk-3.vs10.sourcefiles.filters" - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - - - Resource Files - - diff --git a/win32/vs10/gtk-3.vcxprojin b/win32/vs10/gtk-3.vcxprojin deleted file mode 100644 index c9922105cb..0000000000 --- a/win32/vs10/gtk-3.vcxprojin +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - true - - - Release - x64 - true - - - - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - gtk3 - Win32Proj - - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - true - false - - - - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - $(GtkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - ProgramDatabase - - - $(GtkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - - - true - true - - MachineX86 - MachineX64 - - - - - - -#include "gtk-3.vs10.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - - - - diff --git a/win32/vs10/gtk-builder-tool.vcxproj b/win32/vs10/gtk-builder-tool.vcxproj deleted file mode 100644 index 12420c3377..0000000000 --- a/win32/vs10/gtk-builder-tool.vcxproj +++ /dev/null @@ -1,100 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} - gtkbuildertool - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - X64 - - - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - - - true - true - - MachineX86 - MachineX64 - - - - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gtk-builder-tool.vcxproj.filters b/win32/vs10/gtk-builder-tool.vcxproj.filters deleted file mode 100644 index e88646b264..0000000000 --- a/win32/vs10/gtk-builder-tool.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/win32/vs10/gtk-encode-symbolic-svg.vcxproj deleted file mode 100644 index fcd0a6df75..0000000000 --- a/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ /dev/null @@ -1,96 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F280BF1A-777A-4FB5-8005-DFBE04621EDB} - gtkencodesymbolicsvg - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - X64 - - - $(GdkBaseIncludes);%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - - - true - true - - MachineX86 - MachineX64 - - - - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - - - - diff --git a/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters b/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters deleted file mode 100644 index 3377263529..0000000000 --- a/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/win32/vs10/gtk-query-settings.vcxproj b/win32/vs10/gtk-query-settings.vcxproj deleted file mode 100644 index 610b04815f..0000000000 --- a/win32/vs10/gtk-query-settings.vcxproj +++ /dev/null @@ -1,100 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {9F22107A-3EF7-4B52-B269-747B65307F36} - gtkquerysettings - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - X64 - - - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - - - true - true - - MachineX86 - MachineX64 - - - - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gtk-query-settings.vcxproj.filters b/win32/vs10/gtk-query-settings.vcxproj.filters deleted file mode 100644 index 6e14aacf20..0000000000 --- a/win32/vs10/gtk-query-settings.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/win32/vs10/gtk-update-icon-cache.vcxproj b/win32/vs10/gtk-update-icon-cache.vcxproj deleted file mode 100644 index f6ea9eb54f..0000000000 --- a/win32/vs10/gtk-update-icon-cache.vcxproj +++ /dev/null @@ -1,96 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FC98AF16-4C68-42DF-906B-93A6804C198A} - gtkupdateiconcache - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - X64 - - - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - - - true - true - - MachineX86 - MachineX64 - - - - - - - - {b98fbe68-b03c-48e3-8f32-c3c010720d30} - false - - - - - - diff --git a/win32/vs10/gtk-update-icon-cache.vcxproj.filters b/win32/vs10/gtk-update-icon-cache.vcxproj.filters deleted file mode 100644 index f62b142f16..0000000000 --- a/win32/vs10/gtk-update-icon-cache.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/win32/vs10/gtk3-demo-application.vcxproj b/win32/vs10/gtk3-demo-application.vcxproj deleted file mode 100644 index 4e7a81e778..0000000000 --- a/win32/vs10/gtk3-demo-application.vcxproj +++ /dev/null @@ -1,97 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44} - gtk3demoapplication - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - %(PreprocessorDefinitions) - MultiThreadedDLL - false - ProgramDatabase - - - true - Console - - - true - true - - MachineX86 - MachineX64 - - - - - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gtk3-demo-application.vcxproj.filters b/win32/vs10/gtk3-demo-application.vcxproj.filters deleted file mode 100644 index 86f3c356c3..0000000000 --- a/win32/vs10/gtk3-demo-application.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Source Files - - diff --git a/win32/vs10/gtk3-demo.vcxproj.filtersin b/win32/vs10/gtk3-demo.vcxproj.filtersin deleted file mode 100644 index a8fa97ddc6..0000000000 --- a/win32/vs10/gtk3-demo.vcxproj.filtersin +++ /dev/null @@ -1,16 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - -#include "gtk3-demo.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin deleted file mode 100644 index 72abf9bb6c..0000000000 --- a/win32/vs10/gtk3-demo.vcxprojin +++ /dev/null @@ -1,98 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE} - gtk3demo - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - $(Gtk3DemoIncludes);%(AdditionalIncludeDirectories) - - Level3 - CompileAsC - - - Disabled - _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - $(GtkPrefixDefine);%(PreprocessorDefinitions) - MultiThreadedDLL - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - - - - false - true - true - - MachineX86 - MachineX64 - - - -#include "gtk3-demo.vs10.sourcefiles" - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gtk3-icon-browser.vcxproj b/win32/vs10/gtk3-icon-browser.vcxproj deleted file mode 100644 index 69eba5d6c7..0000000000 --- a/win32/vs10/gtk3-icon-browser.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {343333C4-D46C-4C97-A986-959CCA6F1DE0} - gtk3iconbrowser - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - X64 - - - ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - %(PreprocessorDefinitions) - MultiThreadedDLL - false - ProgramDatabase - - - true - Console - - - true - true - - MachineX86 - MachineX64 - - - - - - - - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gtk3-icon-browser.vcxproj.filters b/win32/vs10/gtk3-icon-browser.vcxproj.filters deleted file mode 100644 index a883ba47b2..0000000000 --- a/win32/vs10/gtk3-icon-browser.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Source Files - Source Files - Source Files - Source Files - - diff --git a/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj deleted file mode 100644 index c2b2725879..0000000000 --- a/win32/vs10/gtk3-install.vcxproj +++ /dev/null @@ -1,115 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - - - - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF} - gtkinstall - Win32Proj - - - - Makefile - MultiByte - v100 - - - - - - - - - - - $(InstallBuildsBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) - $(InstallBuildsBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) - $(InstallBuildsBase) CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) - $(InstallBuildsBase) CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {bdae6de2-6bcc-4107-94f0-da12214a02de} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - {a1fced61-4e51-4015-a70c-5373404d1ba0} - false - - - {be6b4973-c6ff-4c8f-8e97-a47793c50f44} - false - - - {343333c4-d46c-4c97-a986-959cca6f1de0} - false - - - {be6b4973-c6ff-4c8f-8e97-a70793c50f44} - false - - - {e9687d21-e214-4a0c-9eb4-8b38ebb783e5} - false - - - {f280bf1a-777a-4fb5-8005-dfbe04621edb} - false - - - {fc98af16-4c68-42df-906b-93a6804c198a} - false - - - {7d2397cf-4c25-45bc-a1bb-cb4b6e154bbd} - false - - - {9f22107a-3ef7-4b52-b269-747b65307f36} - false - - - - - - diff --git a/win32/vs10/gtk3-introspect.vcxproj b/win32/vs10/gtk3-introspect.vcxproj deleted file mode 100644 index 1a4409aa16..0000000000 --- a/win32/vs10/gtk3-introspect.vcxproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {A8092C4E-0A21-4B1D-AC82-16764E418D1F} - gtk3introspect - - - - Makefile - MultiByte - v100 - - - - - - - - - - - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean - $(GtkIntrospectBuiltFiles) - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gtk3-prebuild.vcxproj b/win32/vs10/gtk3-prebuild.vcxproj deleted file mode 100644 index a0b5829ae8..0000000000 --- a/win32/vs10/gtk3-prebuild.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - - - - {B98FBE68-B03C-48E3-8F32-C3C010720D30} - gtkprebuild - Win32Proj - - - - Makefile - MultiByte - v100 - - - - - - - - - - - - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) generate-base-sources - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean generate-base-sources - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean - - - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) generate-base-sources - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean generate-base-sources - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean - - - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean - - - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean - - - - - - - diff --git a/win32/vs10/gtk3-widget-factory.vcxproj b/win32/vs10/gtk3-widget-factory.vcxproj deleted file mode 100644 index 00d3d0bbbc..0000000000 --- a/win32/vs10/gtk3-widget-factory.vcxproj +++ /dev/null @@ -1,98 +0,0 @@ -ďťż - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44} - gtk3widgetfactory - Win32Proj - - - - Application - MultiByte - true - v100 - - - - - - - - - - - true - false - - - - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - - Level3 - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - EditAndContinue - ProgramDatabase - - - MaxSpeed - true - %(PreprocessorDefinitions) - MultiThreadedDLL - false - ProgramDatabase - - - true - Console - atk-1.0.lib;%(AdditionalDependencies) - - - true - true - - MachineX86 - MachineX64 - - - - - - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - diff --git a/win32/vs10/gtk3-widget-factory.vcxproj.filters b/win32/vs10/gtk3-widget-factory.vcxproj.filters deleted file mode 100644 index dd38d00b49..0000000000 --- a/win32/vs10/gtk3-widget-factory.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ -ďťż - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Source Files - - diff --git a/win32/vs11/.gitignore b/win32/vs11/.gitignore deleted file mode 100644 index 2087de933d..0000000000 --- a/win32/vs11/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.sln -*.vcxproj -*.vcxproj.filters diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am deleted file mode 100644 index 064aa41179..0000000000 --- a/win32/vs11/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcxproj \ - gdk3-win32.vcxproj \ - gdk3-win32.vcxproj.filters \ - gdk-3.vcxproj \ - gdk-3.vcxproj.filters \ - gtk-3.vcxproj \ - gtk-3.vcxproj.filters \ - gtk-builder-tool.vcxproj \ - gtk-builder-tool.vcxproj.filters \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk-update-icon-cache.vcxproj \ - gtk-update-icon-cache.vcxproj.filters \ - gtk-query-settings.vcxproj \ - gtk-query-settings.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ - gtk3-widget-factory.vcxproj \ - gtk3-widget-factory.vcxproj.filters \ - gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-install.vcxproj \ - gtk3-introspect.vcxproj \ - broadwayd.vcxproj \ - broadwayd.vcxproj.filters \ - gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 11 -MSVC_FORMAT_VER = 12 -MSVC_VER_LONG = 2012 - -include $(top_srcdir)/win32/Makefile-newvs.am - --include $(top_srcdir)/git.mk diff --git a/win32/vs12/.gitignore b/win32/vs12/.gitignore deleted file mode 100644 index 2087de933d..0000000000 --- a/win32/vs12/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.sln -*.vcxproj -*.vcxproj.filters diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am deleted file mode 100644 index 89221cf1a1..0000000000 --- a/win32/vs12/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcxproj \ - gdk3-win32.vcxproj \ - gdk3-win32.vcxproj.filters \ - gdk-3.vcxproj \ - gdk-3.vcxproj.filters \ - gtk-3.vcxproj \ - gtk-3.vcxproj.filters \ - gtk-builder-tool.vcxproj \ - gtk-builder-tool.vcxproj.filters \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk-query-settings.vcxproj \ - gtk-query-settings.vcxproj.filters \ - gtk-update-icon-cache.vcxproj \ - gtk-update-icon-cache.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ - gtk3-widget-factory.vcxproj \ - gtk3-widget-factory.vcxproj.filters \ - gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-install.vcxproj \ - gtk3-introspect.vcxproj \ - broadwayd.vcxproj \ - broadwayd.vcxproj.filters \ - gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 12 -MSVC_FORMAT_VER = 12 -MSVC_VER_LONG = 2013 - -include $(top_srcdir)/win32/Makefile-newvs.am - --include $(top_srcdir)/git.mk diff --git a/win32/vs14/.gitignore b/win32/vs14/.gitignore deleted file mode 100644 index 2087de933d..0000000000 --- a/win32/vs14/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.sln -*.vcxproj -*.vcxproj.filters diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am deleted file mode 100644 index a4d8b1c3a6..0000000000 --- a/win32/vs14/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcxproj \ - gdk3-win32.vcxproj \ - gdk3-win32.vcxproj.filters \ - gdk-3.vcxproj \ - gdk-3.vcxproj.filters \ - gtk-3.vcxproj \ - gtk-3.vcxproj.filters \ - gtk-builder-tool.vcxproj \ - gtk-builder-tool.vcxproj.filters \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk-query-settings.vcxproj \ - gtk-query-settings.vcxproj.filters \ - gtk-update-icon-cache.vcxproj \ - gtk-update-icon-cache.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ - gtk3-widget-factory.vcxproj \ - gtk3-widget-factory.vcxproj.filters \ - gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-install.vcxproj \ - gtk3-introspect.vcxproj \ - broadwayd.vcxproj \ - broadwayd.vcxproj.filters \ - gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 14 -MSVC_FORMAT_VER = 12 -MSVC_VER_LONG = 14 - -include $(top_srcdir)/win32/Makefile-newvs.am - --include $(top_srcdir)/git.mk diff --git a/win32/vs15/.gitignore b/win32/vs15/.gitignore deleted file mode 100644 index 2087de933d..0000000000 --- a/win32/vs15/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.sln -*.vcxproj -*.vcxproj.filters diff --git a/win32/vs15/Directory.Build.props b/win32/vs15/Directory.Build.props deleted file mode 100644 index 70e8617358..0000000000 --- a/win32/vs15/Directory.Build.props +++ /dev/null @@ -1,5 +0,0 @@ - - - 10.0.19041.0 - - diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am deleted file mode 100644 index 93fd1fbbb1..0000000000 --- a/win32/vs15/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -EXTRA_DIST_COPIED = \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcxproj \ - gdk3-win32.vcxproj \ - gdk3-win32.vcxproj.filters \ - gdk-3.vcxproj \ - gdk-3.vcxproj.filters \ - gtk-3.vcxproj \ - gtk-3.vcxproj.filters \ - gtk-builder-tool.vcxproj \ - gtk-builder-tool.vcxproj.filters \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk-query-settings.vcxproj \ - gtk-query-settings.vcxproj.filters \ - gtk-update-icon-cache.vcxproj \ - gtk-update-icon-cache.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ - gtk3-widget-factory.vcxproj \ - gtk3-widget-factory.vcxproj.filters \ - gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-install.vcxproj \ - gtk3-introspect.vcxproj \ - broadwayd.vcxproj \ - broadwayd.vcxproj.filters \ - gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters - -DISTCLEANFILES = $(EXTRA_DIST_COPIED) -EXTRA_DIST += $(EXTRA_DIST_COPIED) Directory.Build.props - -MSVC_VER = 15 -MSVC_VER_LONG = 15 -MSVC_TOOLSET = 141 -MSVC_FORMAT_VER = 12 - -include $(top_srcdir)/win32/Makefile-newvs.am - -Directory.Build.props: - @true - --include $(top_srcdir)/git.mk diff --git a/win32/vs16/.gitignore b/win32/vs16/.gitignore deleted file mode 100644 index 2087de933d..0000000000 --- a/win32/vs16/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.sln -*.vcxproj -*.vcxproj.filters diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am deleted file mode 100644 index 9ddd5f0773..0000000000 --- a/win32/vs16/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcxproj \ - gdk3-win32.vcxproj \ - gdk3-win32.vcxproj.filters \ - gdk-3.vcxproj \ - gdk-3.vcxproj.filters \ - gtk-3.vcxproj \ - gtk-3.vcxproj.filters \ - gtk-builder-tool.vcxproj \ - gtk-builder-tool.vcxproj.filters \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk-query-settings.vcxproj \ - gtk-query-settings.vcxproj.filters \ - gtk-update-icon-cache.vcxproj \ - gtk-update-icon-cache.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ - gtk3-widget-factory.vcxproj \ - gtk3-widget-factory.vcxproj.filters \ - gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-install.vcxproj \ - gtk3-introspect.vcxproj \ - broadwayd.vcxproj \ - broadwayd.vcxproj.filters \ - gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 16 -MSVC_VER_LONG = 16 -MSVC_TOOLSET = 142 -MSVC_FORMAT_VER = 12 - -include $(top_srcdir)/win32/Makefile-newvs.am - --include $(top_srcdir)/git.mk diff --git a/win32/vs17/.gitignore b/win32/vs17/.gitignore deleted file mode 100644 index 2087de933d..0000000000 --- a/win32/vs17/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.sln -*.vcxproj -*.vcxproj.filters diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am deleted file mode 100644 index 98118ea995..0000000000 --- a/win32/vs17/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcxproj \ - gdk3-win32.vcxproj \ - gdk3-win32.vcxproj.filters \ - gdk-3.vcxproj \ - gdk-3.vcxproj.filters \ - gtk-3.vcxproj \ - gtk-3.vcxproj.filters \ - gtk-builder-tool.vcxproj \ - gtk-builder-tool.vcxproj.filters \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk-query-settings.vcxproj \ - gtk-query-settings.vcxproj.filters \ - gtk-update-icon-cache.vcxproj \ - gtk-update-icon-cache.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ - gtk3-widget-factory.vcxproj \ - gtk3-widget-factory.vcxproj.filters \ - gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-install.vcxproj \ - gtk3-introspect.vcxproj \ - broadwayd.vcxproj \ - broadwayd.vcxproj.filters \ - gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_VER = 17 -MSVC_VER_LONG = 17 -MSVC_TOOLSET = 143 -MSVC_FORMAT_VER = 12 - -include $(top_srcdir)/win32/Makefile-newvs.am - --include $(top_srcdir)/git.mk diff --git a/win32/vs1x-props/.gitignore b/win32/vs1x-props/.gitignore deleted file mode 100644 index 3978362c27..0000000000 --- a/win32/vs1x-props/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gtk3-version-paths.props diff --git a/win32/vs1x-props/Makefile.am b/win32/vs1x-props/Makefile.am deleted file mode 100644 index 7f3bbf6c9e..0000000000 --- a/win32/vs1x-props/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -GENERATED_ITEMS = gtk3-version-paths.props - -EXTRA_DIST += \ - gtk3-build-defines.props \ - gtk3-version-paths.props.in \ - $(GENERATED_ITEMS) - -DISTCLEANFILES = \ - $(GENERATED_ITEMS) - --include $(top_srcdir)/git.mk diff --git a/win32/vs1x-props/gtk3-build-defines.props b/win32/vs1x-props/gtk3-build-defines.props deleted file mode 100644 index 2304a7e736..0000000000 --- a/win32/vs1x-props/gtk3-build-defines.props +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - 3.0.0 - /dummy - GTK_PREFIX=\"$(GtkDummyPrefix)\" - GDK_COMPILATION;G_LOG_DOMAIN="Gdk" - .\$(Configuration)\$(Platform)\obj\gdk-3 - .\Release\$(Platform)\obj\gdk-3 - .\Debug\$(Platform)\obj\gdk-3 - .\$(Configuration)\$(Platform)\obj\gtk-3 - $(GtkGenSrcDir);$(GdkGenSrcDir);..\.. - $(GdkGenSrcDir)\gdk;..\..\gdk;$(BaseConfigIncludes) - $(GtkGenSrcDir)\gtk;..\..\gtk;$(GdkBaseIncludes) - .\$(Configuration)\$(Platform)\obj\gtk3-demo;..\..\gtk;$(GtkBaseIncludes) - INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr - i686 - x86_64 - aarch64 - GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="$(GtkHostMachine)-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED;__MSVC_PROJECTS__ - ole32.lib;advapi32.lib;shell32.lib;gdi32.lib - pangowin32-1.0.lib;fribidi.lib;imm32.lib;$(CommonARM64SystemLibs) - winmm.lib;dwmapi.lib;setupapi.lib;hid.lib;$(GtkGdkCommonLibs) - ws2_32.lib - atk-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs) - cd .. -set VCInstallDir=$(VCInstallDir) -nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot) - $(BinDir)\Gtk-3.0.gir;$(BinDir)\Gtk-3.0.typelib - cd .. -set VCInstallDir=$(VCInstallDir) -nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot) - cd .. -set VCInstallDir=$(VCInstallDir) -nmake -f install-msvc.mak PREFIX=$(GlibEtcInstallRoot) - - - <_PropertySheetDisplayName>gtk3builddefinesprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - $(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\harfbuzz;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;G_ENABLE_DEBUG;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - true - /d2Zi+ %(AdditionalOptions) - - - pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;epoxy.lib;%(AdditionalDependencies) - $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - - - - - $(CommonARM64SystemLibs) - - - $(GtkBinaryVersion) - - - $(GtkDummyPrefix) - - - $(GtkPrefixDefine) - - - $(GdkDefines) - - - $(GdkGdkGenSrcDir) - - - $(GtkGdkGenSrcDir) - - - $(BaseConfigIncludes) - - - $(GdkBaseIncludes) - - - $(GtkBaseIncludes) - - - $(Gtk3DemoIncludes) - - - $(GtkIncludedImmodulesDefines) - - - $(GtkHostMachine) - - - $(GtkDefines) - - - $(GtkGdkCommonLibs) - - - $(GdkAdditionalLibs) - - - $(GdkBroadwayAdditionalLibs) - - - $(GtkAdditionalLibs) - - - $(GtkIntrospectNMakeCmd) - - - $(GtkIntrospectBuiltFiles) - - - $(GenerateRequiredSourcesBase) - - - $(InstallBuildsBase) - - - diff --git a/win32/vs1x-props/gtk3-version-paths.props.in b/win32/vs1x-props/gtk3-version-paths.props.in deleted file mode 100644 index 4ae0cc85e4..0000000000 --- a/win32/vs1x-props/gtk3-version-paths.props.in +++ /dev/null @@ -1,70 +0,0 @@ -ďťż - - - 10 - 10 - 11 - 12 - 14 - 15 - 16 - 17 - $(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform) - ..\..\..\vs$(VSVer)\$(Platform) - 3.0 - @GTK_VERSION@ - lib - .0-0 - - -vs$(VSVer) - $(GtkSeparateVSDllPrefix) - $(GtkSeparateVSDllSuffix) - c:\python37 - c:\python37.x64 - PYTHON=$(PythonDir)\python.exe - - - <_PropertySheetDisplayName>gtk3versionpathsprops - - - - $(VSVer) - - - $(GlibEtcInstallRoot) - - - $(CopyDir) - - - $(ApiVersion) - - - $(GtkVersion) - - - $(GtkLibtoolCompatibleDllPrefix) - - - $(GtkLibtoolCompatibleDllSuffix) - - - $(GtkSeparateVSDllPrefix) - - - $(GtkSeparateVSDllSuffix) - - - $(GtkDllPrefix) - - - $(GtkDllSuffix) - - - $(PythonDir) - - - $(IntrospectPythonParam) - - - diff --git a/win32/vs9/.gitignore b/win32/vs9/.gitignore deleted file mode 100644 index 904cdc3ac4..0000000000 --- a/win32/vs9/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -broadwayd.vcproj -gailutil-3.vcproj -gdk-3.vcproj -gdk3-broadway.vcproj -gdk3-win32.vcproj -gtk-3.vcproj -gtk3-demo.vcproj -gtk3-version-paths.vsprops diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am deleted file mode 100644 index 7fafa1f9f9..0000000000 --- a/win32/vs9/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -GENERATED_ITEMS = \ - gdk3-win32.vcproj \ - gdk3-broadway.vcproj \ - broadwayd.vcproj \ - gdk-3.vcproj \ - gtk-3.vcproj \ - gtk3-demo.vcproj \ - gailutil-3.vcproj \ - gtk3-version-paths.vsprops - -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk3-prebuild.vcproj \ - gdk3-win32.vcprojin \ - gdk-3.vcprojin \ - gtk-3.vcprojin \ - gtk-builder-tool.vcproj \ - gtk-encode-symbolic-svg.vcproj \ - gtk-query-settings.vcproj \ - gtk-update-icon-cache.vcproj \ - gtk3-demo.vcprojin \ - gtk3-demo-application.vcproj \ - gtk3-icon-browser.vcproj \ - gtk3-widget-factory.vcproj \ - gailutil-3.vcprojin \ - gtk3-install.vcproj \ - gtk3-introspect.vcproj \ - broadwayd.vcprojin \ - gdk3-broadway.vcprojin \ - gtk3-build-defines.vsprops \ - gtk3-copy-gdk-broadway.vsprops \ - gtk3-ignore-broadway.vsprops \ - gtk3-version-paths.vsprops.in \ - $(GENERATED_ITEMS) - -DISTCLEANFILES = $(GENERATED_ITEMS) - --include $(top_srcdir)/git.mk diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt deleted file mode 100644 index f0b876cc7b..0000000000 --- a/win32/vs9/README.txt +++ /dev/null @@ -1,115 +0,0 @@ -Please do not compile this package (GTK+) in paths that contain -spaces in them-as strange problems may occur during compilation or during -the use of the library. - -A more detailed outline for instructions on building the GTK+ with Visual -C++ can be found in the following GNOME Live! page: - -https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack - -This VS9 solution and the projects it includes are intented to be used -in a GTK+ source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or manual work to expand -the files needed, like config.h.win32.in into config.h.win32 and the -.vcprojin files here into corresponding actual .vcproj files. - -You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango, -ATK and GLib. External dependencies are at least Cairo -(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng, -gettext-runtime, fontconfig*, freetype*, expat*. See the -build/win32/vs9/README.txt file in glib for details where to unpack them. - -You will also need a Python 2.6+/3.x interpretor installed on your system, -which can be obtained from the official installers available from -http://www.python.org. Please note that the Python interpretor (python.exe) -either needs to be in your PATH before attempting the build of GTK+, or it -can be found in the path specified by PythonDir in gtk-version-paths.vsprops. -If you happen to change the PythonDir setting in gtk-version-paths.vsprops after -opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution, -delete all the *.ncb, *.suo and *.user files before re-attempting the build. - -It is recommended that one builds the dependencies with VS9 as far as -possible, especially those from and using the GTK+ stack (i.e. GLib, -Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls -to different CRTs can be kept at a minimum. - -zlib, libpng, and Cairo do contain support for compiling under VS9 -using VS project files and/or makefiles at this time of writing, For the -GTK+ stack, VS9 project files are either available under -$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK -(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next -unstable version of Pango. There is no known official VS9 build -support for fontconfig (along with freetype and expat) and -gettext-runtime, so please use the binaries from: - -ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) -ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) - -Unzip the binaries obtained from ftp.gnome.org in \vs9\, -and build the following, if not already done so: - -Note: put the resulting zlib, libpng, pcre and Cairo files as follows: - .dll files: \vs9\\bin - .lib files: \vs9\\lib - .h files: \vs9\\include - -The recommended build order for these dependencies: -(first unzip any dependent binaries downloaded from the ftp.gnome.org - as described in the README.txt file in the build/win32/vs9 folder) --zlib --libpng --(for GDK-Pixbuf, if not using GDI+) IJG JPEG or libjpeg-turbo --(for GDK-Pixbuf, if not using GDI+) libtiff - [libtiff requires zlib and IJG JPEG or libjpeg-turbo] --(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]) --(optional for GLib) PCRE (version 8.12 or later, use of CMake to - build PCRE is recommended-see build/win32/vs9/README.txt of GLib) --GLib ** --Cairo (inclusive of Cairo-GObject) --ATK** --Pango** --GDK-Pixbuf** -(note the last 3 dependencies are not interdependent, so the last 3 - dependencies can be built in any order) - -The "install" project will copy build results and headers into their -appropriate location under \vs9\. For instance, -built DLLs go into \vs9\\bin, built LIBs into -\vs9\\lib and GTK+ headers into -\vs9\\include\gtk-3.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific GLib source tree. - -There is now a "gtk3-introspect" project that is used to build the -introspection files. In order for this to work, check that the paths for -PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your -system. Note that it must be the same Python installation that was used to -build GObject-Introspection (G-I), and a complete G-I build/installation -needs to be found in \vs9\\, with the introspection files -for ATK, Pango and GDK-Pixbuf. Note also that this is not built by default, -so you will need to right-click on the project to build it, which will build -and "install" the other projects that are normally built, if those were not yet -built. The introspection files that are built will be "installed" to -\vs9\\share\gir-1.0 (the .gir file(s)) and -\vs9\\lib\girepository-1.0 (the .typelib files(s)) upon -successful build. for building this in a different configuration, therefore, -you will need to clean this project specifically and then rebuild. - -Please note, as GTK+ uses the Adwaita theme for all platforms by default, -most icons used are not included with GTK+ (which *are* needed), so please see -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the -GTK+ section) on how to get those icons set up for use with GTK+. - -*About the dependencies marked with *: These dependencies are optional - as those are not compulsory components for building and running GTK+ - itself, but note that they are needed for people running and building - GIMP or those who need complex script support via fontconfig. They - are referred to by components in Cairo and Pango mainly. - Decide whether you need fontconfig support prior to building Cairo - and Pango. - -**:Put the sources of the packages marked with ** in \, and build with VS9 from there. - ---Tor Lillqvist ---Updated by Chun-wei Fan diff --git a/win32/vs9/broadwayd.vcprojin b/win32/vs9/broadwayd.vcprojin deleted file mode 100644 index 3d795b98f1..0000000000 --- a/win32/vs9/broadwayd.vcprojin +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "broadwayd.sourcefiles" - - - - - - - - - diff --git a/win32/vs9/gailutil-3.vcprojin b/win32/vs9/gailutil-3.vcprojin deleted file mode 100644 index f3d0cd7f39..0000000000 --- a/win32/vs9/gailutil-3.vcprojin +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gailutil-3.sourcefiles" - - - - - - - - - diff --git a/win32/vs9/gdk-3.vcprojin b/win32/vs9/gdk-3.vcprojin deleted file mode 100644 index 9ba9da9d43..0000000000 --- a/win32/vs9/gdk-3.vcprojin +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gdk-3.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gdk3-broadway.vcprojin b/win32/vs9/gdk3-broadway.vcprojin deleted file mode 100644 index c251350c1d..0000000000 --- a/win32/vs9/gdk3-broadway.vcprojin +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gdk3-broadway.sourcefiles" - - - diff --git a/win32/vs9/gdk3-win32.vcprojin b/win32/vs9/gdk3-win32.vcprojin deleted file mode 100644 index 23b6ed59c9..0000000000 --- a/win32/vs9/gdk3-win32.vcprojin +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gdk3-win32.sourcefiles" - - - diff --git a/win32/vs9/gtk+.sln b/win32/vs9/gtk+.sln deleted file mode 100644 index 675836f999..0000000000 --- a/win32/vs9/gtk+.sln +++ /dev/null @@ -1,369 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-prebuild", "gtk3-prebuild.vcproj", "{B98FBE68-B03C-48E3-8F32-C3C010720D30}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-win32", "gdk3-win32.vcproj", "{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}" - ProjectSection(ProjectDependencies) = postProject - {B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-broadway", "gdk3-broadway.vcproj", "{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}" - ProjectSection(ProjectDependencies) = postProject - {B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcproj", "{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}" - ProjectSection(ProjectDependencies) = postProject - {B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-3", "gdk-3.vcproj", "{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}" - ProjectSection(ProjectDependencies) = postProject - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF} = {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF} - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453} = {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-3", "gtk-3.vcproj", "{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcproj", "{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcproj", "{F280BF1A-777A-4FB5-8005-DFBE04621EDB}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-icon-browser.vcproj", "{343333C4-D46C-4C97-A986-959CCA6F1DE0}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-widget-factory", "gtk3-widget-factory.vcproj", "{BE6B4973-C6FF-4C8F-8E97-A70793C50F44}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcproj", "{A1FCED61-4E51-4015-A70C-5373404D1BA0}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}" - ProjectSection(ProjectDependencies) = postProject - {B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE} = {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE} - {A1FCED61-4E51-4015-A70C-5373404D1BA0} = {A1FCED61-4E51-4015-A70C-5373404D1BA0} - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44} = {BE6B4973-C6FF-4C8F-8E97-A47793C50F44} - {343333C4-D46C-4C97-A986-959CCA6F1DE0} = {343333C4-D46C-4C97-A986-959CCA6F1DE0} - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5} = {E9687D21-E214-4A0C-9EB4-8B38EBB783E5} - {F280BF1A-777A-4FB5-8005-DFBE04621EDB} = {F280BF1A-777A-4FB5-8005-DFBE04621EDB} - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44} = {BE6B4973-C6FF-4C8F-8E97-A70793C50F44} - {FC98AF16-4C68-42DF-906B-93A6804C198A} = {FC98AF16-4C68-42DF-906B-93A6804C198A} - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} = {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} - {9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}" - ProjectSection(ProjectDependencies) = postProject - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug_Broadway|Win32 = Debug_Broadway|Win32 - Debug|x64 = Debug|x64 - Debug_Broadway|x64 = Debug_Broadway|x64 - Release|Win32 = Release|Win32 - Release_Broadway|Win32 = Release_Broadway|Win32 - Release|x64 = Release|x64 - Release_Broadway|x64 = Release_Broadway|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.ActiveCfg = Debug|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.Build.0 = Debug|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.ActiveCfg = Debug|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.Build.0 = Debug|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.ActiveCfg = Release|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.Build.0 = Release|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.ActiveCfg = Release|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.Build.0 = Release|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.Build.0 = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.ActiveCfg = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.Build.0 = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.ActiveCfg = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.Build.0 = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.ActiveCfg = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.Build.0 = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.Build.0 = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.Build.0 = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.ActiveCfg = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.Build.0 = Release|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.Build.0 = Debug|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.ActiveCfg = Debug|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.Build.0 = Debug|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.ActiveCfg = Release|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.Build.0 = Release|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.ActiveCfg = Release|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.Build.0 = Release|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.Build.0 = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.ActiveCfg = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.Build.0 = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.ActiveCfg = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.Build.0 = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.ActiveCfg = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.Build.0 = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.ActiveCfg = Debug|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.Build.0 = Debug|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.ActiveCfg = Debug|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.Build.0 = Debug|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.ActiveCfg = Release|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.Build.0 = Release|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.ActiveCfg = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.Build.0 = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.Build.0 = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.ActiveCfg = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.Build.0 = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.ActiveCfg = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.Build.0 = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.ActiveCfg = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.Build.0 = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.Build.0 = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|Win32.Build.0 = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|x64.ActiveCfg = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug|x64.Build.0 = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|Win32.ActiveCfg = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|Win32.Build.0 = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|x64.ActiveCfg = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release|x64.Build.0 = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Debug_Broadway|x64.Build.0 = Debug|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|Win32.Build.0 = Release|Win32 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|x64.ActiveCfg = Release|x64 - {A1FCED61-4E51-4015-A70C-5373404D1BA0}.Release_Broadway|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.Build.0 = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.ActiveCfg = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.Build.0 = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.ActiveCfg = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.Build.0 = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.ActiveCfg = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.Build.0 = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.ActiveCfg = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.Build.0 = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.Build.0 = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.Build.0 = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.ActiveCfg = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.Build.0 = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.ActiveCfg = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.Build.0 = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.ActiveCfg = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.Build.0 = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.ActiveCfg = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.Build.0 = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.ActiveCfg = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.Build.0 = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.Build.0 = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.Build.0 = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs9/gtk-3.vcprojin b/win32/vs9/gtk-3.vcprojin deleted file mode 100644 index 7c103e9535..0000000000 --- a/win32/vs9/gtk-3.vcprojin +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gtk-3.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk-builder-tool.vcproj b/win32/vs9/gtk-builder-tool.vcproj deleted file mode 100644 index 77d7ee0a97..0000000000 --- a/win32/vs9/gtk-builder-tool.vcproj +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk-encode-symbolic-svg.vcproj b/win32/vs9/gtk-encode-symbolic-svg.vcproj deleted file mode 100644 index 9d261fb7f8..0000000000 --- a/win32/vs9/gtk-encode-symbolic-svg.vcproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk-query-settings.vcproj b/win32/vs9/gtk-query-settings.vcproj deleted file mode 100644 index 8e92f071e1..0000000000 --- a/win32/vs9/gtk-query-settings.vcproj +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk-update-icon-cache.vcproj b/win32/vs9/gtk-update-icon-cache.vcproj deleted file mode 100644 index f0bcf6d664..0000000000 --- a/win32/vs9/gtk-update-icon-cache.vcproj +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-build-defines.vsprops b/win32/vs9/gtk3-build-defines.vsprops deleted file mode 100644 index fec060411d..0000000000 --- a/win32/vs9/gtk3-build-defines.vsprops +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-copy-gdk-broadway.vsprops b/win32/vs9/gtk3-copy-gdk-broadway.vsprops deleted file mode 100644 index 63dc8c5c9f..0000000000 --- a/win32/vs9/gtk3-copy-gdk-broadway.vsprops +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/win32/vs9/gtk3-demo-application.vcproj b/win32/vs9/gtk3-demo-application.vcproj deleted file mode 100644 index 6661fbc354..0000000000 --- a/win32/vs9/gtk3-demo-application.vcproj +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-demo.vcprojin b/win32/vs9/gtk3-demo.vcprojin deleted file mode 100644 index 57b885f22a..0000000000 --- a/win32/vs9/gtk3-demo.vcprojin +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gtk3-demo.sourcefiles" - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-icon-browser.vcproj b/win32/vs9/gtk3-icon-browser.vcproj deleted file mode 100644 index f134b05071..0000000000 --- a/win32/vs9/gtk3-icon-browser.vcproj +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-ignore-broadway.vsprops b/win32/vs9/gtk3-ignore-broadway.vsprops deleted file mode 100644 index ee3bbb1638..0000000000 --- a/win32/vs9/gtk3-ignore-broadway.vsprops +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/win32/vs9/gtk3-install.vcproj b/win32/vs9/gtk3-install.vcproj deleted file mode 100644 index 764397e502..0000000000 --- a/win32/vs9/gtk3-install.vcproj +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-introspect.vcproj b/win32/vs9/gtk3-introspect.vcproj deleted file mode 100644 index e8e9dc5719..0000000000 --- a/win32/vs9/gtk3-introspect.vcproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-prebuild.vcproj b/win32/vs9/gtk3-prebuild.vcproj deleted file mode 100644 index c211ecea3a..0000000000 --- a/win32/vs9/gtk3-prebuild.vcproj +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-version-paths.vsprops.in b/win32/vs9/gtk3-version-paths.vsprops.in deleted file mode 100644 index 35a4e2eaa6..0000000000 --- a/win32/vs9/gtk3-version-paths.vsprops.in +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gtk3-widget-factory.vcproj b/win32/vs9/gtk3-widget-factory.vcproj deleted file mode 100644 index 7efb335c5a..0000000000 --- a/win32/vs9/gtk3-widget-factory.vcproj +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -