Commit Graph

197 Commits

Author SHA1 Message Date
Chun-wei Fan
ddf1962c98 MSVC 2010 Builds: Fix .pdb Generation
In order to make the .pdb filename match the filename of the target, the
.pdb filename must be specified for Visual Studio builds, if the target
filename does not match the project name.  Update the Clutter main project
accordingly.
2015-03-06 18:44:17 +08:00
Chun-wei Fan
aa62a5cb7f MSVC Builds: Speed Up Release Builds
Use the multipropcessor compilation (/MP) option, which can help cut down
build times for release builds by quite a bit.  A warning will be emitted
for debug builds, due to the use of /Gm, but the build will otherwise
proceed normally.

Also use the /d2Zi+ compiler flag for MSVC 2010 (and later) builds, so that
more useful info would be logged to the .pdb files that are generated
during the build.
2015-03-06 18:37:04 +08:00
Chun-wei Fan
432a38722a MSVC 2010 Builds: Clean Up "Install"
Remove the empty lines from the property sheet that is really not necessary
2015-03-06 18:26:08 +08:00
Chun-wei Fan
133545c0e1 MSVC Builds: Update Clutter Main Project
There is a new source needed to build the GDK backend, so include that in
the project files.
2015-03-06 18:15:08 +08:00
Emmanuele Bassi
96c6c03474 build: Use env instead of TestEnvironment key
We rely on having the DISPLAY environment variable set, otherwise we
default to skipping all tests automatically. The TestEnvironment key
inside the installed test launcher keyfile replaces the whole
environment, instead of just adding to it like the TESTS_ENVIRONMENT
automake variable.
2015-01-02 12:16:57 +00:00
Emmanuele Bassi
7bfd62f755 build: Fix up gitignore generation rules
Use more sources, and allow adding files to the ignore list when
including Makefile.am.gitignore.
2015-01-01 19:39:33 +00:00
Emmanuele Bassi
8e87d0417b build: Fix out-of-tree builds
Add a srcdir prefix to the inspected files for glib-mkenums.
2014-12-16 00:15:58 +00:00
Emmanuele Bassi
317a54f9fb build: Update the release rules
Change the URLs for mailing lists and documentation, and re-align the
output.
2014-09-22 12:01:30 +01:00
Emmanuele Bassi
98b64fec33 Add TestEnvironment key to the installed tests launchers
The TestEnvironment key allows us to control the environment used by the
gnome-desktop-testing-runner harness.

We use it to disable the diagnostic messages without having to tweak the
Exec line.

https://bugzilla.gnome.org/show_bug.cgi?id=734115
2014-08-29 19:37:47 +01:00
Chun-wei Fan
499f2e5831 MSVC 2010+ Projects: Update "Installation" Process
Currently, due to the way that Visual Studio 2010+ projects are handled,
the "install" project does not re-build upon changes to the sources, as it
does not believe that its dependencies have changed, although the changed
sources are automatically recompiled.  This means that if a part or more
of the solution does not build, or if the sources need some other fixes
or enhancements, the up-to-date build is not copied automatically, which
can be misleading.

Improve on the situation by forcing the "install" project to trigger its
rebuild, so that the updated binaries can be copied.  This does trigger an
MSBuild warning, but having that warning is way better than not having an
up-to-date build, especially during testing and development.
2014-06-09 18:57:24 +08:00
Chun-wei Fan
20e619f8a6 Visual Studio Builds: Avoid Implicit Linking to SDL
Cogl, when built with the SDL winsys, will include the SDL headers when
Cogl-based programs are built, which causes the SDL's wrapper for main()
to be used on Windows, causing an implicit requirement that all Cogl-based
apps must link to SDL2.lib and SDL2main.lib.  Avoid this behavior by
defining SDL_MAIN_HANDLED in the CFLAGS of the sample and interactive test
programs
2014-04-17 10:53:24 +08:00
Chun-wei Fan
d42cb2a4d3 MSVC Build: Update Clutter DLL Build Defines
Define DLL_EXPORT when we are building the Clutter DLL, to ensure that
constants are exported properly.

