diff --git a/.gitignore b/.gitignore index 5a17a47b2..af3226474 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ README stamp-enum-types stamp-marshal /build/autotools/*.m4 +/build/win32/*.bat !/build/autotools/introspection.m4 !/build/autotools/as-linguas.m4 !/build/autotools/as-compiler-flag.m4 @@ -25,7 +26,8 @@ stamp-marshal /cogl/cogl-defines.h /cogl/cogl-enum-types.c /cogl/cogl-enum-types.h -config.* +config.h +config.h.in configure depcomp /doc/reference/cogl/cogl-*.txt diff --git a/Makefile.am b/Makefile.am index dd34ca280..8dde8f433 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,13 +4,15 @@ if BUILD_COGL_PANGO SUBDIRS += cogl-pango endif -SUBDIRS += examples doc po +SUBDIRS += examples doc po build ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS} EXTRA_DIST = \ README.in \ - config-custom.h + config-custom.h \ + config.h.win32 \ + config.h.win32.in # .changelog expects these to be initializes CLEANFILES= diff --git a/build/Makefile.am b/build/Makefile.am new file mode 100644 index 000000000..0f81afe38 --- /dev/null +++ b/build/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = win32 diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am new file mode 100644 index 000000000..b764e59e3 --- /dev/null +++ b/build/win32/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = vs9 vs10 + +EXTRA_DIST = *.bat diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am new file mode 100644 index 000000000..7e0a2ffc9 --- /dev/null +++ b/build/win32/vs10/Makefile.am @@ -0,0 +1,25 @@ +EXTRA_DIST = \ + cogl.sln \ + cogl.props \ + cogl.vcxproj \ + cogl.vcxprojin \ + cogl.vcxproj.filters \ + cogl.vcxproj.filtersin \ + cogl-pango.vcxproj \ + cogl-pango.vcxprojin \ + cogl-pango.vcxproj.filters \ + cogl-pango.vcxproj.filtersin \ + cogl-hello.vcxproj \ + cogl-hello.vcxproj.filters \ + cogl-msaa.vcxproj \ + cogl-msaa.vcxproj.filters \ + cogl-info.vcxproj \ + cogl-info.vcxproj.filters \ + cogl-crate.vcxproj \ + cogl-crate.vcxproj.filters \ + test-conformance-cogl.vcxproj \ + test-conformance-cogl.vcxprojin \ + test-conformance-cogl.vcxproj.filters \ + test-conformance-cogl.vcxproj.filtersin \ + install.vcxproj \ + README.txt diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt new file mode 100644 index 000000000..304745cbe --- /dev/null +++ b/build/win32/vs10/README.txt @@ -0,0 +1,67 @@ +Note that all this is rather experimental. + +A more detailed description on using Visual C++ to compile COGL with +its dependencies can be found on the following GNOME Live! page: + +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack + +Please do not attempt to compile COGL in a path that contains spaces +to avoid potential problems during compilation, linking or usage. + +This VS10 solution and the projects it includes are intented to be used +in a Cogl 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 GNOME: GDK-Pixbuf, Pango* and GLib. +External dependencies are at least zlib, libpng, +gettext-runtime* and Cairo*, and glext.h from +http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder +in your include directories or in \vs10\\include\GL). + +Please see the README file in the root directory of this Cogl source package +for the versions of the dependencies required. See also +build/win32/vs10/README.txt in the GLib source package for details +where to unpack them. It is recommended that at least the dependencies +from GNOME are also built with VS10 to avoid crashes caused by mixing different +CRTs-please see also the build/win32/vs10/README.txt in those respective packages. + +The recommended build sequence of the dependencies are as follows (the non-GNOME +packages that are not downloaded as binaries from ftp://ftp.gnome.org have +makefiles and/or VS project files that can be used to compile with VS directly, +except the optional PCRE, which is built on VS using CMake; GLib has +VS10 project files in the latest stable versions, GDK-Pixbuf have VS10 project files +in the latest unstable version, and Pango should have VS10 project files +in the next unstable release): +-Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig + downloaded from ftp://ftp.gnome.org* +-zlib +-libpng +-(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is + recommended-please see build/win32/vs10/README.txt in the GLib source package) +-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG +-(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library] +-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff +-GLib +-Cairo +-Pango +-GDK-Pixbuf + +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 Cogl headers into +\vs10\\include\Cogl-2.0. + +*There is no known official VS10 build support for fontconfig + (required for Pango and Pango at the moment-I will see whether this + requirement can be made optional for VS builds) + (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) + +--Chun-wei Fan + (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist) diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj new file mode 100644 index 000000000..c45830216 --- /dev/null +++ b/build/win32/vs10/cogl-crate.vcxproj @@ -0,0 +1,172 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} + cogl-crate + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} + false + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-crate.vcxproj.filters b/build/win32/vs10/cogl-crate.vcxproj.filters new file mode 100644 index 000000000..512afe1d4 --- /dev/null +++ b/build/win32/vs10/cogl-crate.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-hello.vcxproj b/build/win32/vs10/cogl-hello.vcxproj new file mode 100644 index 000000000..5e4496dac --- /dev/null +++ b/build/win32/vs10/cogl-hello.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F5A43C12-7032-428E-A56A-D294075FA493} + cogl-hello + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-hello.vcxproj.filters b/build/win32/vs10/cogl-hello.vcxproj.filters new file mode 100644 index 000000000..84c9a466c --- /dev/null +++ b/build/win32/vs10/cogl-hello.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-info.vcxproj b/build/win32/vs10/cogl-info.vcxproj new file mode 100644 index 000000000..2e5405111 --- /dev/null +++ b/build/win32/vs10/cogl-info.vcxproj @@ -0,0 +1,165 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} + coglinfo + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + false + + + MachineX64 + + + + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-info.vcxproj.filters b/build/win32/vs10/cogl-info.vcxproj.filters new file mode 100644 index 000000000..225e706fd --- /dev/null +++ b/build/win32/vs10/cogl-info.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-msaa.vcxproj b/build/win32/vs10/cogl-msaa.vcxproj new file mode 100644 index 000000000..ff77e4b77 --- /dev/null +++ b/build/win32/vs10/cogl-msaa.vcxproj @@ -0,0 +1,165 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {44E864D4-8447-484D-9B16-D5405E0783CF} + coglmsaa + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + false + + + MachineX64 + + + + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-msaa.vcxproj.filters b/build/win32/vs10/cogl-msaa.vcxproj.filters new file mode 100644 index 000000000..94457e960 --- /dev/null +++ b/build/win32/vs10/cogl-msaa.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-pango.vcxproj.filtersin b/build/win32/vs10/cogl-pango.vcxproj.filtersin new file mode 100644 index 000000000..4e22b74c1 --- /dev/null +++ b/build/win32/vs10/cogl-pango.vcxproj.filtersin @@ -0,0 +1,16 @@ + + + + + {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 "coglpango.vs10.sourcefiles.filters" + + \ No newline at end of file diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin new file mode 100644 index 000000000..117375419 --- /dev/null +++ b/build/win32/vs10/cogl-pango.vcxprojin @@ -0,0 +1,195 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} + coglpango + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + true + + + + $(PreBuildCmd) + + + Disabled + $(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(GenerateCoglPangoDef) + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl-pango\cogl-pango.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + MachineX86 + + + + + $(PreBuildCmd) + + + Disabled + $(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(GenerateCoglPangoDef) + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl-pango\cogl-pango.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + MachineX64 + + + + + $(PreBuildCmd) + + + MaxSpeed + true + $(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(GenerateCoglPangoDef) + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl-pango\cogl-pango.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + true + true + MachineX86 + + + + + $(PreBuildCmd) + + + $(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + $(GenerateCoglPangoDef) + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl-pango\cogl-pango.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + true + true + MachineX64 + + + +#include "coglpango.vs10.sourcefiles" + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props new file mode 100644 index 000000000..551e67bdb --- /dev/null +++ b/build/win32/vs10/cogl.props @@ -0,0 +1,279 @@ + + + + ..\..\..\..\vs10\$(Platform) + 1.0 + _WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG + HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines) + $(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS + _DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG + G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir" + G_LOG_DOMAIN="Cogl-Pango" + TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests" + $(GlibEtcInstallRoot) + +if exist ..\..\..\config.h goto DONE_CONFIG_H + +copy ..\..\..\config.h.win32 ..\..\..\config.h + +:DONE_CONFIG_H + + +if exist ..\..\..\cogl\cogl-defines.h goto DONE_COGL_DEFINES_H + +copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\cogl-defines.h + +:DONE_COGL_DEFINES_H + + +if exist ..\..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H + +cd ..\..\..\cogl + +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-texture-rectangle.h ./cogl-texture-2d-sliced.h ./cogl-sub-texture.h ./cogl-meta-texture.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-onscreen.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.h + +cd ..\build\win32\vs10 + +:DONE_COGL_ENUMS_H + + +if exist ..\..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C + +cd ..\..\..\cogl + +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-texture-rectangle.h ./cogl-texture-2d-sliced.h ./cogl-sub-texture.h ./cogl-meta-texture.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-onscreen.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.c + +cd ..\build\win32\vs10 + +:DONE_COGL_ENUMS_C + + + + +mkdir $(CopyDir) + +mkdir $(CopyDir)\bin + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin + + +copy ..\*.bat $(CopyDir)\bin + + +mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data + +copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data + + +mkdir $(CopyDir)\lib + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(CoglApiVersion).lib $(CopyDir)\lib + + +mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango + +copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango + +copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + + +copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl2-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + +copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl + + + + echo EXPORTS > ..\..\..\cogl\cogl.def + + cl -EP -DCOGL_ENABLE_EXPERIMENTAL_API -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def + + + + echo EXPORTS > ..\..\..\cogl-pango\cogl-pango.def + + cl -EP ..\..\..\cogl-pango\cogl-pango.symbols >> ..\..\..\cogl-pango\cogl-pango.def + + + lib + -$(CoglApiVersion)-0 + + -1-vs10 + $(CoglSeparateVS10DllPrefix) + $(CoglSeparateVS10DllSuffix) + + + <_PropertySheetDisplayName>coglprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + G_DISABLE_SINGLE_INCLUDES;COGL_HAS_GLIB_SUPPORT;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + 4819;%(DisableSpecificWarnings) + + + glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(GlibEtcInstallRoot) + + + $(CoglApiVersion) + + + $(BaseBuildDefines) + + + $(LibBuildDefines) + + + $(ReleaseLibBuildDefines) + + + $(DebugLibBuildDefines) + + + $(CoglBuildDefines) + + + $(CoglPangoBuildDefines) + + + $(TestProgDef) + + + $(PreBuildCmd) + + + $(CoglDoInstall) + + + $(GenerateCoglDef) + + + $(GenerateCoglPangoDef) + + + $(CoglLibtoolCompatibleDllPrefix) + + + $(CoglLibtoolCompatibleDllSuffix) + + + $(CoglSeparateVS10DllPrefix) + + + $(CoglSeparateVS10DllSuffix) + + + $(CoglDllPrefix) + + + $(CoglDllSuffix) + + + \ No newline at end of file diff --git a/build/win32/vs10/cogl.sln b/build/win32/vs10/cogl.sln new file mode 100644 index 000000000..c411d2b4f --- /dev/null +++ b/build/win32/vs10/cogl.sln @@ -0,0 +1,96 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcxproj", "{F3A80987-5411-43DB-A23B-06F2076E1206}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcxproj", "{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vcxproj", "{F5A43C12-7032-428E-A56A-D294075FA493}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-msaa", "cogl-msaa.vcxproj", "{44E864D4-8447-484D-9B16-D5405E0783CF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcxproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-crate", "cogl-crate.vcxproj", "{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "test-conformance-cogl.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.Build.0 = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.ActiveCfg = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.Build.0 = Debug|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.ActiveCfg = Debug|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.Build.0 = Debug|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.ActiveCfg = Release|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.Build.0 = Release|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.ActiveCfg = Release|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.Build.0 = Release|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.ActiveCfg = Debug|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.Build.0 = Debug|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.ActiveCfg = Debug|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.Build.0 = Debug|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.ActiveCfg = Release|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.Build.0 = Release|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.Build.0 = Debug|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.ActiveCfg = Release|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.Build.0 = Release|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.ActiveCfg = Release|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.Build.0 = Release|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.ActiveCfg = Debug|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.Build.0 = Debug|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.ActiveCfg = Debug|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.Build.0 = Debug|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.ActiveCfg = Release|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.Build.0 = Release|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.ActiveCfg = Release|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.Build.0 = Release|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin new file mode 100644 index 000000000..93820d437 --- /dev/null +++ b/build/win32/vs10/cogl.vcxproj.filtersin @@ -0,0 +1,23 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {43c6d046-ba3b-4ff2-b7e6-df455affa6bf} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + Sources + Sources +#include "cogl.vs10.sourcefiles.filters" + Sources\Driver_GL + Sources\Driver_GL + + \ No newline at end of file diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin new file mode 100644 index 000000000..a34005cbe --- /dev/null +++ b/build/win32/vs10/cogl.vcxprojin @@ -0,0 +1,197 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F3A80987-5411-43DB-A23B-06F2076E1206} + cogl + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + true + + + + $(PreBuildCmd) + + + Disabled + ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(GenerateCoglDef) + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl\cogl.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + MachineX86 + + + + + $(PreBuildCmd) + + + Disabled + ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(GenerateCoglDef) + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl\cogl.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + MachineX64 + + + + + $(PreBuildCmd) + + + MaxSpeed + ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories) + true + $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(GenerateCoglDef) + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl\cogl.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + true + true + MachineX86 + + + + + $(PreBuildCmd) + + + ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories) + $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + $(GenerateCoglDef) + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + ..\..\..\cogl\cogl.def + $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + true + Windows + true + true + MachineX64 + + + + + +#include "cogl.vs10.sourcefiles" + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj new file mode 100644 index 000000000..5c4708a53 --- /dev/null +++ b/build/win32/vs10/install.vcxproj @@ -0,0 +1,125 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {35B2A4AC-7235-4FC7-995D-469D59195041} + install + + + + Utility + MultiByte + true + + + Utility + MultiByte + + + Utility + MultiByte + true + + + Utility + MultiByte + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + + + + + $(CoglDoInstall) + + + + + $(CoglDoInstall) + + + + + $(CoglDoInstall) + + + + + $(CoglDoInstall) + + + + + {0f08f253-de1a-40cb-a890-93ae3ca23ade} + false + + + {de1a2710-04bb-4c3d-90c1-b070e326b1cf} + false + + + {f5a43c12-7032-428e-a56a-d294075fa493} + false + + + {44e864d4-8447-484d-9b16-d5405e0783cf} + false + + + {cd17f5c8-c860-4a65-8209-4d0b093a3da3} + false + + + {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} + false + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin b/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin new file mode 100644 index 000000000..8028da3d1 --- /dev/null +++ b/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin @@ -0,0 +1,12 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + +#include "testconformance.vs10.sourcefiles.filters" + + \ No newline at end of file diff --git a/build/win32/vs10/test-conformance-cogl.vcxprojin b/build/win32/vs10/test-conformance-cogl.vcxprojin new file mode 100644 index 000000000..b7d91f287 --- /dev/null +++ b/build/win32/vs10/test-conformance-cogl.vcxprojin @@ -0,0 +1,172 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE} + testconformancecogl + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + %(AdditionalDependencies) + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + +#include "testconformance.vs10.sourcefiles" + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am new file mode 100644 index 000000000..49e621c59 --- /dev/null +++ b/build/win32/vs9/Makefile.am @@ -0,0 +1,15 @@ +EXTRA_DIST = \ + cogl.sln \ + cogl.vsprops \ + cogl.vcproj \ + cogl.vcprojin \ + cogl-pango.vcproj \ + cogl-pango.vcprojin \ + test-conformance-cogl.vcproj \ + test-conformance-cogl.vcprojin \ + cogl-hello.vcproj \ + cogl-crate.vcproj \ + cogl-msaa.vcproj \ + cogl-info.vcproj \ + install.vcproj \ + README.txt diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt new file mode 100644 index 000000000..925fee44c --- /dev/null +++ b/build/win32/vs9/README.txt @@ -0,0 +1,67 @@ +Note that all this is rather experimental. + +A more detailed description on using Visual C++ to compile COGL with +its dependencies can be found on the following GNOME Live! page: + +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack + +Please do not attempt to compile COGL in a path that contains spaces +to avoid potential problems during compilation, linking or usage. + +This VS9 solution and the projects it includes are intented to be used +in a Cogl 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 GNOME: GDK-Pixbuf, Pango* and GLib. +External dependencies are at least zlib, libpng, +gettext-runtime* and Cairo*, and glext.h from +http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder +in your include directories or in \vs9\\include\GL). + +Please see the README file in the root directory of this Cogl source package +for the versions of the dependencies required. See also +build/win32/vs9/README.txt in the GLib source package for details +where to unpack them. It is recommended that at least the dependencies +from GNOME are also built with VS9 to avoid crashes caused by mixing different +CRTs-please see also the build/win32/vs9/README.txt in those respective packages. + +The recommended build sequence of the dependencies are as follows (the non-GNOME +packages that are not downloaded as binaries from ftp://ftp.gnome.org have +makefiles and/or VS project files that can be used to compile with VS directly, +except the optional PCRE, which is built on VS using CMake; GLib has +VS9 project files in the latest stable versions, GDK-Pixbuf have VS9 project files +in the latest unstable version, and Pango should have VS9 project files +in the next unstable release): +-Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig + downloaded from ftp://ftp.gnome.org* +-zlib +-libpng +-(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is + recommended-please see build/win32/vs9/README.txt in the GLib source package) +-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG +-(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library] +-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff +-GLib +-Cairo +-Pango +-GDK-Pixbuf + +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 Cogl headers into +\vs9\\include\Cogl-2.0. + +*There is no known official VS9 build support for fontconfig + (required for Pango and Pango at the moment-I will see whether this + requirement can be made optional for VS builds) + (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) + +--Chun-wei Fan + (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist) diff --git a/build/win32/vs9/cogl-crate.vcproj b/build/win32/vs9/cogl-crate.vcproj new file mode 100644 index 000000000..e4bdedb76 --- /dev/null +++ b/build/win32/vs9/cogl-crate.vcproj @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl-hello.vcproj b/build/win32/vs9/cogl-hello.vcproj new file mode 100644 index 000000000..cc58e9a95 --- /dev/null +++ b/build/win32/vs9/cogl-hello.vcproj @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl-info.vcproj b/build/win32/vs9/cogl-info.vcproj new file mode 100644 index 000000000..b869263b5 --- /dev/null +++ b/build/win32/vs9/cogl-info.vcproj @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl-msaa.vcproj b/build/win32/vs9/cogl-msaa.vcproj new file mode 100644 index 000000000..61dc10931 --- /dev/null +++ b/build/win32/vs9/cogl-msaa.vcproj @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin new file mode 100644 index 000000000..f083dff2b --- /dev/null +++ b/build/win32/vs9/cogl-pango.vcprojin @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "coglpango.sourcefiles" + + + + + + + diff --git a/build/win32/vs9/cogl.sln b/build/win32/vs9/cogl.sln new file mode 100644 index 000000000..32bc81436 --- /dev/null +++ b/build/win32/vs9/cogl.sln @@ -0,0 +1,125 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcproj", "{F3A80987-5411-43DB-A23B-06F2076E1206}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcproj", "{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}" + ProjectSection(ProjectDependencies) = postProject + {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vcproj", "{F5A43C12-7032-428E-A56A-D294075FA493}" + ProjectSection(ProjectDependencies) = postProject + {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-crate", "cogl-crate.vcproj", "{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}" + ProjectSection(ProjectDependencies) = postProject + {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-msaa", "cogl-msaa.vcproj", "{44E864D4-8447-484D-9B16-D5405E0783CF}" + ProjectSection(ProjectDependencies) = postProject + {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}" + ProjectSection(ProjectDependencies) = postProject + {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "test-conformance-cogl.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}" + ProjectSection(ProjectDependencies) = postProject + {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}" + ProjectSection(ProjectDependencies) = postProject + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} + {F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493} + {44E864D4-8447-484D-9B16-D5405E0783CF} = {44E864D4-8447-484D-9B16-D5405E0783CF} + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} = {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} + {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} = {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE} = {0F08F253-DE1A-40CB-A890-93AE3CA23ADE} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.Build.0 = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.ActiveCfg = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.Build.0 = Debug|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.ActiveCfg = Debug|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.Build.0 = Debug|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.ActiveCfg = Release|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.Build.0 = Release|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.ActiveCfg = Release|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.Build.0 = Release|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.ActiveCfg = Debug|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.Build.0 = Debug|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.ActiveCfg = Debug|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.Build.0 = Debug|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.ActiveCfg = Release|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64 + {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.Build.0 = Release|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.Build.0 = Debug|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.ActiveCfg = Release|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.Build.0 = Release|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.ActiveCfg = Release|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.Build.0 = Release|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.ActiveCfg = Debug|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.Build.0 = Debug|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.ActiveCfg = Debug|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.Build.0 = Debug|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.ActiveCfg = Release|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.Build.0 = Release|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.ActiveCfg = Release|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.Build.0 = Release|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin new file mode 100644 index 000000000..54383cb7f --- /dev/null +++ b/build/win32/vs9/cogl.vcprojin @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "cogl.sourcefiles" + + + + + + + + + + + diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops new file mode 100644 index 000000000..8e3bfe116 --- /dev/null +++ b/build/win32/vs9/cogl.vsprops @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj new file mode 100644 index 000000000..f2e013d1c --- /dev/null +++ b/build/win32/vs9/install.vcproj @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/test-conformance-cogl.vcprojin b/build/win32/vs9/test-conformance-cogl.vcprojin new file mode 100644 index 000000000..6983027a9 --- /dev/null +++ b/build/win32/vs9/test-conformance-cogl.vcprojin @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "testconformance.sourcefiles" + + + + + diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am index 5ee1fabb1..d8cf37370 100644 --- a/cogl-pango/Makefile.am +++ b/cogl-pango/Makefile.am @@ -57,6 +57,42 @@ pkgconfig_DATA = $(pc_files) EXTRA_DIST += cogl-pango.pc.in DISTCLEANFILES += $(pc_files) +dist-hook: ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj ../build/win32/vs10/cogl-pango.vcxproj.filters + +../build/win32/vs9/cogl-pango.vcproj: $(top_srcdir)/build/win32/vs9/cogl-pango.vcprojin + for F in $(source_c); do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >coglpango.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/cogl-pango.vcprojin >$@ + rm coglpango.sourcefiles + +../build/win32/vs10/cogl-pango.vcxproj: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxprojin + for F in $(source_c); do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >coglpango.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl-pango.vcxprojin >$@ + rm coglpango.vs10.sourcefiles + +../build/win32/vs10/cogl-pango.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin + for F in $(source_c); do \ + case $$F in \ + *.c) echo ' Sources' \ + ;; \ + esac; \ + done >coglpango.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin >$@ + rm coglpango.vs10.sourcefiles.filters + +EXTRA_DIST += cogl-pango.symbols + +DISTCLEANFILES += ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj ../build/win32/vs10/cogl-pango.vcxproj.filters + -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = diff --git a/cogl-pango/cogl-pango.symbols b/cogl-pango/cogl-pango.symbols new file mode 100644 index 000000000..b86c9560e --- /dev/null +++ b/cogl-pango/cogl-pango.symbols @@ -0,0 +1,12 @@ +cogl_pango_ensure_glyph_cache_for_layout +cogl_pango_font_map_clear_glyph_cache +cogl_pango_font_map_create_context +cogl_pango_font_map_get_renderer +cogl_pango_font_map_get_use_mipmapping +cogl_pango_font_map_new +cogl_pango_font_map_set_resolution +cogl_pango_font_map_set_use_mipmapping +cogl_pango_renderer_get_type +cogl_pango_render_layout +cogl_pango_render_layout_line +cogl_pango_render_layout_subpixel diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 8f3acfb45..51f6d4223 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -413,6 +413,48 @@ coglincludedir = $(includedir)/cogl/cogl coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h) nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h +dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters + +# I know those filters below don't look nice, but this is to ensure the right files are in the Project files only *once* +../build/win32/vs9/cogl.vcproj: $(top_srcdir)/build/win32/vs9/cogl.vcprojin + for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *-egl.c|*-glx.c|*-xlib*.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*.h) ;; \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >cogl.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/cogl.vcprojin >$@ + rm cogl.sourcefiles + +../build/win32/vs10/cogl.vcxproj: $(top_srcdir)/build/win32/vs10/cogl.vcxprojin + for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *-egl.c|*-glx.c|*-xlib*.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*.h) ;; \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >cogl.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl.vcxprojin >$@ + rm cogl.vs10.sourcefiles + +../build/win32/vs10/cogl.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cogl.vcxproj.filtersin + for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *-egl.c|*-glx.c|*-xlib*.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*.h) ;; \ + *.c) echo ' Sources' \ + ;; \ + esac; \ + done >cogl.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl.vcxproj.filtersin >$@ + rm cogl.vs10.sourcefiles.filters + +EXTRA_DIST += \ + cogl-defines.h.win32 \ + cogl.symbols + +DISTCLEANFILES += ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters + -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = diff --git a/cogl/cogl-defines.h.win32 b/cogl/cogl-defines.h.win32 new file mode 100644 index 000000000..bd059501c --- /dev/null +++ b/cogl/cogl-defines.h.win32 @@ -0,0 +1,60 @@ +/* + * Cogl + * + * An object oriented GL/GLES Abstraction/Utility Layer + * + * Copyright (C) 2007,2008,2009,2010 Intel Corporation. + * + * 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 . + * + * + */ + +#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __COGL_DEFINES_H__ +#define __COGL_DEFINES_H__ + +#include +#include +#include +#include + +G_BEGIN_DECLS + +#define COGL_HAS_WGL_SUPPORT 1 +#define COGL_HAS_WIN32_SUPPORT 1 +#define COGL_HAS_GL 1 +#define CLUTTER_COGL_HAS_GL 1 + +#ifdef COGL_HAS_EGL_SUPPORT +#ifdef COGL_HAS_GLES1 +#include +#include +#else +#include +#define NativeDisplayType EGLNativeDisplayType +#define NativeWindowType EGLNativeWindowType +#endif +#endif + +#ifndef GL_OES_EGL_image +#define GLeglImageOES void * +#endif + +G_END_DECLS + +#endif diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols new file mode 100644 index 000000000..60e839330 --- /dev/null +++ b/cogl/cogl.symbols @@ -0,0 +1,959 @@ +#if 0 +;note: those with the _EXP suffix are defined as +;the same symbols sans the _EXP suffix +;(this may be subject to change!) +#endif + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl2_clip_push_from_path +cogl2_path_arc +cogl2_path_close +cogl2_path_curve_to +cogl2_path_ellipse +cogl2_path_fill +cogl2_path_get_fill_rule +cogl2_path_line +cogl2_path_line_to +cogl2_path_move_to +cogl2_path_new +cogl2_path_polygon +cogl2_path_polyline +cogl2_path_rectangle +cogl2_path_rel_curve_to +cogl2_path_rel_line_to +cogl2_path_rel_move_to +cogl2_path_round_rectangle +cogl2_path_set_fill_rule +cogl2_path_stroke +#endif + +#ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT +cogl_android_set_native_window_EXP +#endif + +cogl_angle_cos +cogl_angle_sin +cogl_angle_tan + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_attribute_new +#endif + +cogl_attribute_buffer_new + +cogl_attribute_type_get_type +cogl_begin_gl +cogl_bitmap_error_get_type +cogl_bitmap_error_quark +cogl_bitmap_get_size_from_file +cogl_bitmap_new_from_file + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_bitmap_new_from_buffer_EXP +#endif + +cogl_blend_string_error_get_type +cogl_blend_string_error_quark +cogl_buffer_access_get_type +cogl_buffer_bit_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_buffer_get_size_EXP +cogl_buffer_get_update_hint_EXP +#if 0 +;not implemented! +cogl_buffer_get_usage_hint_EXP +#endif +cogl_buffer_map_EXP +#endif + +cogl_buffer_map_hint_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_buffer_set_data_EXP +cogl_buffer_set_update_hint_EXP +#if 0 +;not implemented! +cogl_buffer_set_usage_hint_EXP +#endif +#endif + +cogl_buffer_target_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_buffer_unmap_EXP +#endif + +cogl_buffer_update_hint_get_type + +#ifndef COGL_DISABLE_DEPRECATED +cogl_check_extension +#endif + +cogl_clear + +#ifndef COGL_DISABLE_DEPRECATED +cogl_clip_ensure +#endif + +cogl_clip_pop + +#ifndef COGL_DISABLE_DEPRECATED +cogl_clip_push +#endif + +cogl_clip_push_from_path +cogl_clip_push_from_path_preserve +cogl_clip_push_rectangle + +cogl_clip_push_window_rect + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_clip_push_primitive_EXP +#endif + +#ifndef COGL_DISABLE_DEPRECATED +cogl_clip_push_window_rectangle +cogl_clip_stack_restore +cogl_clip_stack_save +#endif + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +#ifndef COGL_WINSYS_INTEGRATED +cogl_clutter_check_extension_CLUTTER +cogl_clutter_winsys_has_feature_CLUTTER +#ifdef COGL_HAS_XLIB +cogl_clutter_winsys_xlib_get_visual_info_CLUTTER +#endif +#endif +#endif + +cogl_color_copy +cogl_color_equal +cogl_color_free +cogl_color_get_alpha +cogl_color_get_alpha_byte +cogl_color_get_alpha_float +cogl_color_get_blue +cogl_color_get_blue_byte +cogl_color_get_blue_float +cogl_color_get_green +cogl_color_get_green_byte +cogl_color_get_green_float +cogl_color_get_red +cogl_color_get_red_byte +cogl_color_get_red_float +cogl_color_init_from_4f +cogl_color_init_from_4fv +cogl_color_init_from_4ub +cogl_color_new +cogl_color_premultiply +cogl_color_set_alpha +cogl_color_set_alpha_byte +cogl_color_set_alpha_float +cogl_color_set_blue +cogl_color_set_blue_byte +cogl_color_set_blue_float +cogl_color_set_from_4f +cogl_color_set_from_4ub +cogl_color_set_green +cogl_color_set_green_byte +cogl_color_set_green_float +cogl_color_set_red +cogl_color_set_red_byte +cogl_color_set_red_float +cogl_color_unpremultiply + +#ifdef COGL_ENABLE_EXPERIMENTAL_API + +#ifdef COGL_HAS_EGL_SUPPORT +cogl_egl_context_get_egl_display_EXP +#endif + +cogl_context_get_display_EXP +cogl_context_new_EXP +#endif + +cogl_create_program +cogl_create_shader + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_depth_state_get_range +cogl_depth_state_get_test_enabled +cogl_depth_state_get_test_function +cogl_depth_state_get_write_enabled +cogl_depth_state_init +cogl_depth_state_set_test_enabled +cogl_depth_state_set_test_function +cogl_depth_state_set_range +cogl_depth_state_set_write_enabled +#endif + +cogl_depth_test_function_get_type +cogl_disable_fog + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_display_get_renderer_EXP +cogl_display_new_EXP +cogl_display_setup_EXP +#endif + +cogl_double_to_fixed +cogl_double_to_int +cogl_double_to_uint + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_draw_attributes +cogl_draw_indexed_attributes +#endif + +cogl_end_gl +cogl_error_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_euler_copy +cogl_euler_equal +cogl_euler_free +cogl_euler_init +cogl_euler_init_from_matrix +#if 0 +;not yet implemented +cogl_euler_init_from_quaternion +#endif +#endif + +cogl_features_available +cogl_feature_flags_get_type +cogl_fixed_atan +cogl_fixed_atan2 +cogl_fixed_cos +cogl_fixed_get_type +cogl_fixed_log2 +cogl_fixed_pow +cogl_fixed_pow2 +cogl_fixed_sin +cogl_fixed_sqrt +cogl_fixed_tan +cogl_fog_mode_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_foreach_feature_EXP +#endif + +cogl_flush + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_framebuffer_add_swap_buffers_callback_EXP +cogl_framebuffer_allocate_EXP +cogl_framebuffer_clear4f_EXP +cogl_framebuffer_clear_EXP +cogl_framebuffer_discard_buffers_EXP +cogl_framebuffer_error_quark_EXP +cogl_framebuffer_finish +cogl_framebuffer_get_alpha_bits_EXP +cogl_framebuffer_get_blue_bits_EXP +cogl_framebuffer_get_color_format_EXP +cogl_framebuffer_get_color_mask_EXP +cogl_framebuffer_get_context_EXP +cogl_framebuffer_get_dither_enabled +cogl_framebuffer_get_green_bits_EXP +cogl_framebuffer_get_height_EXP +cogl_framebuffer_get_red_bits_EXP +cogl_framebuffer_get_samples_per_pixel_EXP +cogl_framebuffer_get_viewport4fv_EXP +cogl_framebuffer_get_viewport_height_EXP +cogl_framebuffer_get_viewport_width_EXP +cogl_framebuffer_get_viewport_x_EXP +cogl_framebuffer_get_viewport_y_EXP +cogl_framebuffer_get_width_EXP +cogl_framebuffer_remove_swap_buffers_callback_EXP +cogl_framebuffer_resolve_samples_EXP +cogl_framebuffer_resolve_samples_region_EXP +cogl_framebuffer_set_color_mask_EXP +cogl_framebuffer_set_dither_enabled +cogl_framebuffer_set_samples_per_pixel_EXP +cogl_framebuffer_set_viewport_EXP +cogl_framebuffer_swap_buffers_EXP +cogl_framebuffer_swap_region_EXP +#endif + +#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT +cogl_gdl_display_set_plane_EXP +#endif + +cogl_frustum +cogl_get_backface_culling_enabled +cogl_get_bitmasks +cogl_get_depth_test_enabled + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_get_draw_framebuffer_EXP +#endif + +cogl_get_features +cogl_get_modelview_matrix +cogl_get_option_group +cogl_get_path ;this is COGL 1.0 API +cogl_get_proc_address +cogl_get_projection_matrix + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_get_rectangle_indices +#endif + +cogl_get_source + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_get_static_identity_quaternion +cogl_get_static_zero_quaternion +#endif + +cogl_get_viewport + +#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION +cogl_gtype_matrix_get_type +#endif + +cogl_handle_get_type +cogl_handle_ref +cogl_handle_unref + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_has_feature_EXP +cogl_has_features_EXP +cogl_index_buffer_new +cogl_indices_get_buffer +cogl_indices_get_offset +cogl_indices_get_type +cogl_indices_new +cogl_indices_new_for_buffer +cogl_indices_set_offset +#endif + +cogl_indices_type_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_is_attribute +#endif + +cogl_is_attribute_buffer +cogl_is_bitmap + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_is_buffer_EXP +cogl_is_index_buffer +#if 0 +;not implemented! +cogl_is_indices_array +#endif +#endif + +cogl_is_material +cogl_is_offscreen +cogl_is_path + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_is_pipeline_EXP +cogl_is_pixel_buffer_EXP +cogl_is_primitive +#endif + +cogl_is_program + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_is_renderer_EXP +#endif + +cogl_is_shader + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_is_sub_texture_EXP +#endif + +cogl_is_texture + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_is_texture_rectangle_EXP + +cogl_is_texture_2d_EXP +cogl_is_texture_3d_EXP +#endif + +cogl_is_vertex_buffer +cogl_is_vertex_buffer_indices +cogl_material_alpha_func_get_type +cogl_material_copy +cogl_material_filter_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_material_foreach_layer +#endif + +cogl_material_get_ambient +cogl_material_get_color + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_material_get_depth_state +#endif + +cogl_material_get_diffuse +cogl_material_get_emission +cogl_material_get_layers +cogl_material_get_layer_point_sprite_coords_enabled +cogl_material_get_layer_wrap_mode_p +cogl_material_get_layer_wrap_mode_s +cogl_material_get_layer_wrap_mode_t +cogl_material_get_n_layers +cogl_material_get_point_size +cogl_material_get_shininess +cogl_material_get_specular +cogl_material_get_user_program +cogl_material_layer_get_mag_filter +cogl_material_layer_get_min_filter +cogl_material_layer_get_texture +cogl_material_layer_get_type +cogl_material_layer_get_wrap_mode_p +cogl_material_layer_get_wrap_mode_s +cogl_material_layer_get_wrap_mode_t +cogl_material_layer_type_get_type +cogl_material_new +cogl_material_remove_layer + +#ifndef COGL_DISABLE_DEPRECATED +cogl_material_ref +#endif + +cogl_material_set_alpha_test_function +cogl_material_set_ambient +cogl_material_set_ambient_and_diffuse +cogl_material_set_blend +cogl_material_set_blend_constant +cogl_material_set_color +cogl_material_set_color4f +cogl_material_set_color4ub + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_material_set_depth_state +#endif + +cogl_material_set_diffuse +cogl_material_set_emission +cogl_material_set_layer +cogl_material_set_layer_combine +cogl_material_set_layer_combine_constant +cogl_material_set_layer_filters +cogl_material_set_layer_matrix +cogl_material_set_layer_point_sprite_coords_enabled +cogl_material_set_layer_wrap_mode +cogl_material_set_layer_wrap_mode_p +cogl_material_set_layer_wrap_mode_s +cogl_material_set_layer_wrap_mode_t +cogl_material_set_point_size +cogl_material_set_shininess +cogl_material_set_specular +cogl_material_set_user_program + +#ifndef COGL_DISABLE_DEPRECATED +cogl_material_unref +#endif + +cogl_material_wrap_mode_get_type +cogl_matrix_copy +cogl_matrix_equal +cogl_matrix_free +cogl_matrix_frustum +cogl_matrix_get_array +cogl_matrix_get_inverse +cogl_matrix_init_from_array +cogl_matrix_is_identity + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_matrix_init_from_quaternion +#endif + +cogl_matrix_init_identity +cogl_matrix_look_at_EXP +cogl_matrix_multiply +cogl_matrix_ortho +cogl_matrix_perspective + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_matrix_project_points_EXP +#endif + +cogl_matrix_rotate +cogl_matrix_scale +cogl_matrix_transform_point + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_matrix_transform_points_EXP +#endif + +cogl_matrix_translate +cogl_matrix_transpose + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_matrix_view_2d_in_frustum_EXP +cogl_matrix_view_2d_in_perspective_EXP + +cogl_meta_texture_foreach_in_region +#endif + +cogl_object_get_user_data +cogl_object_ref +cogl_object_set_user_data +cogl_object_unref +cogl_offscreen_new_to_texture + +#ifndef COGL_DISABLE_DEPRECATED +cogl_offscreen_ref +cogl_offscreen_unref +#endif + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +#ifndef COGL_WINSYS_INTEGRATED +cogl_onscreen_clutter_backend_set_size_CLUTTER +#endif +cogl_onscreen_hide_EXP +cogl_onscreen_new_EXP +cogl_onscreen_set_swap_throttled_EXP +cogl_onscreen_show_EXP +cogl_onscreen_template_new_EXP +cogl_onscreen_template_set_samples_per_pixel +#ifdef COGL_HAS_WIN32_SUPPORT +cogl_win32_onscreen_get_window_EXP +cogl_win32_onscreen_set_foreign_window_EXP +#endif +#ifdef COGL_HAS_X11 +cogl_x11_onscreen_get_visual_xid_EXP +cogl_x11_onscreen_set_foreign_window_xid_EXP +#endif +#endif + +cogl_ortho +cogl_path_arc +cogl_path_close +cogl_path_copy +cogl_path_curve_to +cogl_path_ellipse +cogl_path_fill +cogl_path_fill_preserve ;this is COGL 1.0 API +cogl_path_fill_rule_get_type +cogl_path_get_fill_rule +cogl_path_line +cogl_path_line_to +cogl_path_move_to +cogl_path_new +cogl_path_polygon +cogl_path_polyline +cogl_path_rectangle +cogl_path_rel_curve_to +cogl_path_rel_line_to +cogl_path_rel_move_to +cogl_path_round_rectangle +cogl_path_set_fill_rule +cogl_path_stroke +cogl_path_stroke_preserve ;this is COGL 1.0 API +cogl_perspective + +cogl_pipeline_cache_free +cogl_pipeline_cache_new + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_pipeline_copy_EXP +#endif + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_pipeline_foreach_layer_EXP +cogl_pipeline_get_alpha_test_function_EXP +cogl_pipeline_get_alpha_test_reference_EXP +cogl_pipeline_get_ambient_EXP +cogl_pipeline_get_color_EXP +cogl_pipeline_get_color_mask_EXP +cogl_pipeline_get_cull_face_mode +cogl_pipeline_get_depth_state_EXP +cogl_pipeline_get_diffuse_EXP +cogl_pipeline_get_emission_EXP +cogl_pipeline_get_front_face_winding +cogl_pipeline_get_layer_point_sprite_coords_enabled_EXP +cogl_pipeline_get_layer_wrap_mode_p_EXP +cogl_pipeline_get_layer_wrap_mode_s_EXP +cogl_pipeline_get_layer_wrap_mode_t_EXP +cogl_pipeline_get_n_layers_EXP +cogl_pipeline_get_point_size_EXP +cogl_pipeline_get_shininess_EXP +cogl_pipeline_get_specular_EXP +cogl_pipeline_get_uniform_location_EXP +cogl_pipeline_get_user_program_EXP +cogl_pipeline_new_EXP +cogl_pipeline_set_alpha_test_function_EXP +cogl_pipeline_set_ambient_EXP +cogl_pipeline_set_ambient_and_diffuse_EXP +cogl_pipeline_set_blend_EXP +cogl_pipeline_set_blend_constant_EXP +cogl_pipeline_set_color_EXP +cogl_pipeline_set_color_mask_EXP +cogl_pipeline_set_color4f_EXP +cogl_pipeline_set_color4ub_EXP +cogl_pipeline_set_cull_face_mode +cogl_pipeline_set_depth_state_EXP +cogl_pipeline_set_diffuse_EXP +cogl_pipeline_set_emission_EXP +cogl_pipeline_set_front_face_winding +cogl_pipeline_set_layer_combine_EXP +cogl_pipeline_set_layer_combine_constant_EXP +cogl_pipeline_set_layer_filters_EXP +cogl_pipeline_set_layer_matrix_EXP +cogl_pipeline_set_layer_point_sprite_coords_enabled_EXP +cogl_pipeline_set_layer_texture_EXP +cogl_pipeline_set_layer_wrap_mode_EXP +cogl_pipeline_set_layer_wrap_mode_p_EXP +cogl_pipeline_set_layer_wrap_mode_s_EXP +cogl_pipeline_set_layer_wrap_mode_t_EXP +cogl_pipeline_set_point_size_EXP +cogl_pipeline_remove_layer_EXP +cogl_pipeline_set_shininess_EXP +cogl_pipeline_set_specular_EXP +cogl_pipeline_set_uniform_float_EXP +cogl_pipeline_set_uniform_int_EXP +cogl_pipeline_set_uniform_matrix_EXP +cogl_pipeline_set_uniform_1f_EXP +cogl_pipeline_set_uniform_1i_EXP +cogl_pipeline_set_user_program_EXP +#endif + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +#if 0 +;not implemented! +cogl_pixel_buffer_new_EXP +#endif +cogl_pixel_buffer_new_with_size_EXP +#if 0 +;not exported in the main APIs for now +cogl_pixel_buffer_set_region_EXP +#endif +#endif + +cogl_pixel_format_get_type +cogl_polygon + +#ifndef COGL_DISABLE_DEPRECATED +cogl_pop_draw_buffer +#endif + +cogl_pop_framebuffer +cogl_pop_matrix +cogl_pop_source + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_primitive_draw +cogl_primitive_get_first_vertex +cogl_primitive_get_mode +cogl_primitive_get_n_vertices_EXP +cogl_primitive_new +cogl_primitive_new_p2 +cogl_primitive_new_p2c4 +cogl_primitive_new_p2t2 +cogl_primitive_new_p2t2c4 +cogl_primitive_new_p3 +cogl_primitive_new_p3c4 +cogl_primitive_new_p3t2 +cogl_primitive_new_p3t2c4 +cogl_primitive_new_with_attributes +cogl_primitive_set_attributes +cogl_primitive_set_first_vertex +cogl_primitive_set_indices_EXP +cogl_primitive_set_mode +cogl_primitive_set_n_vertices_EXP +#endif + +cogl_program_attach_shader +cogl_program_get_uniform_location +cogl_program_link +cogl_program_ref +cogl_program_set_uniform_float +cogl_program_set_uniform_int +cogl_program_set_uniform_matrix +cogl_program_set_uniform_1f +cogl_program_set_uniform_1i + +#ifndef COGL_DISABLE_DEPRECATED +cogl_program_uniform_float +cogl_program_uniform_int +cogl_program_uniform_matrix +cogl_program_uniform_1f +cogl_program_uniform_1i +#endif + +cogl_program_unref +cogl_program_use + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_quaternion_copy +cogl_quaternion_dot_product +cogl_quaternion_equal +cogl_quaternion_free +cogl_quaternion_get_rotation_angle +cogl_quaternion_get_rotation_axis +cogl_quaternion_init +cogl_quaternion_init_from_angle_vector +cogl_quaternion_init_from_array +cogl_quaternion_init_from_euler +cogl_quaternion_init_from_x_rotation +cogl_quaternion_init_from_y_rotation +cogl_quaternion_init_from_z_rotation +cogl_quaternion_init_identity +cogl_quaternion_invert +cogl_quaternion_multiply +cogl_quaternion_nlerp +cogl_quaternion_normalize +cogl_quaternion_pow +cogl_quaternion_slerp +cogl_quaternion_squad +#endif + +#ifndef COGL_DISABLE_DEPRECATED +cogl_push_draw_buffer +#endif + +cogl_push_framebuffer +cogl_push_matrix +cogl_push_source +cogl_read_pixels +cogl_read_pixels_flags_get_type +cogl_rectangle +cogl_rectangles +cogl_rectangles_with_texture_coords +cogl_rectangle_with_multitexture_coords +cogl_rectangle_with_texture_coords + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_renderer_check_onscreen_template_EXP +cogl_renderer_connect_EXP +cogl_renderer_get_n_fragment_texture_units_EXP +#endif + +cogl_renderer_error_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_renderer_error_quark_EXP +cogl_renderer_get_winsys_id_EXP +cogl_renderer_new_EXP +cogl_renderer_set_winsys_id_EXP +#endif + +cogl_rotate +cogl_scale +cogl_set_backface_culling_enabled + +cogl_set_depth_test_enabled + +#ifndef COGL_DISABLE_DEPRECATED +cogl_set_draw_buffer +#endif + +cogl_set_fog +cogl_set_framebuffer +cogl_set_modelview_matrix +cogl_set_path ;this is COGL 1.0 API +cogl_set_projection_matrix +cogl_set_source +cogl_set_source_color +cogl_set_source_color4f +cogl_set_source_color4ub +cogl_set_source_texture +cogl_set_viewport +cogl_shader_compile +cogl_shader_get_info_log +cogl_shader_get_type +cogl_shader_is_compiled + +#ifndef COGL_DISABLE_DEPRECATED +cogl_shader_ref +#endif + +cogl_shader_source + +#ifndef COGL_DISABLE_DEPRECATED +cogl_shader_unref +#endif + +cogl_shader_type_get_type +cogl_sqrti + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_sub_texture_new_EXP + +cogl_swap_chain_new_EXP +cogl_swap_chain_set_has_alpha_EXP +cogl_swap_chain_set_length_EXP +#endif + +cogl_texture_error_quark +cogl_texture_flags_get_type +cogl_texture_get_data +cogl_texture_get_format +cogl_texture_get_gl_texture +cogl_texture_get_height +cogl_texture_get_max_waste +cogl_texture_get_rowstride +cogl_texture_get_width +cogl_texture_is_sliced +cogl_texture_new_from_bitmap + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_texture_new_from_buffer_EXP +#endif + +cogl_texture_new_from_data +cogl_texture_new_from_file +cogl_texture_new_from_foreign +cogl_texture_new_from_sub_texture +cogl_texture_new_with_size + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_texture_rectangle_new_with_size_EXP +#endif + +#ifndef COGL_DISABLE_DEPRECATED +cogl_texture_ref +#endif + +cogl_texture_set_region + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_texture_set_region_from_bitmap_EXP +#endif + +#ifndef COGL_DISABLE_DEPRECATED +cogl_texture_unref +#endif + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_texture_2d_new_from_data_EXP +cogl_texture_2d_new_from_foreign_EXP +cogl_texture_2d_new_with_size_EXP +cogl_texture_2d_sliced_new_with_size_EXP + +cogl_texture_3d_new_from_data_EXP +cogl_texture_3d_new_with_size_EXP +#endif + +cogl_transform +cogl_translate + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +cogl_vdraw_attributes +cogl_vdraw_indexed_attributes + +cogl_vector3_add_EXP +cogl_vector3_copy_EXP +cogl_vector3_cross_product_EXP +cogl_vector3_distance_EXP +cogl_vector3_divide_scalar_EXP +cogl_vector3_dot_product_EXP +cogl_vector3_equal_EXP +cogl_vector3_equal_with_epsilon_EXP +cogl_vector3_free_EXP +cogl_vector3_init_EXP +cogl_vector3_init_zero_EXP +cogl_vector3_invert_EXP +cogl_vector3_magnitude_EXP +cogl_vector3_multiply_scalar_EXP +cogl_vector3_normalize_EXP +cogl_vector3_subtract_EXP +#endif + +cogl_vertex_buffer_add +cogl_vertex_buffer_delete +cogl_vertex_buffer_disable +cogl_vertex_buffer_draw +cogl_vertex_buffer_draw_elements +cogl_vertex_buffer_enable +cogl_vertex_buffer_get_n_vertices +cogl_vertex_buffer_indices_get_for_quads +cogl_vertex_buffer_indices_get_type +cogl_vertex_buffer_indices_new +cogl_vertex_buffer_new + +#ifndef COGL_DISABLE_DEPRECATED +cogl_vertex_buffer_ref +#endif + +cogl_vertex_buffer_submit + +#ifndef COGL_DISABLE_DEPRECATED +cogl_vertex_buffer_unref +#endif + +cogl_vertices_mode_get_type + +#ifdef COGL_DISABLE_DEPRECATED +cogl_viewport +#endif + +cogl_winsys_feature_get_type + +#ifdef COGL_ENABLE_EXPERIMENTAL_API +#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT +cogl_wayland_renderer_get_compositor_EXP +cogl_wayland_renderer_get_display_EXP +cogl_wayland_texture_2d_new_from_buffer_EXP +#endif + +#ifdef COGL_HAS_WIN32_SUPPORT +cogl_win32_renderer_add_filter_EXP +cogl_win32_renderer_handle_event_EXP +cogl_win32_renderer_remove_filter_EXP +#endif + +#ifdef COGL_HAS_XLIB +cogl_xlib_get_display_EXP +cogl_xlib_handle_event_EXP +cogl_xlib_renderer_add_filter_EXP +cogl_xlib_renderer_get_display_EXP +cogl_xlib_renderer_get_foreign_display_EXP +cogl_xlib_renderer_handle_event_EXP +cogl_xlib_renderer_remove_filter_EXP +cogl_xlib_renderer_set_foreign_display_EXP +cogl_xlib_set_display_EXP +#endif +#endif + +#ifndef COGL_NO_EXPORT_UNDERSCORE +;probably these should not be exported at all, but anyways, for now... +;eventually, this section should disappear (or cogl, cogl-pango, clutter et al +;will link without the following) +_cogl_atlas_add_reorganize_callback +_cogl_atlas_copy_rectangle +_cogl_atlas_new +_cogl_atlas_remove +_cogl_atlas_remove_reorganize_callback +_cogl_atlas_reserve_space +_cogl_atlas_texture_add_reorganize_callback +_cogl_atlas_texture_new_from_bitmap +_cogl_atlas_texture_new_with_size +_cogl_atlas_texture_remove_reorganize_callback +_cogl_context_get_default +_cogl_error_quark +_cogl_handle_atlas_texture_get_type +_cogl_texture_associate_framebuffer +_cogl_texture_can_hardware_repeat +_cogl_texture_determine_internal_format +_cogl_texture_draw_and_read +_cogl_texture_ensure_non_quad_rendering +_cogl_texture_flush_journal_rendering +_cogl_texture_free +_cogl_texture_get_associated_framebuffers +_cogl_texture_get_gl_format +_cogl_texture_init +_cogl_texture_is_foreign +_cogl_texture_prepare_for_upload +_cogl_texture_prep_gl_alignment_for_pixels_upload +_cogl_texture_pre_paint +_cogl_texture_register_texture_type +_cogl_texture_set_filters +_cogl_texture_set_wrap_mode_parameters +_cogl_texture_transform_coords_to_gl +_cogl_texture_transform_quad_coords_to_gl +#endif \ No newline at end of file diff --git a/config.h.win32.in b/config.h.win32.in new file mode 100644 index 000000000..28dcce830 --- /dev/null +++ b/config.h.win32.in @@ -0,0 +1,162 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Can use Cogl 2.0 API internally */ +#define COGL_ENABLE_EXPERIMENTAL_2_0_API 1 + +/* Can use experimental API internally */ +#define COGL_ENABLE_EXPERIMENTAL_API 1 + +/* Cogl supports OpenGL using the WGL API */ +#define COGL_HAS_WIN32_SUPPORT 1 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#define ENABLE_NLS 1 + +/* The prefix for our gettext translation domains. */ +#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" + +/* Whether we have cairo or not */ +#define HAVE_CAIRO 1 + +/* Define to 1 if you have the header file. */ +/*#undef HAVE_CE4100_LIBGDL_H*/ + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/*#undef HAVE_CFLOCALECOPYCURRENT*/ + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/*#undef HAVE_CFPREFERENCESCOPYAPPVALUE*/ + +/* Have GL for rendering */ +#define HAVE_COGL_GL 1 + +/* Have GLES 1.1 for rendering */ +/*#undef HAVE_COGL_GLES*/ + +/* Have GLES 2.0 for rendering */ +/*#undef HAVE_COGL_GLES2*/ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#define HAVE_DCGETTEXT 1 + +/* Defined if the GL library shouldn't be dlopened */ +#define HAVE_DIRECTLY_LINKED_GL_LIBRARY 1 + +/* Define to 1 if you have the header file. */ +/*#undef HAVE_DLFCN_H*/ + +/* Have libdrm support */ +/*#undef HAVE_DRM*/ + +/* Define to 1 if you have the header file. */ +/*#undef HAVE_EGL_EGLEXT_H*/ + +/* Define to 1 if you have the header file. */ +/*#undef HAVE_EGL_EGL_H*/ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `ffs' function. */ +/*#undef HAVE_FFS*/ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#define HAVE_GETTEXT 1 + +/* Define to 1 if you have the header file. */ +/*#undef HAVE_GLES_EGL_H*/ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_INTTYPES_H 1 +#endif + +/* Define to 1 if you have the header file. */ +/*#undef HAVE_LIBGDL_H*/ + +/* Define to 1 if you have the `GL' library (-lGL). */ +#define HAVE_LIBGL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#if ((_MSC_VER >= 1600) || !defined(_MSC_VER)) +#define HAVE_STDINT_H 1 +#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. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_UNISTD_H 1 +#endif + +/* 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. */ +#ifdef _MSC_VER +#define NO_MINUS_C_MINUS_O 1 +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "cogl" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "cogl @COGL_VERSION@" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "cogl" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@COGL_VERSION@" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Use GdkPixbuf for loading image data */ +#define USE_GDKPIXBUF 1 + +/* Use internal image decoding for loading image data */ +/*#undef USE_INTERNAL*/ + +/* Use Core Graphics (Quartz) for loading image data */ +/*#undef USE_QUARTZ*/ + +/* Define to empty if `const' does not conform to ANSI C. */ +/*#undef const*/ + +#include "config-custom.h" diff --git a/configure.ac b/configure.ac index 60b948228..0f1786152 100644 --- a/configure.ac +++ b/configure.ac @@ -1022,6 +1022,11 @@ AC_SUBST(MAINTAINER_CFLAGS) AC_OUTPUT( Makefile README +config.h.win32 +build/Makefile +build/win32/Makefile +build/win32/vs9/Makefile +build/win32/vs10/Makefile cogl/Makefile cogl/cogl-1.0.pc cogl/cogl-2.0-experimental.pc diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 912f1681e..271026c9a 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -84,10 +84,13 @@ stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c echo " GEN $$unit"; \ ( echo "#!/bin/sh" ; echo "$(abs_builddir)/test-launcher.sh '$$i' \"\$$@\"" ) > $$unit$(SHEXT) ; \ ( echo "#!/bin/sh" ; echo "exec $(abs_builddir)/test-conformance$(EXEEXT) -p $$i \"\$$@\"" ) > wrappers/$$unit$(SHEXT) ; \ + ( echo "test-conformance-cogl$(EXEEXT) -p $$i" ) > $$unit.bat ; \ + ( echo "test-conformance-cogl$(EXEEXT) -p $$i" ) >> test-conformance-cogl.bat ; \ chmod +x $$unit$(SHEXT); \ chmod +x wrappers/$$unit$(SHEXT); \ echo "/$$unit$(SHEXT)" >> .gitignore; \ done \ + && cp *.bat $(top_builddir)/build/win32/ \ && echo timestamp > $(@F) clean-wrappers: @@ -99,6 +102,8 @@ clean-wrappers: rm -f wrappers/$$unit$(SHEXT) ; \ done \ && rm -f unit-tests \ + && rm -f $(top_builddir)/build/win32/*.bat \ + && rm -f *.bat \ && rm -f stamp-test-conformance # NB: BUILT_SOURCES here a misnomer. We aren't building source, just inserting @@ -238,6 +243,43 @@ HTML_REPORTS = \ EXTRA_DIST = test-launcher.sh.in run-tests.sh DISTCLEANFILES = test-launcher.sh .gitignore +dist-hook: ../../build/win32/vs9/test-conformance-cogl.vcproj ../../build/win32/vs10/test-conformance-cogl.vcxproj ../../build/win32/vs10/test-conformance-cogl.vcxproj.filters + +../../build/win32/vs9/test-conformance-cogl.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance-cogl.vcprojin + for F in $(test_conformance_SOURCES); do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >testconformance.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance-cogl.vcprojin >$@ + rm testconformance.sourcefiles + +../../build/win32/vs10/test-conformance-cogl.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxprojin + for F in $(test_conformance_SOURCES); do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >testconformance.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxprojin >$@ + rm testconformance.vs10.sourcefiles + +../../build/win32/vs10/test-conformance-cogl.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin + for F in $(test_conformance_SOURCES); do \ + case $$F in \ + *.c) echo ' Sources' \ + ;; \ + esac; \ + done >testconformance.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin >$@ + rm testconformance.vs10.sourcefiles.filters + +# Let the VS9/VS10 Project files be cleared out before they are re-expanded... +DISTCLEANFILES += ../../build/win32/vs9/test-conformance-cogl.vcproj \ + ../../build/win32/vs10/test-conformance-cogl.vcxproj \ + ../../build/win32/vs10/test-conformance-cogl.vcxproj.filters + # we override the clean-generic target to clean up the wrappers so # we cannot use CLEANFILES clean-generic: clean-wrappers