Commit Graph

138 Commits

Author SHA1 Message Date
Emmanuele Bassi
e0e6b72b67 clutter.modules: Bump json-glib 2012-01-12 23:21:45 +00:00
Chun-wei Fan
c4590e59c7 Visual C++ 2008 projects update
Refines things a little bit from the last Visual C++ 2008 project updates.
2011-12-13 13:07:46 +08:00
Chun-wei Fan
1dd28537c4 Update Visual C++ 2010 Projects
Disable deprecation warning messages for the accessibility, performance
and micro-bench programs.
2011-12-13 13:05:16 +08:00
Chun-wei Fan
91b0aadbd4 Update Visual C++ 2008 Projects
Turn off the deprecation warnings for the accessibility, performance
and micro-bench programs.
2011-12-13 12:56:53 +08:00
Chun-wei Fan
36c312cb24 Update Clutter Visual C++ 2008 Project
Made up for missed pre-build command for x64/Release.
2011-12-08 17:58:17 +08:00
Chun-wei Fan
b6c5c0602d Update VS property sheets
Generate clutter-marshal.[ch] before the clutter-enum-types.[ch].
Strangely Visual C++ does funny things if this was done the other way
around. :|
2011-12-08 17:39:26 +08:00
Chun-wei Fan
daf2b67ed2 Update VS property sheets
Use a pregenerated .bat file to generate the clutter-enum-types.[ch], which
will greatly simplify the maintenanace of the VS build files as public
headers are added or removed.
2011-12-08 17:02:17 +08:00
Emmanuele Bassi
73e7404652 build: Clean up the VS build rules
Some minor cleanups of the Visual Studio rules in the interactive and
conformance test suites.
2011-11-18 15:12:45 +00:00
Chun-wei Fan
39c3ccfca5 Visual C++ support update
Add Projects to compile the performance test files.
2011-11-15 17:18:51 +08:00
Chun-wei Fan
119169b4a1 Fix up VS property sheets
Should be ..\..\..\clutter\deprecated\clutter-keysyms.h, not
..\..\..\clutter\deprecated\clutter-keysyms-deprecated.h
2011-11-15 15:31:17 +08:00
Chun-wei Fan
794b49990a Update Visual C++ projects
Update output DLL/LIB names to be consistent with the autotools output,
due to the newl-introduced multi-backend feature (only the Win32 backend
is supported here for now, GDK3 support will be added when it stabilizes)
2011-11-15 15:19:09 +08:00
Chun-wei Fan
c73a1fa7df Fix VS property sheets
Should be clutter-keysyms.compat.h that should land in deprecated/, not
clutter-keysyms.h
2011-11-14 13:32:29 +08:00
Chun-wei Fan
bf8f1afb40 Update VS property sheets
In response to the following moved to deprecated in the following commits:

a39be454
main: Move deprecated symbols to a separate header
40d703a0
backend: Move deprecated symbols to a separate header
b19c9196
actor: Move deprecated symbols into separate headers
142cd0bf
Move clutter-keysyms-compat.h to the deprecated section
530b07f1
Don't use a -deprecated suffix for headers
11420a70
group: Move deprecated macro into its own header
98b467f9
stage: Move the deprecated macros to a separate header
2011-11-07 12:46:56 +08:00
Chun-wei Fan
61c3b9395f Fix cally-atkevents-example VS projects
Refer to $(srcroot)\clutter so that the correct Cally headers can be
referenced
2011-11-04 12:01:51 +08:00
Chun-wei Fan
0bc1ac2312 Update VS property sheets
Stop the use of CLUTTER_DISABLE_DEPRECATED and COGL_DISABLE_DEPRECATED, as
now compiler warnings are used instead when deprecated items are used.
2011-10-21 17:53:54 +08:00
Chun-wei Fan
a36ab5787b Rename conform/interactive tests VS projects
Add a -clutter suffix for their project names to avoid clashes with the
COGL test executables
2011-10-20 16:35:38 +08:00
Chun-wei Fan
3a95d81471 Update VS property sheets
Get rid of G_DISABLE_DEPRECATED-warnings are now used to tell people that
GLib-deprecated items is to be avoided
2011-10-17 15:57:19 +08:00
Chun-wei Fan
762a4350d1 Update VS support
-clutter/Makefile.am: Include the deprecated sources as well
-clutter.vc(x)projin: Add clutter/deprecated into the "Additional Include
 Directories"