https://bugzilla.gnome.org/show_bug.cgi?id=726762
2014-03-20 22:56:07 +08:00
Chun-wei Fan
783bc64a02 Visual Studio Builds: Don't Generate a .def File
Clutter, like GTK+ and GLib, has recently switched to a visibility-based
method of exporting symbols, so update the Visual Studio build files to
do likewise, by using __declspec (dllexport). This eliminats the need to
use a .def file to export the symbols.  The pre-configured
config.h.win32.in is also updated accordingly for this purpose.  The
clutter.symbols file can be dropped if it is not being used otherwise.
2014-03-20 08:57:06 +08:00
Emmanuele Bassi
ccc5eb9f35 build: Resync our copy of introspection.m4 2014-03-18 19:06:49 +00:00
Chun-wei Fan
da22baa99d Visual Studio 2010 Projects: Add PlatformToolset Tag
This adds a PlatformToolset tag for each configuration so that it is easier
to upgrade the projects to Visual Studio 2012/2013 formats, which are
largely the same as the Visual Studio 2010 projects.  We can, for example,
use a script to change the values of the PlatformToolset to make these
projects usable out-of-the-box for Visual Studio 2012/2013.
2014-03-06 19:51:50 +08:00
Chun-wei Fan
b52397d374 Overhaul the Visual Studio 2010 Build Files
Like the Visual Studio 2008 projects, give the Visual Studio 2010 projects
an overhaul, where:

-The property sheets are split up, so that they are easier to maintain and
 each project only needs to include the necessary parts.  The various
 projects are updated accordingly, too.  The copying of config.h.win32 and
 clutter-config.h.win32(_GDK) are now done with custom build rules, so that
 these files can be cleaned and/or recopied during a clean, rebuild or
 update.

-Clean up the property sheets, to get rid of parts that are actually
 repeated.  Also update the build macros, so that we won't get warnings
 for repeated #defines of macros and fix the build of the various tests/
 demo programs.

-Make all projects use Unix line endings, except for the .sln and
 README.txt files, which need to have Windows line endings.  This makes it
 easier to apply patches to these project files.

-Update the installation of headers, as headers are introduced/deprecated.

-Cosmetics: get rid of "\ No newline at end of file".
2014-03-06 16:30:30 +08:00
Chun-wei Fan
3c344fe5ed Overhaul the Visual Studio 2008 Projects
Split up the property sheets, so that they are easier to maintain, and
clean up the projects and property sheets, especially on items that are
being repeated, and therefore silence many build warnings.  Update the
project files correspondingly, and make all project files use Unix line
endings, for easier application of patches (the .sln and README.txt files
still has to have Windows line endings in order to work properly).

Also make the copying of config.h.win32 and clutter-config.h.win32(_GDK)
custom build rules, so that they may also be cleaned during the cleaning
of the build, which makes it easier for one to do a rebuild.

Similar updates to the Visual Studio 2010 project files will follow.
2014-03-05 18:41:45 +08:00
Chun-wei Fan
74c01cdd0f Visual C++ Projects: Don't build conformance tests
...and drop these project files, as the way how the conformance
tests are built has been totally reworked.  Instead, in the future,
use NMake Makefiles to build them, which will be proposed later.
2013-12-16 09:27:41 +08:00
Emmanuele Bassi
2a660fa298 Fully rework the conformance test suite
The current conformance test suite is suboptimal in many ways.

All tests are built into the same binary, which makes adding new tests,
builting tests, and running groups of tests much more awkward than it
needs to be. The first issue, especially, raises the bar of contribution
in a significant way, while the other two take their toll on the
maintainer. All of these changes were introduced back when we had both
Clutter and Cogl tests in tree, and because we were building the test
suite for every single change; since then, Cogl moved out of tree with
all its tests, and we build the conformance test suite only when running
the `check` make target.

This admittedly large-ish commit changes the way the conformance test
suite works, taking advantage of the changes in the GTest API and test
harness.

First of all, all tests are now built separately, using their own test
suite as defined by each separate file. All tests run under the TAP
harness provided by GTest and Automake, to gather a proper report using
the Test Anything Protocol without using the `gtester` harness and the
`gtester-report` script. We also use the Makefile rules provided by GLib
to vastly simplify the build environment for the conformance test suite.

