diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-05-15 11:52:13 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-05-15 11:52:13 +0800 |
| commit | 7ff42bb1c5280b0f53370f8d94ef5f10c9f39e2f (patch) | |
| tree | b87f815ecae9adc6e68ee9e70f166a3ce2315af7 /configure.ac | |
| parent | 2f06f4d79e29bbf30a44edbf48e8eaa637e30930 (diff) | |
| download | cogl-7ff42bb1c5280b0f53370f8d94ef5f10c9f39e2f.tar.gz | |
Fix Visual C++ build
-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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 2ba1a7ca..c92f6dc3 100644 --- a/configure.ac +++ b/configure.ac @@ -1137,6 +1137,8 @@ build/win32/vs10/Makefile cogl/Makefile cogl/cogl2.pc cogl/cogl-defines.h +cogl/cogl-defines.h.win32 +cogl/cogl-defines.h.win32_SDL cogl/cogl-gl-header.h cogl/cogl.rc cogl-pango/Makefile |