| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
On 64-bit fedora the 32-bit MinGW compiler is called
i686-w64-mingw32-gcc which wasn't being picked up by the
mingw-fetch-depdencies script.
Reviewed-by: Robert Bragg <robert.bragg@intel.com>
(cherry picked from commit f5f0342315e524523c50549e91eb9ff1683ab558)
|
|
|
|
|
| |
A project file was removed, which was not updated in Makefile.am, so make
up for that.
|
|
|
|
|
|
|
| |
This adds a PlatformToolset tag in order to make upgrading the projects to
Visual Studio 2012/2013 formats easier, especially when done with a script.
The script, for example, can change the value inside these tags
apporpriately to do the upgrade job quite easily.
|
|
|
|
| |
Some headers were deprecated and therefore moved, so update for that.
|
|
|
|
|
| |
The *.dll, *.exe and *.lib files weren't being copied in the *_SDL configs
as the project looked for them in the wrong place. Correct that problem.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This updates the Visual Studio 2010 Projects in the following ways,
similar to the recent changes to the Visual Studio 2008 projects:
-Make all the copying of the pre-configured header files custom build
rules, so that it is cleaner when people clean their builds, and the files
can be re-copied when updated.
-Split up the property sheets, so to ease future maintenance
-Make the cogl-path library built as a DLL
-Build and link against SDL-2.x for SDL builds
-Make everything except the .sln file and the README.txt file use UNIX line
endings, for easier maintenance.
-Merge cogl_sdl.sln and install-sdl.vcxproj into cogl.sln and
install.vcxproj respectively.
-Update build of the conformance test to not use COGL_COMPILATION, and make
it link to cogl-path.
|
|
|
|
|
| |
Make the install project depend on cogl-path, so that we are certain that
the cogl-path DLL gets "installed".
|
|
|
|
|
|
|
|
|
|
| |
Split up the property sheets, so that it is easier to maintain, and update
the project files accordingly. Also clean up the project files by
finishing up the merge of the *_sdl.vcproj items into their regular
counterparts, and dropping all the *_sdl.* files.
Make use of UNIX line endings for all the MSVC 2008 build files, except the
.sln file and the README.txt files, for easier maintenance.
|
|
|
|
|
|
| |
We need to link the conformance test executable to cogl-path, so make that
project depend on the cogl-path project, so that it will link to it as
well.
|
|
|
|
|
| |
...instead of the SDL-1.x example. The SDL-1.x example is not going to run
well against Cogl built against SDL-2.x.
|
|
|
|
|
| |
Update the headers "installation" as some headers have been made
deprecated.
|
|
|
|
|
| |
So that it will be like what is done in the autotools builds now. Also
clean up the cogl-path and cogl-pango projects.
|
|
|
|
| |
Don't define COGL_COMPILATION when we build the conformance tests.
|
|
|
|
|
| |
As SDL-2.x has been officially released for a while, update the Visual
Studio 2008 projects to build and link against the SDL-2.x libraries.
|
|
|
|
|
| |
Combine the parts to build Cogl with SDL support into a single solution
file, so to ease future maintenance.
|
|
|
|
|
|
|
|
|
|
|
|
| |
...for all of the copying of the pre-configured headers for Cogl. This
makes it much easier for people using the projects for building Cogl to
clean up files that are "generated", and this commit is the last bit for
it. Also clean up the property sheets as a result.
Also fix the Cogl project that it does indeed look for headers in
cogl/deprecated, so that the build is fixed.
Similar updates to the Visual Studio 2010 Projects will follow.
|
|
|
|
|
|
|
|
| |
The -L option makes curl follow redirections. This is needed for
downloading glext.h because khronos.org is using a redirect.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 85baaef4a4f4fd3a03c7c9f05002eae483ddd6b3)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously when we released a .bzip2 file the Gnome release scripts
will just convert this to a .xz file and generate its own checksum.
The .bzip2 is never actually available on the FTP server. This isn't
ideal because we were listing the checksum of the .bzip2 file in the
release message but that is useless information. This patch changes it
to generate a .xz file instead which is also what Clutter does.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit cd20c869f303a3526335e77b1913c0555e226a3f)
|
|
|
|
|
|
| |
The solution files which are updated due to the split of Cogl-Path need
to be pushed as well, which were forgotten. Sorry about this, and fix
.def file generation on Cogl with SDL on Visual Studio 2010 builds.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds a centralized autotools Makefile to be used in the completion
of the project files for Cogl-Path for now, which can be used also in
Cogl, Cogl-Pango and possibly Cogl-Gst so that we could have less clutter
in the autotools files.
This patch set will also allow the Cogl-Path project files to be filled in
during 'make dist' and make them distributed during a tarball release.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 491020592b240ca5f2885dee104c88bf431858ae)
Conflicts:
cogl-path/Makefile.am
|
|
|
|
|
| |
Some of the headers for Cogl was moved/split out to Cogl-Path, so update
the installation of the headers accordingly
|
|
|
|
|
|
|
|
| |
This adds template project files that is used to build cogl-path, where the
source files can be filled in using autotools. Note that although
cogl-path is built as a static library, items to build DLLs for this
is intentionally left in there as this is intended to be a shared library
later.
|
|
|
|
|
|
| |
Use custom build rules to generate the enumeration sources and the .def
files so that the IDE will regenerate those files upon change and
clean them when a clean up request is requested.
|
|
|
|
|
| |
-Add items to generate the enumeration sources
-Add items to build the CoglPath library, which was split out
|
|
|
|
| |
"Install" the newly-introduced public headers that are needed.
|
|
|
|
|
| |
We need to include the headers and built the sources in test-fixtures to
build the conformance tests properly.
|
|
|
|
|
| |
The release notes now link to http://cogl3d.org/cogl2-reference/
for the experimental 2.0 api reference
|
|
|
|
|
|
|
|
|
|
|
| |
-Make entries of the property sheets more like the property sheets of the
projects in the GTK+/Clutter stack, mainly changing CoglApiVersion to
ApiVersion, for better consistency, and update the corresponding projects
-Add command item in property sheets to build introspection files for Cogl
and Cogl Pango.
-Stop building and installing the cogl-msaa example, as it is something
that isn't really meant for Windows, and causes an internal compiler error
on Visual Studio 2010 x64 builds
|
|
|
|
|
|
| |
Some public headers were added, so these need to be "installed" as well.
Also clean up the preprocessor definitions as they were meant to be
in cogl/cogl-defines.h.
|
|
|
|
|
| |
Some GL driver sources were moved and added, so these sources and paths
must be added/changed in the Cogl projects
|
|
|
|
|
|
|
|
|
|
|
| |
The version of Pango that the script downloads is using G_CONST_RETURN
in the public headers. This won't build if G_DISABLE_DEPRECATED is
enabled so instead the build script now just recommends to pass
--enable-deprecated to cogl's configure script.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 4715f0f01d4de55a9cf690f52d4da211c243565b)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Cogl now requires at least version 2.32.0 of GLib. There are no
pre-built binaries for this from tml so we have to build glib from
source. This also requires libffi. The binary packages for libffi and
zlib don't install a pc file so the script just manually generates a
fake one.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 9e47972759a5dda4c9e9bf13df3369510be0e324)
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit pushes --disable-glib to the extreme of embedding the par of
glib cogl depends on in tree to be able to generate a DSO that does not
depend on an external glib.
To do so, it:
- keeps a lot of glib's configure.ac in as-glibconfig.m4
- pulls the code cogl depends on and the necessary dependencies
Reviewed-by: Robert Bragg <robert@linux.intel.com>
|
|
|
|
| |
Remove unneeded items.
|
|
|
|
|
|
|
|
| |
Like the Visual Studio 2010 builds, the install project needs to be split
into two, one for the WGL-only configs and another for the WGL+SDL
configs, so that the Cogl and Cogl-Pango DLLs and LIBs can be correctly
copied during the "install" stage, as the resulting DLLs for all configs
land in {Release|Debug}\{Win32|x64}\bin.
|
|
|
|
|
| |
Cosmetic change to the solution files headers so that they will be
consistent across the board
|
|
|
|
|
| |
The .sln files need to have Windows/DOS line endings to work in the best
way.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Since commit 7253c5ca (Bug 682071-cogl/cogl-sdl.h: MSVC: Link to SDL when
apps are built), on Visual C++ we link to SDL.lib and SDLmain.lib using
a #pragma comment directive in cogl/cogl-sdl.h, so we no longer need
specific project configs for Cogl programs which build against a Cogl built
with SDL. This removes those unneeded configs.
Also "install" cogl/cogl-sdl.h when Cogl is built with the SDL winsys, as
it is a needed header
|
|
|
|
|
|
|
| |
-Make "install" parts for VS9 and VS10 more consistent with each other
-Create the .def files in the respective intermediate/.obj folders, so that
it is cleaner duringg the build
-Make up for missed files to "install"
|
|
|
|
|
|
|
|
| |
The generated release message and the README have been updated to point
to the reference manuals hosted on developer.gnome.org and state that
documentation for the experimental 2.0 api is not currently available
online since we are migrating services away from clutter-project.org and
may not be able to rely on it for much longer.
|
|
|
|
|
| |
The x64 Release (non-SDL) build was linking to SDL.
Remove that dependency.
|
|
|
|
|
| |
x64 release builds with the SDL winsys need to link to the SDL libraries as
well, which was missed. Make up for that.
|
|
|
|
|
|
|
| |
clutter-project.org is no longer accessible for uploading releases so
this just removes all mention of it from the release rules.
(cherry picked from commit 66c291a3a4e811bde7f022e756f93d0f224975c3)
|
|
|
|
|
|
|
|
|
|
|
| |
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.
(cherry picked from commit a93eafe6596e3b262dbb86f24a456e53b044055a)
|
|
|
|
|
|
|
|
|
|
|
|
| |
-The test program and examples must be linked to SDL too when COGL is
built with the SDL renderer, so add configs accordingly.
-Also use Multibyte character sets (i.e. don't -DUNICODE) for all configs,
like what GLib does, for consistency.
-Fix the VS2010 property sheets that was accidently malformed.
(cherry picked from commit 9ed541b4e35208df87ffaa5fbbb39e11e8c247ef)
|
|
|
|
|
|
|
|
|
| |
The command to copy cogl-gl-header.h from the pre-configured
cogl-gl-header.h.win32 is wrong. Fix that.
Also add -DCOGL_ENABLE_EXPERIMENTAL_API for all creations of the cogl.def
(cherry picked from commit 6df152c411749a610a57ecaab6a983b51d2a7612)
|
|
|
|
|
|
| |
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)
|
|
|
|
|
|
|
|
|
|
|
| |
Tell people that they need to get a stdint.h implementation for Visual C++
2008 for use with Cogl-master/1.99.x+, and where they can obtain such an
implementation.
This is not needed for Visual C++ 2010 as it ships with stdint.h by
default.
(cherry picked from commit 938d70b78d672dd07e7124f7573d17d3e3079365)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-Create a pre-defined cogl/cogl-gl-header.h(.win32) that is to be used on
any Windows builds, and adapt the MSVC build process to set up and use
that file.
-Fix up glib-mkenums code generation .bat file that is generated during
"make"/"make dist", like the autotools-based builds.
-Since cogl/cogl-defines.h now contain versionioning info, and it no longer
directly includes the GL headers, update the pre-configured
cogl-defines.h[.win32|.win32_SDL] and use autotools to fill in the
versioning info during "make"/"make dist".
-Fix up cogl/cogl-pango.rc.in so that they reflect the cogl-2.x versioning
stuff correctly and versioning info can be filled in correctly during
"make"/"make dist"
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 7ff42bb1c5280b0f53370f8d94ef5f10c9f39e2f)
|