On top of the changes for the build and harness, we also provide new API
for creating and running test suites for Clutter. The API is public,
because the test suite has to use it, but it's minimal and mostly
provides convenience wrappers around GTest that make writing test units
for Clutter easier.

This commit disables all tests in the conformance test suite, as well as
moving the data files outside of the tests/data directory; the next few
commits will re-establish the conformance test suite separately so we
can check that everything works in a reliable way.
2013-12-12 18:51:11 +00:00
Chun-wei Fan
142c1bbee7 MSVC Builds: Silence Cogl Deprecation Warnings
Cogl-1.16 has much deprecation that is done, which causes the build of
Clutter to generate lots of C4996 (deprecation) warnings.  As in commit
fa8809d7 (Add COGL_DISABLE_DEPRECATION_WARNINGS to the build flags), do
likewise by adding this macro in the Visual C++ property sheets, so we
would have much less C4996 warnings during the build.

Please see bug 703877 for the rationale behind this.
2013-09-10 16:18:15 +08:00
Chun-wei Fan
daaec724dc Clean up Visual Studio Build Files
-Combine entries in the property sheets and make it a bit more flexible,
 and drop some redundant items
-Use Custom Build Rules for generating enumeration and marshalling sources,
 and the .def file so that they can be wiped off when a "clean" is
 requested, and regenerate automatically when the templates/.symbols
 files are updated.
-Improve consistency by using ApiVersion rather than ClutterApiVersion
 with the Visual Studio project for other components of the Clutter/GTK+
 stack
-Get rid of unneeded configs in the "install" project
2013-08-29 17:31:42 +08:00
Chun-wei Fan
cb3a4ac1a2 Visual C++ Builds: Update Header "Installation" 2013-08-29 10:50:08 +08:00
Chun-wei Fan
558f142818 Update Conformance Tests MSVC Project
Use CLUTTER_ENABLE_EXPERIMENTAL_API as there are experimental APIs that
are used and tested here, which will fix the build
2013-07-26 09:32:31 +08:00
Neil Roberts
3715a6687c Update the dependencies for the MinGW build script
As the binaries from Tor Lillqvist are no longer being kept up-to-date
this also builds more of the deps from source.

https://bugzilla.gnome.org/show_bug.cgi?id=701356
2013-07-12 17:59:54 +01:00
Emmanuele Bassi
c9583792cb build: Fix up the silent rules prefixes
Automake increased the whitespace, so we need to do that for our "I
Can't Believe It's Not Autotool™" rules.
2013-05-15 15:07:15 +01:00
Chun-wei Fan
bb8ef4e5c0 test-interactive-clutter.vc(x)projin: Fix includes
We need to include the gdk-pixbuf headers as well...
2012-12-28 15:54:33 +08:00
Chun-wei Fan
26380730bf Fix Clutter Visual C++ projects
Fix the *_GDK configs as GDK headers will include GDK-Pixbuf headers as
well.
2012-12-28 15:46:51 +08:00
Chun-wei Fan
183e7b6176 Visual C++ projects: Use MultiByte character set
Use MultiByte character set for all projects and configs, to avoid any
inconsistencies that may arise.
2012-12-17 11:25:10 +08:00
Chun-wei Fan
6f55746c83 Update Clutter MSVC projects
We now link to gdk-3.0.lib, not gdk-win32-3.0.lib, so that we are more
consistent to the autotools builds.
2012-12-14 19:49:00 +08:00
Chun-wei Fan
3b3db5084a Fix Visual C++ 2010 property sheets
Fix up the paths where glib-mkenums and glib-genmarshal is called.  Somehow
this slipped by earlier checks :|
2012-12-14 19:42:09 +08:00
Chun-wei Fan
a87fd7aae4 Update Visual C++ projects
-Make things a bit cleaner by generating clutter.def in the intermediate
 build folder
-Fix the include paths as config.h is now in clutter/
-Make things a little bit more consistent between vs9 and vs10 in terms of
 the "install" stage