2011-10-12 17:02:08 +08:00
Chun-wei Fan
f2dc315b3b Fix VS 2008 property sheet
There was a quote escape problem... fix that.  DOH!
2011-10-12 16:55:39 +08:00
Chun-wei Fan
cbcd79d394 Update VS property sheets
For the following:
-Move of headers to $(srcroot)/clutter/deprecated, commits:
 50cda9fe
 4b748f43
 4b33a9c5
 e57f8c26
 bcd7845d
 62d72b86
 a21f1d15

-Addition of clutter/clutter-enums.h, in commit d28e04be.
-Addition of config file usage, in commit f5eee5ae
2011-10-12 16:25:28 +08:00
Chun-wei Fan
9aabf1bca1 Update VS property sheets
Update to use COGL-1.0, not COGL-2.0.
2011-10-12 14:34:49 +08:00
Chun-wei Fan
a9771b596f Update Visual C++ support
-tests/interactive/Makefile.am, build/win32/Makefile.am: copy the
 generated test-unit-names.h to build/win32 so that it can be
 distributed in "make dist" (maybe we could dist the generated header
 in tests/interactive directly?)
-Update test-interactive Visual C++ projects to include build/win32 in
 the list of folders to look for headers
2011-10-06 13:00:26 +08:00
Chun-wei Fan
9e822d9ae4 Merge branch 'master' into msvc-support-master 2011-09-27 14:35:26 +08:00
Neil Roberts
7fb8fc65a3 mingw-fetch-dependencies: Mirror the changes made to the Cogl version
Cogl has a similar script which has had the following additional
changes:

* Don't pass -c to wget

* Explicitly download and run config.guess

This patch just syncs up with those.

https://bugzilla.gnome.org/show_bug.cgi?id=659625
2011-09-21 13:47:28 +01:00
Damien Lespiau
7d8c48268e mingw32: Update the build script to compile 1.8.0
* Updated dependencies, glib 2.28 and cogl 1.8.0
* Mesa has removed mesa_wgl.h from its headers
* added -I$ROOT_DIR/include to the CFLAGS to include the headers from
  our prefix (say <GL/gl.h>) before the system ones

https://bugzilla.gnome.org/show_bug.cgi?id=659625
2011-09-21 13:46:55 +01:00
Chun-wei Fan
9f12ec534e msvc-support: Recover wrecked branch
Recover the branch! :|
2011-09-16 17:25:47 +08:00
Emmanuele Bassi
8f8663c875 moduleset: Fix up the location of the moduleset file
We moved to git.gnome.org, and the moduleset moved with us.
2011-09-12 16:38:49 +01:00
Neil Roberts
c5cf8c53cd mingw-fetch-dependencies: Build ATK from source
There is no prebuilt package for ATK 2.1.5 which Clutter now depends
on so let's build it from source instead. The ATK packages don't have
a .gz version so this patch also changes it to download the .bz2
version of json-glib to avoid having to accept both formats.
2011-09-06 09:41:06 +01:00
Emmanuele Bassi
9d46c47997 build: Fix up the release rules
Highlight actions and errors, and update the release message.
2011-09-06 08:32:07 +01:00
Emmanuele Bassi
2fc8fa82f0 build: Fix up the tarball target used when releasing 2011-07-04 22:13:23 +01:00
Emmanuele Bassi
86d96dbcc1 build: Put back ChangeLog.pre-git-import to unbreak distcheck 2011-06-13 23:15:17 +01:00
Emmanuele Bassi
e8bd46b82b build: Fix up ChangeLog build generation
Since the pre-git-import ChangeLog has been moved, we need to put it
back in the list temporarily when generating the rest.
2011-06-13 17:41:52 +01:00
Emmanuele Bassi
fbdc967575 release rules: Add note for snapshots 2011-06-13 16:32:24 +01:00
Emmanuele Bassi
5012087588 clutter.modules: Update the moduleset
Reflect the changes in the repository location for a bunch of modules,
and add the Cogl dependency to Clutter.
2011-06-10 09:39:09 +01:00
Emmanuele Bassi
161e64aae7 build: Fix typo in the docs URI variable name 2011-04-07 15:09:15 +01:00
Emmanuele Bassi
280165333d build: Cosmetic fixes for release targets
• Use $(SED) and $(GREP) consistently
• Do not point to the template README.in
• Eliminate the '===' separator in the NEWS extractor
• List all download URIs for the tarballs
2011-04-05 11:24:03 +01:00
Emmanuele Bassi
144aa4d9ba build: Fix remote docs URI in the release-message 2011-04-04 23:16:46 +01:00
Emmanuele Bassi
b8047b5471 build: Generate the release announcement
Update the release-message target to generate the full release
announcement out of the standard blurb and the NEWS file. We use
a pretty evil sed incantation, courtesy of Neil Roberts.
2011-04-04 22:34:10 +01:00
Emmanuele Bassi
6aa0919ba6 build: Fix typo in Makefile.am.release 2011-04-04 15:11:20 +01:00
Emmanuele Bassi
564765c45c build: Update the release rules 2011-04-01 16:31:49 +01:00
Emmanuele Bassi
620727689f moduleset: Some modules have been moved to gnome.org
So we need to update the moduleset.
2011-03-28 18:36:33 +01:00
Neil Roberts
f23a7583e1 mingw-fetch-dependencies.sh: Add a wrapper for pkg-config
On a Fedora system (and maybe others) there is a wrapper script called
i686-pc-mingw32-pkg-config. This script unsets the PKG_CONFIG_PATH
variable and then sets the PKG_CONFIG_LIBDIR variable so that it won't
pick up the native system .pc files. This breaks cross compiling in
mingw-fetch-dependencies.sh because it ends up removing its attempts
to set a local search path.