2012-09-28 18:59:27 +08:00
Chun-wei Fan
8f9b9713f2 Visual C++: Don't disable warning C4819
The C4819 warnings appear due to a bug on Visual C++ when running on
non-English locales, specifically CJK versions/locales of Windows.

Re-enable this, like what is done in GLib, and add a note in the
Visual C++ README.txt's to tell people about this, so that Cogl will be
built correctly.
2012-08-21 15:26:48 +08:00
Emmanuele Bassi
9f83b64182 build: Move config.h under clutter/
We should not have header files in the project root.
2012-07-30 10:54:18 +01:00
Chun-wei Fan
e659a90b28 Visual C++ support: Fix "install" process
Apparently the update to build the GDK backend broke the "installation"
process of the binaries.  Fix that by grouping the binaries as Release or
Debug.
2012-07-03 17:10:28 +08:00
Chun-wei Fan
78a7c5b8cf Update Visual C++ property sheets
Remove some unneeded defines in the compilation-CLUTTER_PREFIX and
CLUTTER_DATADIR are not used anywhere in the code, as it seems.
2012-07-02 19:27:46 +08:00
Emmanuele Bassi
700a9be836 build: Clean output of the release rules 2012-06-29 11:21:06 +01:00
Emmanuele Bassi
c4acae7752 build: Remove gcov from the build
We want to switch to lcov, so let's start with a clean slate.
2012-06-19 14:55:10 +01:00
Emmanuele Bassi
6597245912 build: Remove tarball upload to clutter-project.org
Without being on the Intel network, you can't upload the tarball on
clutter-project.org, so it'll have to be done manually from now on.
2012-06-19 09:38:01 +01:00
Chun-wei Fan
0230f97f60 Visual C++ support: Copy clutter-gdk.h as well
... when the GDK backend is also built
2012-05-24 23:34:36 +08:00
Chun-wei Fan
26285416b2 Visual C++ 2010: Fix x64 Release_GDK configs 2012-05-24 22:27:57 +08:00
Emmanuele Bassi
403e1c7e70 modules: Use 0.10 branch for GStreamer packages 2012-05-22 13:58:40 +01:00
Chun-wei Fan
be5eb2f163 vs9/clutter.sln: Fix missing build item 2012-05-22 01:50:12 +08:00
Chun-wei Fan
ac05ad47bf VS property sheets: Correct "install" process
Fix the location where clutter-win32.h is "installed".
2012-05-16 18:58:53 +08:00
Chun-wei Fan
1153e04766 Visual C++ support: Fix clutter.def generation
I forgot about the Visual C++ 2010 files... :|
2012-05-16 18:36:51 +08:00
Chun-wei Fan
d5851c8bf9 Visual C++ support: Fix clutter.def generation
Some Windows-specific functions were not exported due to this problem.
2012-05-16 18:35:27 +08:00
Chun-wei Fan
37e9215521 Visual C++ support: Avoid redefinition warnings
CLUTTER_WINDOWING_GDK is defined in the (pre-configured) clutter-config.h,
so don't define that in the Projects again.
2012-05-16 17:21:10 +08:00
Chun-wei Fan
ee72d9b4af Visual C++ support: Add support to build GDK backend
-Add configuration in Clutter projects to add option to build Clutter with
 the GDK3 backend in addition to the Win32 backend
-Add another preconfigured clutter-config.h.win32_GDK which contains
 backend configs for both GDK3 and Win32 windowing and input.
2012-05-14 16:18:13 +08:00
Emmanuele Bassi
c70a7b9470 modules: Point to the correct branch of Cogl
Clutter requires the cogl-1.10 branch of Cogl.
2012-05-11 13:48:41 +01:00
Chun-wei Fan
9b1b554c1a Update Visual C++ property sheets
-"Install" the newly-introduced headers
-Fix the situation when the Clutter sources are not unpacked in the root
 folder of a drive (ex: Clutter is unpacked in c:\blah or d:\blah, instead
 of c:\ or d:\)
2012-03-20 16:39:25 +08:00
Chun-wei Fan
a1b8cc4b3b Update test-interactive Visual C++ projects
Link to GDK-Pixbuf as well.
2012-03-20 16:39:25 +08:00