To fix this, the mingw-fetch-dependencies script now generates its own
wrapper script which instead sets PKG_CONFIG_LIBDIR to the local
clutter-cross prefix and then runs the original pkg-config program
from the search path. This should have the same benefit of preventing
it from finding native system .pc files on systems that don't provide
a cross pkg-config. The cross compiling for json-glib and the
recommend args to pass to configure when building clutter are updated
to set the PKG_CONFIG varible to point to this wrapper script.
2011-03-16 13:06:52 +00:00
Robert Bragg
4dc8ccf9ea win32: remove env.sh generated by mingw-fetch-dependencies.sh
Since there is very little now left in the env.sh file generated by
mingw-fetch-dependencies.sh it can be removed. What remained (The
CFLAGS="-mms-bitfields" and PKG_CONFIG_PATH=$ROOT_DIR/lib/pkgconfig) can
simply be passed explicitly when calling ./configure.
2011-03-16 11:23:38 +00:00
Robert Bragg
5faf7666ec win32: remove deprecated -mno-cygwin options from env.sh
This removes the use of -mno-cygwin from our generated env.sh for cross
compiling with mingw.

I don't know that anyone is building clutter under cygwin, and our
BuildingClutterOnWindows wiki page only describes building with msys not
cygwin so I think its fair to assume that this build configuration is
untested and thus not supported by us currently. Since the -mno-cygwin
option is deprecated it could well be that there is a better
cross-compilation solution available for cygwin these days if you want
to build programs that don't depend on cygwin libraries.
2011-03-16 11:23:38 +00:00
Robert Bragg
861bda91d5 win32: Strip unneeded flags from env.sh
This remove CXXFLAGS since we don't have any c++ code in Clutter and
also removes the redundant -L$ROOT_DIR/lib from LDFLAGS and
-I$ROOT_DIR/include from CPPFLAGS and CFLAGS. (These should get added by
pkg-config)
2011-03-16 11:23:38 +00:00
Robert Bragg
6340f3a24b win32: Add blurb at end of mingw helper script
This adds some blurb at the end the mingw-fetch-dependencies.sh script
that gives an example of how to go on and build clutter after fetching
all dependencies.
2011-03-16 11:23:38 +00:00
Robert Bragg
130135a09f win32: support building json-glib in mingw script
Since Tor does not currently provide win32 binaries for json-glib we
need to cross compile it before we can build clutter. This extends
mingw-fetch-dependencies.sh so it can fetch, unpack and cross-compile
json-glib into the same prefix as the binary dependencies.
2011-03-16 11:23:38 +00:00
Robert Bragg
820765eea0 win32: don't set CC,CPP,AR,NM,LD etc in mingw env.sh
It shouldn't be necessary to explicitly override CC,CPP,AR,NM,LD etc in
the env.sh helper script that mingw-fetch-dependencies.sh generates.
Clutter's ./configure script should figure all of those out for us.
2011-03-16 11:23:37 +00:00
Robert Bragg
ed025f1c85 win32: remove automatic build option from mingw script
This removes the "Do you want to checkout and build Clutter?" option
from the mingw-cross-compile.sh script and renames the script
mingw-fetch-dependencies.sh

As it stands the mingw-cross-compile.sh script isn't enough to fetch all
the dependencies for building clutter, since Tor doesn't provide binaries
for json-glib so the option to checkout and build clutter can't work.

Also it doesn't seem ideal to clone a fresh clutter repo instead of
being able to compile the source of the current repo.
2011-03-16 11:22:47 +00:00
Emmanuele Bassi
f4ca82fc6d build: Remove MAINTAINERCLEANFILES from ChangeLog rules 2011-02-23 00:07:12 +00:00