From c7472841b1df9880f89316ed5b8ad41cb31c9b8f Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 12 Jan 2016 11:23:09 -0500 Subject: [PATCH] win32: drop win32 support --- build/Makefile.am | 2 +- build/mingw/Makefile.am | 1 - build/mingw/README | 5 - build/mingw/mingw-fetch-dependencies.sh | 432 --------- build/win32/.gitignore | 1 - build/win32/Makefile.am | 3 - build/win32/vs10/Makefile.am | 50 - build/win32/vs10/README.txt | 98 -- .../vs10/cally-atkcomponent-example.vcxproj | 176 ---- ...cally-atkcomponent-example.vcxproj.filters | 26 - .../cally-atkeditabletext-example.vcxproj | 176 ---- ...ly-atkeditabletext-example.vcxproj.filters | 26 - .../vs10/cally-atkevents-example.vcxproj | 180 ---- .../cally-atkevents-example.vcxproj.filters | 26 - .../win32/vs10/cally-atktext-example.vcxproj | 176 ---- .../cally-atktext-example.vcxproj.filters | 25 - build/win32/vs10/cally-clone-example.vcxproj | 176 ---- .../vs10/cally-clone-example.vcxproj.filters | 26 - build/win32/vs10/clutter-build-defines.props | 69 -- build/win32/vs10/clutter-gen-srcs.props | 82 -- build/win32/vs10/clutter-install.props | 197 ---- build/win32/vs10/clutter-install.vcxproj | 181 ---- build/win32/vs10/clutter-version-paths.props | 57 -- build/win32/vs10/clutter.sln | 380 -------- build/win32/vs10/clutter.vcxproj.filtersin | 40 - build/win32/vs10/clutter.vcxprojin | 530 ----------- build/win32/vs10/test-cogl-perf.vcxproj | 170 ---- .../win32/vs10/test-cogl-perf.vcxproj.filters | 14 - ...test-interactive-clutter.vcxproj.filtersin | 12 - .../vs10/test-interactive-clutter.vcxprojin | 176 ---- .../vs10/test-picking-performance.vcxproj | 173 ---- .../test-picking-performance.vcxproj.filters | 23 - build/win32/vs10/test-picking.vcxproj | 171 ---- build/win32/vs10/test-picking.vcxproj.filters | 14 - build/win32/vs10/test-random-text.vcxproj | 170 ---- .../vs10/test-random-text.vcxproj.filters | 14 - .../test-state-hidden-performance.vcxproj | 173 ---- ...t-state-hidden-performance.vcxproj.filters | 23 - ...test-state-interactive-performance.vcxproj | 173 ---- ...te-interactive-performance.vcxproj.filters | 23 - .../vs10/test-state-mini-performance.vcxproj | 173 ---- ...est-state-mini-performance.vcxproj.filters | 23 - .../win32/vs10/test-state-performance.vcxproj | 173 ---- .../test-state-performance.vcxproj.filters | 23 - .../vs10/test-state-pick-performance.vcxproj | 173 ---- ...est-state-pick-performance.vcxproj.filters | 23 - .../vs10/test-text-perf-performance.vcxproj | 173 ---- ...test-text-perf-performance.vcxproj.filters | 23 - build/win32/vs10/test-text-perf.vcxproj | 170 ---- .../win32/vs10/test-text-perf.vcxproj.filters | 14 - build/win32/vs10/test-text.vcxproj | 170 ---- build/win32/vs10/test-text.vcxproj.filters | 14 - build/win32/vs9/Makefile.am | 29 - build/win32/vs9/README.txt | 97 -- .../vs9/cally-atkcomponent-example.vcproj | 169 ---- .../vs9/cally-atkeditabletext-example.vcproj | 167 ---- .../win32/vs9/cally-atkevents-example.vcproj | 171 ---- build/win32/vs9/cally-atktext-example.vcproj | 164 ---- build/win32/vs9/cally-clone-example.vcproj | 169 ---- build/win32/vs9/clutter-build-defines.vsprops | 62 -- build/win32/vs9/clutter-gen-srcs.vsprops | 67 -- build/win32/vs9/clutter-install.vcproj | 80 -- build/win32/vs9/clutter-install.vsprops | 182 ---- build/win32/vs9/clutter-version-paths.vsprops | 54 -- build/win32/vs9/clutter.sln | 455 --------- build/win32/vs9/clutter.vcprojin | 692 -------------- build/win32/vs9/test-cogl-perf.vcproj | 159 ---- .../vs9/test-interactive-clutter.vcprojin | 169 ---- .../win32/vs9/test-picking-performance.vcproj | 166 ---- build/win32/vs9/test-picking.vcproj | 160 ---- build/win32/vs9/test-random-text.vcproj | 159 ---- .../vs9/test-state-hidden-performance.vcproj | 166 ---- .../test-state-interactive-performance.vcproj | 166 ---- .../vs9/test-state-mini-performance.vcproj | 166 ---- build/win32/vs9/test-state-performance.vcproj | 166 ---- .../vs9/test-state-pick-performance.vcproj | 166 ---- .../vs9/test-text-perf-performance.vcproj | 166 ---- build/win32/vs9/test-text-perf.vcproj | 159 ---- build/win32/vs9/test-text.vcproj | 159 ---- clutter/Makefile.am | 139 --- clutter/clutter-backend.c | 14 - clutter/clutter-config.h.win32 | 18 - clutter/clutter-config.h.win32_GDK | 20 - clutter/clutter-main.c | 25 +- clutter/clutter-version.h.in | 20 +- clutter/config.h.win32.in | 153 ---- clutter/gdk/clutter-backend-gdk.c | 15 - clutter/gdk/clutter-stage-gdk.c | 11 - clutter/win32/clutter-backend-win32.c | 247 ----- clutter/win32/clutter-backend-win32.h | 79 -- clutter/win32/clutter-device-manager-win32.c | 180 ---- clutter/win32/clutter-device-manager-win32.h | 60 -- clutter/win32/clutter-event-win32.c | 754 --------------- clutter/win32/clutter-stage-win32.c | 865 ------------------ clutter/win32/clutter-stage-win32.h | 89 -- clutter/win32/clutter-win32.h | 63 -- clutter/win32/invisible-cursor.cur | Bin 86 -> 0 bytes clutter/win32/resources.rc | 1 - configure.ac | 91 +- tests/interactive/Makefile.am | 72 +- 100 files changed, 22 insertions(+), 13201 deletions(-) delete mode 100644 build/mingw/Makefile.am delete mode 100644 build/mingw/README delete mode 100755 build/mingw/mingw-fetch-dependencies.sh delete mode 100644 build/win32/.gitignore delete mode 100644 build/win32/Makefile.am delete mode 100644 build/win32/vs10/Makefile.am delete mode 100644 build/win32/vs10/README.txt delete mode 100644 build/win32/vs10/cally-atkcomponent-example.vcxproj delete mode 100644 build/win32/vs10/cally-atkcomponent-example.vcxproj.filters delete mode 100644 build/win32/vs10/cally-atkeditabletext-example.vcxproj delete mode 100644 build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters delete mode 100644 build/win32/vs10/cally-atkevents-example.vcxproj delete mode 100644 build/win32/vs10/cally-atkevents-example.vcxproj.filters delete mode 100644 build/win32/vs10/cally-atktext-example.vcxproj delete mode 100644 build/win32/vs10/cally-atktext-example.vcxproj.filters delete mode 100644 build/win32/vs10/cally-clone-example.vcxproj delete mode 100644 build/win32/vs10/cally-clone-example.vcxproj.filters delete mode 100644 build/win32/vs10/clutter-build-defines.props delete mode 100644 build/win32/vs10/clutter-gen-srcs.props delete mode 100644 build/win32/vs10/clutter-install.props delete mode 100644 build/win32/vs10/clutter-install.vcxproj delete mode 100644 build/win32/vs10/clutter-version-paths.props delete mode 100644 build/win32/vs10/clutter.sln delete mode 100644 build/win32/vs10/clutter.vcxproj.filtersin delete mode 100644 build/win32/vs10/clutter.vcxprojin delete mode 100644 build/win32/vs10/test-cogl-perf.vcxproj delete mode 100644 build/win32/vs10/test-cogl-perf.vcxproj.filters delete mode 100644 build/win32/vs10/test-interactive-clutter.vcxproj.filtersin delete mode 100644 build/win32/vs10/test-interactive-clutter.vcxprojin delete mode 100644 build/win32/vs10/test-picking-performance.vcxproj delete mode 100644 build/win32/vs10/test-picking-performance.vcxproj.filters delete mode 100644 build/win32/vs10/test-picking.vcxproj delete mode 100644 build/win32/vs10/test-picking.vcxproj.filters delete mode 100644 build/win32/vs10/test-random-text.vcxproj delete mode 100644 build/win32/vs10/test-random-text.vcxproj.filters delete mode 100644 build/win32/vs10/test-state-hidden-performance.vcxproj delete mode 100644 build/win32/vs10/test-state-hidden-performance.vcxproj.filters delete mode 100644 build/win32/vs10/test-state-interactive-performance.vcxproj delete mode 100644 build/win32/vs10/test-state-interactive-performance.vcxproj.filters delete mode 100644 build/win32/vs10/test-state-mini-performance.vcxproj delete mode 100644 build/win32/vs10/test-state-mini-performance.vcxproj.filters delete mode 100644 build/win32/vs10/test-state-performance.vcxproj delete mode 100644 build/win32/vs10/test-state-performance.vcxproj.filters delete mode 100644 build/win32/vs10/test-state-pick-performance.vcxproj delete mode 100644 build/win32/vs10/test-state-pick-performance.vcxproj.filters delete mode 100644 build/win32/vs10/test-text-perf-performance.vcxproj delete mode 100644 build/win32/vs10/test-text-perf-performance.vcxproj.filters delete mode 100644 build/win32/vs10/test-text-perf.vcxproj delete mode 100644 build/win32/vs10/test-text-perf.vcxproj.filters delete mode 100644 build/win32/vs10/test-text.vcxproj delete mode 100644 build/win32/vs10/test-text.vcxproj.filters delete mode 100644 build/win32/vs9/Makefile.am delete mode 100644 build/win32/vs9/README.txt delete mode 100644 build/win32/vs9/cally-atkcomponent-example.vcproj delete mode 100644 build/win32/vs9/cally-atkeditabletext-example.vcproj delete mode 100644 build/win32/vs9/cally-atkevents-example.vcproj delete mode 100644 build/win32/vs9/cally-atktext-example.vcproj delete mode 100644 build/win32/vs9/cally-clone-example.vcproj delete mode 100644 build/win32/vs9/clutter-build-defines.vsprops delete mode 100644 build/win32/vs9/clutter-gen-srcs.vsprops delete mode 100644 build/win32/vs9/clutter-install.vcproj delete mode 100644 build/win32/vs9/clutter-install.vsprops delete mode 100644 build/win32/vs9/clutter-version-paths.vsprops delete mode 100644 build/win32/vs9/clutter.sln delete mode 100644 build/win32/vs9/clutter.vcprojin delete mode 100644 build/win32/vs9/test-cogl-perf.vcproj delete mode 100644 build/win32/vs9/test-interactive-clutter.vcprojin delete mode 100644 build/win32/vs9/test-picking-performance.vcproj delete mode 100644 build/win32/vs9/test-picking.vcproj delete mode 100644 build/win32/vs9/test-random-text.vcproj delete mode 100644 build/win32/vs9/test-state-hidden-performance.vcproj delete mode 100644 build/win32/vs9/test-state-interactive-performance.vcproj delete mode 100644 build/win32/vs9/test-state-mini-performance.vcproj delete mode 100644 build/win32/vs9/test-state-performance.vcproj delete mode 100644 build/win32/vs9/test-state-pick-performance.vcproj delete mode 100644 build/win32/vs9/test-text-perf-performance.vcproj delete mode 100644 build/win32/vs9/test-text-perf.vcproj delete mode 100644 build/win32/vs9/test-text.vcproj delete mode 100644 clutter/clutter-config.h.win32 delete mode 100644 clutter/clutter-config.h.win32_GDK delete mode 100644 clutter/config.h.win32.in delete mode 100644 clutter/win32/clutter-backend-win32.c delete mode 100644 clutter/win32/clutter-backend-win32.h delete mode 100644 clutter/win32/clutter-device-manager-win32.c delete mode 100644 clutter/win32/clutter-device-manager-win32.h delete mode 100644 clutter/win32/clutter-event-win32.c delete mode 100644 clutter/win32/clutter-stage-win32.c delete mode 100644 clutter/win32/clutter-stage-win32.h delete mode 100644 clutter/win32/clutter-win32.h delete mode 100644 clutter/win32/invisible-cursor.cur delete mode 100644 clutter/win32/resources.rc diff --git a/build/Makefile.am b/build/Makefile.am index 16b50d407..8c902377b 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1 +1 @@ -SUBDIRS = autotools mingw win32 +SUBDIRS = autotools diff --git a/build/mingw/Makefile.am b/build/mingw/Makefile.am deleted file mode 100644 index dda135072..000000000 --- a/build/mingw/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = README mingw-fetch-dependencies.sh diff --git a/build/mingw/README b/build/mingw/README deleted file mode 100644 index 8ba008e12..000000000 --- a/build/mingw/README +++ /dev/null @@ -1,5 +0,0 @@ -The mingw-fetch-dependencies.sh script in this directory automates -fetching of the depndencies required to cross compile Clutter using -the MinGW compiler. For a description of how to use it, see: - - http://wiki.clutter-project.org/wiki/BuildingClutterOnWindows diff --git a/build/mingw/mingw-fetch-dependencies.sh b/build/mingw/mingw-fetch-dependencies.sh deleted file mode 100755 index 2fc9d304f..000000000 --- a/build/mingw/mingw-fetch-dependencies.sh +++ /dev/null @@ -1,432 +0,0 @@ -#!/bin/bash - -# This script will download and setup a cross compilation environment -# for targetting Win32 from Linux. It can also be used to build on -# Windows under the MSYS/MinGW environment. It will use the GTK -# binaries from Tor Lillqvist. - -TOR_URL="http://ftp.gnome.org/pub/gnome/binaries/win32"; - -TOR_BINARIES=( \ - gtk+/2.16/gtk+{-dev,}_2.16.6-2_win32.zip ); - -TOR_DEP_URL="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies"; - -ZLIB_VERSION=1.2.4-2 -FFI_VERSION=3.0.6 -GLIB_VERSION=2.34.3 -GLIB_MINOR_VERSION="${GLIB_VERSION%.*}" - -TOR_DEPS=( \ - cairo{-dev,}_1.10.0-2_win32.zip \ - gettext-runtime-{dev-,}0.17-1.zip \ - fontconfig{-dev,}_2.8.0-2_win32.zip \ - freetype{-dev,}_2.3.12-1_win32.zip \ - expat_2.0.1-1_win32.zip \ - libpng{-dev,}_1.4.0-1_win32.zip \ - zlib{-dev,}_${ZLIB_VERSION}_win32.zip \ - libffi{-dev,}_${FFI_VERSION}-1_win32.zip \ - gettext-runtime{-dev,}_0.18.1.1-2_win32.zip ); - -GNOME_SOURCES_URL="http://ftp.gnome.org/pub/GNOME/sources/" -SOURCES_DEPS=(\ - glib/${GLIB_MINOR_VERSION}/glib-${GLIB_VERSION}.tar.xz \ - cogl/1.14/cogl-1.14.0.tar.xz \ - json-glib/0.16/json-glib-0.16.0.tar.xz \ - atk/2.8/atk-2.8.0.tar.xz \ - pango/1.34/pango-1.34.1.tar.xz ); - -GL_HEADER_URLS=( \ - http://cgit.freedesktop.org/mesa/mesa/plain/include/GL/gl.h \ - http://www.opengl.org/registry/api/glext.h ); - -GL_HEADERS=( gl.h glext.h ); - -CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=automake.git;a=blob_plain;f=lib/config.guess" - -function download_file () -{ - local url="$1"; shift; - local filename="$1"; shift; - - if test -f "$DOWNLOAD_DIR/$filename"; then - echo "Skipping download of $filename because the file already exists"; - return 0; - fi; - - case "$DOWNLOAD_PROG" in - curl) - curl -o "$DOWNLOAD_DIR/$filename" "$url"; - ;; - *) - $DOWNLOAD_PROG -O "$DOWNLOAD_DIR/$filename" "$url"; - ;; - esac; - - if [ $? -ne 0 ]; then - echo "Downloading ${url} failed."; - exit 1; - fi; -} - -function guess_dir () -{ - local var="$1"; shift; - local suffix="$1"; shift; - local msg="$1"; shift; - local prompt="$1"; shift; - local dir="${!var}"; - - if [ -z "$dir" ]; then - echo "Please enter ${msg}."; - dir="$PWD/$suffix"; - read -r -p "$prompt [$dir] "; - if [ -n "$REPLY" ]; then - dir="$REPLY"; - fi; - fi; - - eval $var="\"$dir\""; - - if [ ! -d "$dir" ]; then - if ! mkdir -p "$dir"; then - echo "Error making directory $dir"; - exit 1; - fi; - fi; -} - -function y_or_n () -{ - local prompt="$1"; shift; - - while true; do - read -p "${prompt} [y/n] " -n 1; - echo; - case "$REPLY" in - y) return 0 ;; - n) return 1 ;; - *) echo "Please press y or n" ;; - esac; - done; -} - -function do_unzip () -{ - do_unzip_d "$ROOT_DIR" "$@"; -} - -function do_unzip_d () -{ - local exdir="$1"; shift; - local zipfile="$1"; shift; - - unzip -o -q -d "$exdir" "$zipfile" "$@"; - - if [ "$?" -ne 0 ]; then - echo "Failed to extract $zipfile"; - exit 1; - fi; -} - -function do_untar_source () -{ - do_untar_source_d "$BUILD_DIR" "$@"; -} - -function do_untar_source_d () -{ - local exdir="$1"; shift; - local tarfile="$1"; shift; - - tar -C "$exdir" -axvf "$tarfile" "$@"; - - if [ "$?" -ne 0 ]; then - echo "Failed to extract $tarfile"; - exit 1; - fi; -} - -function add_env () -{ - echo "export $1=\"$2\"" >> $env_file; -} - -function find_compiler () -{ - local gccbin fullpath; - - if [ -z "$MINGW_TOOL_PREFIX" ]; then - for gccbin in i{3,4,5,6}86{-pc,}-mingw32{,msvc}-gcc; do - fullpath="`which $gccbin 2>/dev/null`"; - if [ "$?" -eq 0 ]; then - MINGW_TOOL_PREFIX="${fullpath%%gcc}"; - break; - fi; - done; - if [ -z "$MINGW_TOOL_PREFIX" ]; then - echo; - echo "No suitable cross compiler was found."; - echo; - echo "If you already have a compiler installed,"; - echo "please set the MINGW_TOOL_PREFIX variable"; - echo "to point to its location without the"; - echo "gcc suffix (eg: \"/usr/bin/i386-mingw32-\")."; - echo; - echo "If you are using Ubuntu, you can install a"; - echo "compiler by typing:"; - echo; - echo " sudo apt-get install mingw32"; - echo; - echo "Otherwise you can try following the instructions here:"; - echo; - echo " http://www.libsdl.org/extras/win32/cross/README.txt"; - - exit 1; - fi; - fi; - - TARGET="${MINGW_TOOL_PREFIX##*/}"; - TARGET="${TARGET%%-}"; - - echo "Using compiler ${MINGW_TOOL_PREFIX}gcc and target $TARGET"; -} - -function generate_pc_file () -{ - local pcfile="$1"; shift; - local libs="$1"; shift; - local version="$1"; shift; - local include="$1"; shift; - local bn=`basename "$pcfile"`; - - if test -z "$include"; then - include="\${prefix}/include"; - fi; - - if ! test -f "$pcfile"; then - cat > "$pcfile" < "$x.tmp"; - mv "$x.tmp" "$x"; -done; - -# The Pango FT pc file hardcodes the include path for freetype, so it -# needs to be fixed separately -sed -e 's/^Cflags:.*$/Cflags: -I${includedir}\/pango-1.0 -I${includedir}\/freetype2/' \ - -e 's/^\(Libs:.*\)$/\1 -lfreetype -lfontconfig/' \ - < "$ROOT_DIR/lib/pkgconfig/pangoft2.pc" \ - > "$ROOT_DIR/lib/pkgconfig/pangoft2.pc.tmp"; -mv "$ROOT_DIR/lib/pkgconfig/pangoft2.pc"{.tmp,}; - -echo "Copying GL headers..."; -if ! ( test -d "$ROOT_DIR/include/GL" || \ - mkdir "$ROOT_DIR/include/GL" ); then - echo "Failed to create GL header directory"; - exit 1; -fi; -for header in "${GL_HEADERS[@]}"; do - if ! cp "$DOWNLOAD_DIR/$header" "$ROOT_DIR/include/GL/"; then - echo "Failed to copy $header"; - exit 1; - fi; -done; - -# We need pkg-config files for zlib and ffi to build glib. The -# prepackaged binaries from tml doesn't seem to include them so we'll -# just generate it manually. -generate_pc_file "$ROOT_DIR/lib/pkgconfig/zlib.pc" "-lz" "$ZLIB_VERSION" -generate_pc_file "$ROOT_DIR/lib/pkgconfig/libffi.pc" "-lffi" "$FFI_VERSION" \ - "${ROOT_DIR}/lib/libffi-${FFI_VERSION}/include" - -RUN_PKG_CONFIG="$BUILD_DIR/run-pkg-config.sh"; - -echo "Generating $BUILD_DIR/run-pkg-config.sh"; - -cat > "$RUN_PKG_CONFIG" <\vs10\\include\GL). - -Please see the README file in the root directory of this Clutter 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 & ATK have -VS10 project files in the latest stable versions, GDK-Pixbuf have VS10 project files -in the latest unstable version, and Cogl, JSON-GLib 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 --ATK --GDK-Pixbuf --JSON-GLib --Cogl - (Note that Pango, ATK, GDK-Pixbuf and JSON-GLib are not dependent on each - other, so building them in any order will do) - -Note that a working PERL installation (such as ActiveState or Strawberry PERL) -is also required for compilation of Clutter, as the glib-mkenums PERL utility -script available from the GLib package will be used. Please ensure that the -PERL interpretor is in your PATH. If a glib-mkenums script is not available, -please extract glib-mkenums.in from the gobject subdirectory of the -GLib source package, and change the lines and save as glib-mkenums in -\vs10\\bin: - -#! @PERL_PATH@ (circa line 1) -to -#! c:/perl/bin (or whereever your PERL interpretor executable is) - --and- - -print "glib-mkenums version glib-@GLIB_VERSION@\n"; -to -print "glib-mkenums version glib-\n"; - -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 Clutter headers into -\vs10\\include\clutter-1.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) - -Note: If you see C4819 warnings and you are compiling Clutter on a DBCS -(Chinese/Korean/Japanese) version of Windows, you may need to switch -to an English locale in Control Panel->Region and Languages->System-> -Change System Locale, reboot and rebuild to ensure Clutter and its -dependencies are built correctly. This is due to a bug in Visual C++ -running on DBCS locales. - ---Chun-wei Fan - (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist) diff --git a/build/win32/vs10/cally-atkcomponent-example.vcxproj b/build/win32/vs10/cally-atkcomponent-example.vcxproj deleted file mode 100644 index a5d3471b2..000000000 --- a/build/win32/vs10/cally-atkcomponent-example.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E} - callyatkcomponentexample - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters b/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters deleted file mode 100644 index 94e8fae66..000000000 --- a/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {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 - - - - - Sources - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj b/build/win32/vs10/cally-atkeditabletext-example.vcxproj deleted file mode 100644 index 7c6607d8c..000000000 --- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2D1AD595-270B-4B38-9475-A269E225C10C} - callyatkeditabletextexample - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters b/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters deleted file mode 100644 index 3d06352dd..000000000 --- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {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 - - - - - Sources - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj b/build/win32/vs10/cally-atkevents-example.vcxproj deleted file mode 100644 index 0528086aa..000000000 --- a/build/win32/vs10/cally-atkevents-example.vcxproj +++ /dev/null @@ -1,180 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4} - callyatkeventsexample - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\..\clutter;%(AdditionalIncludeDirectories) - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - ..\..\..\clutter;%(AdditionalIncludeDirectories) - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - ..\..\..\clutter;%(AdditionalIncludeDirectories) - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - ..\..\..\clutter;%(AdditionalIncludeDirectories) - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj.filters b/build/win32/vs10/cally-atkevents-example.vcxproj.filters deleted file mode 100644 index dec13f824..000000000 --- a/build/win32/vs10/cally-atkevents-example.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {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 - - - - - Sources - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/cally-atktext-example.vcxproj b/build/win32/vs10/cally-atktext-example.vcxproj deleted file mode 100644 index 4b3192b81..000000000 --- a/build/win32/vs10/cally-atktext-example.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {27BA2900-A28A-4869-B16D-FBE581A12402} - callyatktextexample - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/cally-atktext-example.vcxproj.filters b/build/win32/vs10/cally-atktext-example.vcxproj.filters deleted file mode 100644 index bda5036e5..000000000 --- a/build/win32/vs10/cally-atktext-example.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {c99341e3-ca4d-4c6d-869b-7d96b65b5eed} - - - - - Sources - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/cally-clone-example.vcxproj b/build/win32/vs10/cally-clone-example.vcxproj deleted file mode 100644 index ebec1689a..000000000 --- a/build/win32/vs10/cally-clone-example.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E77D40D0-19D4-4865-BE20-B6DA05BA234D} - callycloneexample - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(CallyTestDefs);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - $(CallyTestDefs);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - gmodule-2.0.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/cally-clone-example.vcxproj.filters b/build/win32/vs10/cally-clone-example.vcxproj.filters deleted file mode 100644 index 81284881e..000000000 --- a/build/win32/vs10/cally-clone-example.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {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 - - - - - Sources - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/clutter-build-defines.props b/build/win32/vs10/clutter-build-defines.props deleted file mode 100644 index 605071b06..000000000 --- a/build/win32/vs10/clutter-build-defines.props +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - _WIN32_WINNT=0x0501 - HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;DLL_EXPORT - $(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG - $(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS - $(BaseWinBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc";COGL_DISABLE_DEPRECATION_WARNINGS - CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS - SDL_MAIN_HANDLED - $(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain) - $(BaseWinBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data";TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data";$(AvoidSDLMain) - $(TestProgDef);$(ClutterDisableDeprecationWarnings) - - - <_PropertySheetDisplayName>clutterbuilddefinesprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - ..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) - G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - %(DisableSpecificWarnings) - true - /d2Zi+ %(AdditionalOptions) - - - cogl-pango-1.0.lib;cogl-path-1.0.lib;cogl-1.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies) - $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - - - - - $(BaseWinBuildDef) - - - $(LibBuildDefines) - - - $(DebugLibBuildDefines) - - - $(ReleaseLibBuildDefines) - - - $(ClutterBuildDefines) - - - $(ClutterDisableDeprecationWarnings) - - - $(AvoidSDLMain) - - - $(CallyTestDefs) - - - $(TestProgDef) - - - $(TestPerfProgDef) - - - diff --git a/build/win32/vs10/clutter-gen-srcs.props b/build/win32/vs10/clutter-gen-srcs.props deleted file mode 100644 index 9d8e8b8b7..000000000 --- a/build/win32/vs10/clutter-gen-srcs.props +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h - -if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H - -if exist clutter.bld.GDK.win32 del clutter.bld.GDK.win32 - -copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32 - -copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h - - -:DONE_CLUTTER_CONFIG_H - - -if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H - -if exist clutter.bld.win32.win32 del clutter.bld.win32.win32 - -copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32 - -copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h - - -:DONE_CLUTTER_CONFIG_H - - -$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header ..\..\..\clutter\clutter-marshal.list > ..\..\..\clutter\clutter-marshal.h - - -echo #include "clutter-marshal.h" > ..\..\..\clutter\clutter-marshal.c - -$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body ..\..\..\clutter\clutter-marshal.list >> ..\..\..\clutter\clutter-marshal.c - - ..\..\..\clutter\clutter-action.h ..\..\..\clutter\clutter-actor-meta.h ..\..\..\clutter\clutter-actor.h ..\..\..\clutter\clutter-align-constraint.h ..\..\..\clutter\clutter-animatable.h ..\..\..\clutter\clutter-backend.h ..\..\..\clutter\clutter-bind-constraint.h ..\..\..\clutter\clutter-binding-pool.h ..\..\..\clutter\clutter-bin-layout.h ..\..\..\clutter\clutter-blur-effect.h ..\..\..\clutter\clutter-box-layout.h ..\..\..\clutter\clutter-brightness-contrast-effect.h ..\..\..\clutter\clutter-cairo.h ..\..\..\clutter\clutter-canvas.h ..\..\..\clutter\clutter-child-meta.h ..\..\..\clutter\clutter-click-action.h ..\..\..\clutter\clutter-cogl-compat.h ..\..\..\clutter\clutter-clone.h ..\..\..\clutter\clutter-color-static.h ..\..\..\clutter\clutter-color.h ..\..\..\clutter\clutter-colorize-effect.h ..\..\..\clutter\clutter-constraint.h ..\..\..\clutter\clutter-container.h ..\..\..\clutter\clutter-content.h ..\..\..\clutter\clutter-deform-effect.h ..\..\..\clutter\clutter-deprecated.h ..\..\..\clutter\clutter-desaturate-effect.h ..\..\..\clutter\clutter-device-manager.h ..\..\..\clutter\clutter-drag-action.h ..\..\..\clutter\clutter-drop-action.h ..\..\..\clutter\clutter-effect.h ..\..\..\clutter\clutter-enums.h ..\..\..\clutter\clutter-event.h ..\..\..\clutter\clutter-feature.h ..\..\..\clutter\clutter-fixed-layout.h ..\..\..\clutter\clutter-flow-layout.h ..\..\..\clutter\clutter-gesture-action.h ..\..\..\clutter\clutter-grid-layout.h ..\..\..\clutter\clutter-group.h ..\..\..\clutter\clutter-image.h ..\..\..\clutter\clutter-input-device.h ..\..\..\clutter\clutter-interval.h ..\..\..\clutter\clutter-keyframe-transition.h ..\..\..\clutter\clutter-keysyms.h ..\..\..\clutter\clutter-layout-manager.h ..\..\..\clutter\clutter-layout-meta.h ..\..\..\clutter\clutter-list-model.h ..\..\..\clutter\clutter-macros.h ..\..\..\clutter\clutter-main.h ..\..\..\clutter\clutter-model.h ..\..\..\clutter\clutter-offscreen-effect.h ..\..\..\clutter\clutter-page-turn-effect.h ..\..\..\clutter\clutter-paint-nodes.h ..\..\..\clutter\clutter-paint-node.h ..\..\..\clutter\clutter-pan-action.h ..\..\..\clutter\clutter-path-constraint.h ..\..\..\clutter\clutter-path.h ..\..\..\clutter\clutter-property-transition.h ..\..\..\clutter\clutter-rotate-action.h ..\..\..\clutter\clutter-script.h ..\..\..\clutter\clutter-scriptable.h ..\..\..\clutter\clutter-scroll-actor.h ..\..\..\clutter\clutter-settings.h ..\..\..\clutter\clutter-shader-effect.h ..\..\..\clutter\clutter-shader-types.h ..\..\..\clutter\clutter-swipe-action.h ..\..\..\clutter\clutter-snap-constraint.h ..\..\..\clutter\clutter-stage.h ..\..\..\clutter\clutter-stage-manager.h ..\..\..\clutter\clutter-tap-action.h ..\..\..\clutter\clutter-test-utils.h ..\..\..\clutter\clutter-texture.h ..\..\..\clutter\clutter-text.h ..\..\..\clutter\clutter-text-buffer.h ..\..\..\clutter\clutter-timeline.h ..\..\..\clutter\clutter-transition-group.h ..\..\..\clutter\clutter-transition.h ..\..\..\clutter\clutter-types.h ..\..\..\clutter\clutter-units.h ..\..\..\clutter\clutter-zoom-action.h ..\..\..\clutter\win32\clutter-win32.h - ..\..\..\clutter\gdk\clutter-gdk.h - perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) > ..\..\..\clutter\clutter-enum-types.h - perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) > ..\..\..\clutter\clutter-enum-types.c - perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) > ..\..\..\clutter\clutter-enum-types.h - perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) > ..\..\..\clutter\clutter-enum-types.c - - - <_PropertySheetDisplayName>cluttergensrcsprops - - - - $(CopyConfigH) - - - $(CopyClutterConfigH) - - - $(CopyClutterConfigGDKH) - - - $(GenMarshalSrc) - - - $(EnumHeaders) - - - $(GdkEnumHeader) - - - $(GenEnumsSrcC) - - - $(GenEnumsSrcC) - - - $(GenEnumsSrcGDKH) - - - $(GenEnumsSrcGDKC) - - - diff --git a/build/win32/vs10/clutter-install.props b/build/win32/vs10/clutter-install.props deleted file mode 100644 index 18233da29..000000000 --- a/build/win32/vs10/clutter-install.props +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(ClutterDllPrefix)clutter(ClutterDllSuffix).dll - $(BinDir)\cally-atkcomponent-example.exe;$(BinDir)\cally-atkeditabletext-example.exe;$(BinDir)\cally-atkevents-example.exe;$(BinDir)\cally-atktext-example.exe;$(BinDir)\cally-clone-example.exe;$(BinDir)\test-cogl-perf.exe;$(BinDir)\test-interactive-clutter.exe;$(BinDir)\test-picking-performance.exe;$(BinDir)\test-picking.exe;$(BinDir)\test-random-text.exe;$(BinDir)\test-state-hidden-performance.exe;$(BinDir)\test-state-interactive-performance.exe;$(BinDir)\test-state-mini-performance.exe;$(BinDir)\test-state-performance.exe;$(BinDir)\test-state-pick-performance.exe;$(BinDir)\test-text-perf-performance.exe;$(BinDir)\test-text-perf.exe;$(BinDir)\test-text.exe - -mkdir $(CopyDir) -mkdir $(CopyDir)\bin -mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data - -copy $(BinDir)\$(ClutterDllPrefix)clutter$(ClutterDllSuffix).dll $(CopyDir)\bin -copy $(BinDir)\$(ClutterDllPrefix)clutter$(ClutterDllSuffix).pdb $(CopyDir)\bin - -copy ..\..\..\tests\interactive\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data -copy ..\..\..\tests\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data -copy ..\..\..\tests\interactive\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data - -mkdir $(CopyDir)\lib -copy $(BinDir)\clutter-$(ApiVersion).lib $(CopyDir)\lib - -mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32 - -if "$(Configuration)" == "Release" goto DO_INSTALL_COMMON_HEADERS -if "$(Configuration)" == "Debug" goto DO_INSTALL_COMMON_HEADERS - -$(ClutterDoInstallGDK) - -:DO_INSTALL_COMMON_HEADERS -copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-grid-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-keyframe-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-rotate-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-scroll-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-tap-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-test-utils.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-transition-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\clutter-zoom-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter -copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32 - -mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-alpha.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-animation.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-animator.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-behaviour.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-media.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-state.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-table-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated -copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated - -mkdir $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\cally -copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ApiVersion)\cally - - -mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk -copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk - - - - <_PropertySheetDisplayName>clutterinstallprops - - - - $(BinDir) - - - $(InstalledDlls) - - - $(InstalledBins) - - - $(ClutterDoInstall) - - - $(ClutterDoInstallGDK) - - - diff --git a/build/win32/vs10/clutter-install.vcxproj b/build/win32/vs10/clutter-install.vcxproj deleted file mode 100644 index 9aded8b5d..000000000 --- a/build/win32/vs10/clutter-install.vcxproj +++ /dev/null @@ -1,181 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {35B2A4AC-7235-4FC7-995D-469D59195041} - clutterinstall - - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - - - - - - - - - - - - Installing Build Results... - $(ClutterDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(ClutterDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(ClutterDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(ClutterDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - - - - - {4b2c0ee0-f1bd-499c-acad-260cf14c352e} - false - - - {2d1ad595-270b-4b38-9475-a269e225c10c} - false - - - {c8ec4ce0-9c6a-4733-a0dd-477689faf5f4} - false - - - {27ba2900-a28a-4869-b16d-fbe581a12402} - false - - - {e77d40d0-19d4-4865-be20-b6da05ba234d} - false - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - {0da94d83-b64e-40ac-8074-96c2416bbbe8} - false - - - {75f9e5af-040c-448e-96be-c282efffe2d9} - false - - - {2035d56a-e748-475f-b3d5-c123bf652143} - false - - - {f433db3c-1223-489a-ad0c-c64b09f51139} - false - - - {b8849c58-6773-453c-a2e5-00f02ee20b18} - false - - - {2d60135e-2e37-4f54-a1c5-43bcd5bbba4f} - false - - - {011f9197-f986-44bd-a8f2-045c746b1b70} - false - - - {d4a09850-e35b-4124-a9ff-784ab5bbcd2c} - false - - - {bee86058-b4bf-4aa5-91bf-e3620538ed5e} - false - - - {0c1e8e6c-1563-4f95-a994-6366ee992cb3} - false - - - {8af1ea8e-305b-42c0-919d-12b1843b21a4} - false - - - {f072974f-6675-4a79-96ff-0b0deb113aa4} - false - - - {b0a69c4a-4e54-45e8-b7e4-b8b2d49e30fc} - false - - - - - - diff --git a/build/win32/vs10/clutter-version-paths.props b/build/win32/vs10/clutter-version-paths.props deleted file mode 100644 index 997854e49..000000000 --- a/build/win32/vs10/clutter-version-paths.props +++ /dev/null @@ -1,57 +0,0 @@ - - - - 10 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - 1.0 - $(GlibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - lib - -$(ApiVersion)-0 - - -1-vs$(VSVer) - - $(ClutterSeparateVSDllPrefix) - $(ClutterSeparateVSDllSuffix) - - - <_PropertySheetDisplayName>clutterversionpathsprops - - - - $(VSVer) - - - $(GlibEtcInstallRoot) - - - $(CopyDir) - - - $(DefDir) - - - $(ApiVersion) - - - $(ClutterLibtoolCompatibleDllPrefix) - - - $(ClutterLibtoolCompatibleDllSuffix) - - - $(ClutterSeparateVSDllPrefix) - - - $(ClutterSeparateVSDllSuffix) - - - $(ClutterDllPrefix) - - - $(ClutterDllSuffix) - - - diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln deleted file mode 100644 index c5f0064b9..000000000 --- a/build/win32/vs10/clutter.sln +++ /dev/null @@ -1,380 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter", "clutter.vcxproj", "{EA036190-0950-4640-84F9-D459A33B33A8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking", "test-picking.vcxproj", "{F433DB3C-1223-489A-AD0C-C64B09F51139}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-cogl-perf", "test-cogl-perf.vcxproj", "{0DA94D83-B64E-40AC-8074-96C2416BBBE8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-random-text", "test-random-text.vcxproj", "{B8849C58-6773-453C-A2E5-00F02EE20B18}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text", "test-text.vcxproj", "{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf", "test-text-perf.vcxproj", "{F072974F-6675-4A79-96FF-0B0DEB113AA4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf-performance", "test-text-perf-performance.vcxproj", "{8AF1EA8E-305B-42C0-919D-12B1843B21A4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-pick-performance", "test-state-pick-performance.vcxproj", "{0C1E8E6C-1563-4F95-A994-6366EE992CB3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-mini-performance", "test-state-mini-performance.vcxproj", "{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-interactive-performance", "test-state-interactive-performance.vcxproj", "{011F9197-F986-44BD-A8F2-045C746B1B70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-hidden-performance", "test-state-hidden-performance.vcxproj", "{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-performance", "test-state-performance.vcxproj", "{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking-performance", "test-picking-performance.vcxproj", "{2035D56A-E748-475F-B3D5-C123BF652143}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atktext-example", "cally-atktext-example.vcxproj", "{27BA2900-A28A-4869-B16D-FBE581A12402}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkcomponent-example", "cally-atkcomponent-example.vcxproj", "{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkeditabletext-example", "cally-atkeditabletext-example.vcxproj", "{2D1AD595-270B-4B38-9475-A269E225C10C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkevents-example", "cally-atkevents-example.vcxproj", "{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcxproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter-install", "clutter-install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_GDK|Win32 = Debug_GDK|Win32 - Debug_GDK|x64 = Debug_GDK|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_GDK|Win32 = Release_GDK|Win32 - Release_GDK|x64 = Release_GDK|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.Build.0 = Debug_GDK|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|Win32.Build.0 = Debug|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|x64.ActiveCfg = Debug|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|x64.Build.0 = Debug|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.Build.0 = Release_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.ActiveCfg = Release_GDK|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.Build.0 = Release_GDK|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|Win32.ActiveCfg = Release|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|Win32.Build.0 = Release|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.ActiveCfg = Release|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.Build.0 = Release|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.Build.0 = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.ActiveCfg = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.Build.0 = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|x64.ActiveCfg = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|x64.Build.0 = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.Build.0 = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.ActiveCfg = Release|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.Build.0 = Release|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|Win32.ActiveCfg = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|Win32.Build.0 = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|x64.ActiveCfg = Release|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|x64.Build.0 = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.Build.0 = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|Win32.Build.0 = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|x64.ActiveCfg = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|x64.Build.0 = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.Build.0 = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.ActiveCfg = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.Build.0 = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|Win32.ActiveCfg = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|Win32.Build.0 = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|x64.ActiveCfg = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|x64.Build.0 = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.Build.0 = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|Win32.ActiveCfg = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|Win32.Build.0 = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|x64.ActiveCfg = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|x64.Build.0 = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.Build.0 = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.ActiveCfg = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.Build.0 = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|Win32.ActiveCfg = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|Win32.Build.0 = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|x64.ActiveCfg = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|x64.Build.0 = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.Build.0 = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|Win32.Build.0 = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|x64.ActiveCfg = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|x64.Build.0 = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.Build.0 = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.ActiveCfg = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.Build.0 = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|Win32.ActiveCfg = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|Win32.Build.0 = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|x64.ActiveCfg = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|x64.Build.0 = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.Build.0 = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|Win32.ActiveCfg = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|Win32.Build.0 = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|x64.ActiveCfg = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|x64.Build.0 = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.Build.0 = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.ActiveCfg = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.Build.0 = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|Win32.ActiveCfg = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|Win32.Build.0 = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.ActiveCfg = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.Build.0 = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.Build.0 = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.Build.0 = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.ActiveCfg = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.Build.0 = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.Build.0 = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.ActiveCfg = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.Build.0 = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.ActiveCfg = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.Build.0 = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.ActiveCfg = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.Build.0 = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.Build.0 = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.Build.0 = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.ActiveCfg = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.Build.0 = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.Build.0 = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.ActiveCfg = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.Build.0 = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.ActiveCfg = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.Build.0 = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.ActiveCfg = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.Build.0 = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.Build.0 = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.ActiveCfg = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.Build.0 = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.ActiveCfg = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.Build.0 = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.Build.0 = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.ActiveCfg = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.Build.0 = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.ActiveCfg = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.Build.0 = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.ActiveCfg = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.Build.0 = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.Build.0 = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.ActiveCfg = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.Build.0 = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.ActiveCfg = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.Build.0 = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.Build.0 = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.ActiveCfg = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.Build.0 = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.ActiveCfg = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.Build.0 = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.ActiveCfg = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.Build.0 = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.Build.0 = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.ActiveCfg = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.Build.0 = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.ActiveCfg = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.Build.0 = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.Build.0 = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.ActiveCfg = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.Build.0 = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.ActiveCfg = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.Build.0 = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.ActiveCfg = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.Build.0 = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.Build.0 = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.Build.0 = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.ActiveCfg = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.Build.0 = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.Build.0 = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.ActiveCfg = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.Build.0 = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.ActiveCfg = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.Build.0 = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.ActiveCfg = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.Build.0 = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.Build.0 = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.ActiveCfg = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.Build.0 = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.ActiveCfg = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.Build.0 = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.Build.0 = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.ActiveCfg = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.Build.0 = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.ActiveCfg = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.Build.0 = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.ActiveCfg = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.Build.0 = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.Build.0 = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.ActiveCfg = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.Build.0 = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|x64.ActiveCfg = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|x64.Build.0 = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.Build.0 = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.ActiveCfg = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.Build.0 = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|Win32.ActiveCfg = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|Win32.Build.0 = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|x64.ActiveCfg = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|x64.Build.0 = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.Build.0 = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|Win32.ActiveCfg = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|Win32.Build.0 = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|x64.ActiveCfg = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|x64.Build.0 = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.Build.0 = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.ActiveCfg = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.Build.0 = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|Win32.ActiveCfg = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|Win32.Build.0 = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|x64.ActiveCfg = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|x64.Build.0 = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.Build.0 = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|Win32.ActiveCfg = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|Win32.Build.0 = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|x64.ActiveCfg = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|x64.Build.0 = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.Build.0 = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.ActiveCfg = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.Build.0 = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|Win32.ActiveCfg = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|Win32.Build.0 = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|x64.ActiveCfg = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|x64.Build.0 = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.Build.0 = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|Win32.Build.0 = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|x64.ActiveCfg = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|x64.Build.0 = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.Build.0 = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.ActiveCfg = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.Build.0 = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|Win32.ActiveCfg = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|Win32.Build.0 = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|x64.ActiveCfg = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|x64.Build.0 = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.Build.0 = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|Win32.ActiveCfg = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|Win32.Build.0 = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|x64.ActiveCfg = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|x64.Build.0 = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.Build.0 = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.ActiveCfg = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.Build.0 = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.ActiveCfg = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.Build.0 = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.ActiveCfg = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.Build.0 = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.Build.0 = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.ActiveCfg = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.Build.0 = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|x64.ActiveCfg = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|x64.Build.0 = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.Build.0 = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|x64.ActiveCfg = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|x64.Build.0 = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.ActiveCfg = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.Build.0 = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.ActiveCfg = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.Build.0 = Release|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|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_GDK|Win32.ActiveCfg = Release|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|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/clutter.vcxproj.filtersin b/build/win32/vs10/clutter.vcxproj.filtersin deleted file mode 100644 index 17be4902a..000000000 --- a/build/win32/vs10/clutter.vcxproj.filtersin +++ /dev/null @@ -1,40 +0,0 @@ - - - - - {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 - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "clutter.vs10.sourcefiles.filters" - Sources - Sources - Sources - Sources - Sources - Sources - Sources - - - Resource Files - Resource Files - Resource Files - Resource Files - Resource Files - Resource Files - - - - Resource Files - - - diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin deleted file mode 100644 index b89afda58..000000000 --- a/build/win32/vs10/clutter.vcxprojin +++ /dev/null @@ -1,530 +0,0 @@ - - - - - Debug - Win32 - - - Debug_GDK - Win32 - - - Debug - x64 - - - Debug_GDK - x64 - - - Release - Win32 - - - Release_GDK - Win32 - - - Release - x64 - - - Release_GDK - x64 - - - - {EA036190-0950-4640-84F9-D459A33B33A8} - clutter - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - Debug\$(Platform)\bin\ - true - true - Debug\$(Platform)\bin\ - false - false - Release\$(Platform)\bin\ - true - true - Release\$(Platform)\bin\ - - - - $(DoConfigs) - - - Disabled - ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - MachineX86 - - - - - $(DoConfigs) - - - Disabled - ..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - MachineX86 - - - - - $(DoConfigs) - - - Disabled - ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - MachineX64 - - - - - $(DoConfigs) - - - Disabled - ..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - MachineX64 - - - - - $(DoConfigs) - - - MaxSpeed - true - ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - true - true - MachineX86 - - - - - $(DoConfigs) - - - MaxSpeed - true - ..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - true - true - MachineX86 - - - - - $(DoConfigs) - - - ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - true - true - MachineX64 - - - - - $(DoConfigs) - - - ..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).pdb - Windows - true - true - MachineX64 - - - -#include "clutter.vs10.sourcefiles" - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\clutter\config.h;%(Outputs) - - - Copying clutter-config.h from clutter-config.h.win32_GDK... - $(CopyClutterConfigGDKH) - ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) - Copying clutter-config.h from clutter-config.h.win32_GDK... - $(CopyClutterConfigGDKH) - ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) - Copying clutter-config.h from clutter-config.h.win32_GDK... - $(CopyClutterConfigGDKH) - ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) - Copying clutter-config.h from clutter-config.h.win32_GDK... - $(CopyClutterConfigGDKH) - ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) - - - Copying clutter-config.h from clutter-config.h.win32... - $(CopyClutterConfigH) - ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) - Copying clutter-config.h from clutter-config.h.win32... - $(CopyClutterConfigH) - ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) - Copying clutter-config.h from clutter-config.h.win32... - $(CopyClutterConfigH) - ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) - Copying clutter-config.h from clutter-config.h.win32... - $(CopyClutterConfigH) - ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) - - - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) - - - Generating Enumeration Header... - $(GenEnumsSrcGDKH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - Generating Enumeration Header... - $(GenEnumsSrcH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - Generating Enumeration Header... - $(GenEnumsSrcGDKH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - Generating Enumeration Header... - $(GenEnumsSrcH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - Generating Enumeration Header... - $(GenEnumsSrcGDKH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - Generating Enumeration Header... - $(GenEnumsSrcH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - Generating Enumeration Header... - $(GenEnumsSrcGDKH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - Generating Enumeration Header... - $(GenEnumsSrcH) - ..\..\..\clutter\clutter-enum-types.h;%(Outputs) - - - Generating Enumeration Sources... - $(GenEnumsSrcGDKC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - Generating Enumeration Sources... - $(GenEnumsSrcC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - Generating Enumeration Sources... - $(GenEnumsSrcGDKC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - Generating Enumeration Sources... - $(GenEnumsSrcC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - Generating Enumeration Sources... - $(GenEnumsSrcGDKC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - Generating Enumeration Sources... - $(GenEnumsSrcC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - Generating Enumeration Sources... - $(GenEnumsSrcGDKC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - Generating Enumeration Sources... - $(GenEnumsSrcC) - ..\..\..\clutter\clutter-enum-types.c;%(Outputs) - - - - - - - - - diff --git a/build/win32/vs10/test-cogl-perf.vcxproj b/build/win32/vs10/test-cogl-perf.vcxproj deleted file mode 100644 index 0017cf88a..000000000 --- a/build/win32/vs10/test-cogl-perf.vcxproj +++ /dev/null @@ -1,170 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0DA94D83-B64E-40AC-8074-96C2416BBBE8} - testcoglperf - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-cogl-perf.vcxproj.filters b/build/win32/vs10/test-cogl-perf.vcxproj.filters deleted file mode 100644 index e4a80eee3..000000000 --- a/build/win32/vs10/test-cogl-perf.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - diff --git a/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin b/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin deleted file mode 100644 index 926c30eb7..000000000 --- a/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin +++ /dev/null @@ -1,12 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - -#include "testinteractive.vs10.sourcefiles.filters" - - diff --git a/build/win32/vs10/test-interactive-clutter.vcxprojin b/build/win32/vs10/test-interactive-clutter.vcxprojin deleted file mode 100644 index 2511fafdb..000000000 --- a/build/win32/vs10/test-interactive-clutter.vcxprojin +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9} - testinteractiveclutter - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories) - _DEBUG;$(TestProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - gdk_pixbuf-2.0.lib;pango-1.0.lib;cairo.lib;gmodule-2.0.lib;gthread-2.0.lib;OpenGL32.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - ..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories) - _DEBUG;$(TestProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - gdk_pixbuf-2.0.lib;pango-1.0.lib;cairo.lib;gmodule-2.0.lib;gthread-2.0.lib;OpenGL32.lib;%(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - ..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories) - true - $(TestProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - gdk_pixbuf-2.0.lib;pango-1.0.lib;cairo.lib;gmodule-2.0.lib;gthread-2.0.lib;OpenGL32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - ..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories) - $(TestProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - gdk_pixbuf-2.0.lib;pango-1.0.lib;cairo.lib;gmodule-2.0.lib;gthread-2.0.lib;OpenGL32.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - -#include "testinteractive.vs10.sourcefiles" - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-picking-performance.vcxproj b/build/win32/vs10/test-picking-performance.vcxproj deleted file mode 100644 index e179adeea..000000000 --- a/build/win32/vs10/test-picking-performance.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2035D56A-E748-475F-B3D5-C123BF652143} - testpickingperformance - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-picking-performance.vcxproj.filters b/build/win32/vs10/test-picking-performance.vcxproj.filters deleted file mode 100644 index 8ffda0997..000000000 --- a/build/win32/vs10/test-picking-performance.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/test-picking.vcxproj b/build/win32/vs10/test-picking.vcxproj deleted file mode 100644 index f33e9f50b..000000000 --- a/build/win32/vs10/test-picking.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F433DB3C-1223-489A-AD0C-C64B09F51139} - testpicking - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - %(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-picking.vcxproj.filters b/build/win32/vs10/test-picking.vcxproj.filters deleted file mode 100644 index 27fac1be5..000000000 --- a/build/win32/vs10/test-picking.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - diff --git a/build/win32/vs10/test-random-text.vcxproj b/build/win32/vs10/test-random-text.vcxproj deleted file mode 100644 index 50d58256f..000000000 --- a/build/win32/vs10/test-random-text.vcxproj +++ /dev/null @@ -1,170 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B8849C58-6773-453C-A2E5-00F02EE20B18} - testrandomtext - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-random-text.vcxproj.filters b/build/win32/vs10/test-random-text.vcxproj.filters deleted file mode 100644 index 9cfb50c71..000000000 --- a/build/win32/vs10/test-random-text.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj b/build/win32/vs10/test-state-hidden-performance.vcxproj deleted file mode 100644 index daf9cc54c..000000000 --- a/build/win32/vs10/test-state-hidden-performance.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} - teststatehiddenperformance - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj.filters b/build/win32/vs10/test-state-hidden-performance.vcxproj.filters deleted file mode 100644 index 91e778e77..000000000 --- a/build/win32/vs10/test-state-hidden-performance.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj b/build/win32/vs10/test-state-interactive-performance.vcxproj deleted file mode 100644 index fd3fe7d10..000000000 --- a/build/win32/vs10/test-state-interactive-performance.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {011F9197-F986-44BD-A8F2-045C746B1B70} - teststateinteractiveperformance - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj.filters b/build/win32/vs10/test-state-interactive-performance.vcxproj.filters deleted file mode 100644 index ddb63cc3e..000000000 --- a/build/win32/vs10/test-state-interactive-performance.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj b/build/win32/vs10/test-state-mini-performance.vcxproj deleted file mode 100644 index ad910de5a..000000000 --- a/build/win32/vs10/test-state-mini-performance.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} - teststateminiperformance - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj.filters b/build/win32/vs10/test-state-mini-performance.vcxproj.filters deleted file mode 100644 index fe9e2b735..000000000 --- a/build/win32/vs10/test-state-mini-performance.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/test-state-performance.vcxproj b/build/win32/vs10/test-state-performance.vcxproj deleted file mode 100644 index d54733fd0..000000000 --- a/build/win32/vs10/test-state-performance.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} - teststateperformance - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-state-performance.vcxproj.filters b/build/win32/vs10/test-state-performance.vcxproj.filters deleted file mode 100644 index c94c7dc6d..000000000 --- a/build/win32/vs10/test-state-performance.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj b/build/win32/vs10/test-state-pick-performance.vcxproj deleted file mode 100644 index 5ac7c375e..000000000 --- a/build/win32/vs10/test-state-pick-performance.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0C1E8E6C-1563-4F95-A994-6366EE992CB3} - teststatepickperformance - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj.filters b/build/win32/vs10/test-state-pick-performance.vcxproj.filters deleted file mode 100644 index 138e63f65..000000000 --- a/build/win32/vs10/test-state-pick-performance.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj b/build/win32/vs10/test-text-perf-performance.vcxproj deleted file mode 100644 index a18d544eb..000000000 --- a/build/win32/vs10/test-text-perf-performance.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8AF1EA8E-305B-42C0-919D-12B1843B21A4} - testtextperfperformance - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj.filters b/build/win32/vs10/test-text-perf-performance.vcxproj.filters deleted file mode 100644 index 940822ea1..000000000 --- a/build/win32/vs10/test-text-perf-performance.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Sources - - - - - Headers - - - diff --git a/build/win32/vs10/test-text-perf.vcxproj b/build/win32/vs10/test-text-perf.vcxproj deleted file mode 100644 index 24160a747..000000000 --- a/build/win32/vs10/test-text-perf.vcxproj +++ /dev/null @@ -1,170 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F072974F-6675-4A79-96FF-0B0DEB113AA4} - testtextperf - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-text-perf.vcxproj.filters b/build/win32/vs10/test-text-perf.vcxproj.filters deleted file mode 100644 index d153208e4..000000000 --- a/build/win32/vs10/test-text-perf.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - diff --git a/build/win32/vs10/test-text.vcxproj b/build/win32/vs10/test-text.vcxproj deleted file mode 100644 index 3fad71277..000000000 --- a/build/win32/vs10/test-text.vcxproj +++ /dev/null @@ -1,170 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC} - testtext - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - diff --git a/build/win32/vs10/test-text.vcxproj.filters b/build/win32/vs10/test-text.vcxproj.filters deleted file mode 100644 index e37673fdf..000000000 --- a/build/win32/vs10/test-text.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am deleted file mode 100644 index c1fcbb801..000000000 --- a/build/win32/vs9/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -EXTRA_DIST = \ - cally-atkcomponent-example.vcproj \ - cally-atkeditabletext-example.vcproj \ - cally-atkevents-example.vcproj \ - cally-atktext-example.vcproj \ - cally-clone-example.vcproj \ - clutter.sln \ - clutter.vcproj \ - clutter.vcprojin \ - clutter-build-defines.vsprops \ - clutter-gen-srcs.vsprops \ - clutter-install.vsprops \ - clutter-version-paths.vsprops \ - clutter-install.vcproj \ - test-cogl-perf.vcproj \ - test-interactive-clutter.vcproj \ - test-interactive-clutter.vcprojin \ - test-picking.vcproj \ - test-picking-performance.vcproj \ - test-random-text.vcproj \ - test-state-hidden-performance.vcproj \ - test-state-interactive-performance.vcproj \ - test-state-mini-performance.vcproj \ - test-state-performance.vcproj \ - test-state-pick-performance.vcproj \ - test-text-perf.vcproj \ - test-text-perf-performance.vcproj \ - test-text.vcproj \ - README.txt diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt deleted file mode 100644 index 36ffb1db9..000000000 --- a/build/win32/vs9/README.txt +++ /dev/null @@ -1,97 +0,0 @@ -Note that all this is rather experimental. - -A more detailed description on using Visual C++ to compile Clutter 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 Clutter 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 Clutter 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: Cogl, JSON-GLib, GDK-Pixbuf, -Pango*, atk 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 Clutter 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 & ATK have -VS9 project files in the latest stable versions, GDK-Pixbuf have VS9 project files -in the latest unstable version, and JSON-GLib, Pango and Cogl 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 --ATK --GDK-Pixbuf --JSON-GLib --Cogl - (Note that Pango, ATK, GDK-Pixbuf and JSON-GLib are not dependent on each - other, so building them in any order will do) - -Note that a working PERL installation (such as ActiveState or Strawberry PERL) -is also required for compilation of Clutter, as the glib-mkenums PERL utility -script available from the GLib package will be used. Please ensure that the -PERL interpretor is in your PATH. If a glib-mkenums script is not available, -please extract glib-mkenums.in from the gobject subdirectory of the -GLib source package, and change the lines and save as glib-mkenums in -\vs9\\bin: - -#! @PERL_PATH@ (circa line 1) -to -#! c:/perl/bin (or whereever your PERL interpretor executable is) - --and- - -print "glib-mkenums version glib-@GLIB_VERSION@\n"; -to -print "glib-mkenums version glib-\n"; - -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 Clutter headers into -\vs9\\include\clutter-1.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) - -Note: If you see C4819 warnings and you are compiling Clutteron a DBCS -(Chinese/Korean/Japanese) version of Windows, you may need to switch -to an English locale in Control Panel->Region and Languages->System-> -Change System Locale, reboot and rebuild to ensure Clutter and its -dependencies are built correctly. This is due to a bug in Visual C++ -running on DBCS locales. - ---Chun-wei Fan - (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist) diff --git a/build/win32/vs9/cally-atkcomponent-example.vcproj b/build/win32/vs9/cally-atkcomponent-example.vcproj deleted file mode 100644 index 0e170cb48..000000000 --- a/build/win32/vs9/cally-atkcomponent-example.vcproj +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/cally-atkeditabletext-example.vcproj b/build/win32/vs9/cally-atkeditabletext-example.vcproj deleted file mode 100644 index a151ce203..000000000 --- a/build/win32/vs9/cally-atkeditabletext-example.vcproj +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/cally-atkevents-example.vcproj b/build/win32/vs9/cally-atkevents-example.vcproj deleted file mode 100644 index e00954ef0..000000000 --- a/build/win32/vs9/cally-atkevents-example.vcproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/cally-atktext-example.vcproj b/build/win32/vs9/cally-atktext-example.vcproj deleted file mode 100644 index d4d4bae4d..000000000 --- a/build/win32/vs9/cally-atktext-example.vcproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/cally-clone-example.vcproj b/build/win32/vs9/cally-clone-example.vcproj deleted file mode 100644 index ef0f12ace..000000000 --- a/build/win32/vs9/cally-clone-example.vcproj +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/clutter-build-defines.vsprops b/build/win32/vs9/clutter-build-defines.vsprops deleted file mode 100644 index 47b08397b..000000000 --- a/build/win32/vs9/clutter-build-defines.vsprops +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/clutter-gen-srcs.vsprops b/build/win32/vs9/clutter-gen-srcs.vsprops deleted file mode 100644 index e9a7e757b..000000000 --- a/build/win32/vs9/clutter-gen-srcs.vsprops +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - diff --git a/build/win32/vs9/clutter-install.vcproj b/build/win32/vs9/clutter-install.vcproj deleted file mode 100644 index ba06d7239..000000000 --- a/build/win32/vs9/clutter-install.vcproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/clutter-install.vsprops b/build/win32/vs9/clutter-install.vsprops deleted file mode 100644 index cb82c7fff..000000000 --- a/build/win32/vs9/clutter-install.vsprops +++ /dev/null @@ -1,182 +0,0 @@ - - - - - diff --git a/build/win32/vs9/clutter-version-paths.vsprops b/build/win32/vs9/clutter-version-paths.vsprops deleted file mode 100644 index 7b988195a..000000000 --- a/build/win32/vs9/clutter-version-paths.vsprops +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln deleted file mode 100644 index 421d6529e..000000000 --- a/build/win32/vs9/clutter.sln +++ /dev/null @@ -1,455 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter", "clutter.vcproj", "{EA036190-0950-4640-84F9-D459A33B33A8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking", "test-picking.vcproj", "{F433DB3C-1223-489A-AD0C-C64B09F51139}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-cogl-perf", "test-cogl-perf.vcproj", "{0DA94D83-B64E-40AC-8074-96C2416BBBE8}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-random-text", "test-random-text.vcproj", "{B8849C58-6773-453C-A2E5-00F02EE20B18}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text", "test-text.vcproj", "{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf", "test-text-perf.vcproj", "{F072974F-6675-4A79-96FF-0B0DEB113AA4}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf-performance", "test-text-perf-performance.vcproj", "{8AF1EA8E-305B-42C0-919D-12B1843B21A4}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-pick-performance", "test-state-pick-performance.vcproj", "{0C1E8E6C-1563-4F95-A994-6366EE992CB3}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-mini-performance", "test-state-mini-performance.vcproj", "{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-interactive-performance", "test-state-interactive-performance.vcproj", "{011F9197-F986-44BD-A8F2-045C746B1B70}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-hidden-performance", "test-state-hidden-performance.vcproj", "{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-performance", "test-state-performance.vcproj", "{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking-performance", "test-picking-performance.vcproj", "{2035D56A-E748-475F-B3D5-C123BF652143}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atktext-example", "cally-atktext-example.vcproj", "{27BA2900-A28A-4869-B16D-FBE581A12402}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkcomponent-example", "cally-atkcomponent-example.vcproj", "{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkeditabletext-example", "cally-atkeditabletext-example.vcproj", "{2D1AD595-270B-4B38-9475-A269E225C10C}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkevents-example", "cally-atkevents-example.vcproj", "{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}" - ProjectSection(ProjectDependencies) = postProject - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter-install", "clutter-install.vcproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}" - ProjectSection(ProjectDependencies) = postProject - {27BA2900-A28A-4869-B16D-FBE581A12402} = {27BA2900-A28A-4869-B16D-FBE581A12402} - {F433DB3C-1223-489A-AD0C-C64B09F51139} = {F433DB3C-1223-489A-AD0C-C64B09F51139} - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC} = {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC} - {F072974F-6675-4A79-96FF-0B0DEB113AA4} = {F072974F-6675-4A79-96FF-0B0DEB113AA4} - {8AF1EA8E-305B-42C0-919D-12B1843B21A4} = {8AF1EA8E-305B-42C0-919D-12B1843B21A4} - {0C1E8E6C-1563-4F95-A994-6366EE992CB3} = {0C1E8E6C-1563-4F95-A994-6366EE992CB3} - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} = {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} - {011F9197-F986-44BD-A8F2-045C746B1B70} = {011F9197-F986-44BD-A8F2-045C746B1B70} - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} = {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} = {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} - {2035D56A-E748-475F-B3D5-C123BF652143} = {2035D56A-E748-475F-B3D5-C123BF652143} - {B8849C58-6773-453C-A2E5-00F02EE20B18} = {B8849C58-6773-453C-A2E5-00F02EE20B18} - {0DA94D83-B64E-40AC-8074-96C2416BBBE8} = {0DA94D83-B64E-40AC-8074-96C2416BBBE8} - {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} - {2D1AD595-270B-4B38-9475-A269E225C10C} = {2D1AD595-270B-4B38-9475-A269E225C10C} - {E77D40D0-19D4-4865-BE20-B6DA05BA234D} = {E77D40D0-19D4-4865-BE20-B6DA05BA234D} - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E} = {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E} - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4} = {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4} - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9} = {75F9E5AF-040C-448E-96BE-C282EFFFE2D9} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug_GDK|Win32 = Debug_GDK|Win32 - Release|Win32 = Release|Win32 - Release_GDK|Win32 = Release_GDK|Win32 - Debug|x64 = Debug|x64 - Debug_GDK|x64 = Debug_GDK|x64 - Release|x64 = Release|x64 - Release_GDK|x64 = Release_GDK|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|Win32.Build.0 = Debug|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|Win32.ActiveCfg = Release|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|Win32.Build.0 = Release|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|x64.ActiveCfg = Debug|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug|x64.Build.0 = Debug|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.ActiveCfg = Release|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.Build.0 = Release|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|Win32.Build.0 = Release_GDK|Win32 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Debug_GDK|x64.Build.0 = Debug_GDK|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.ActiveCfg = Release_GDK|x64 - {EA036190-0950-4640-84F9-D459A33B33A8}.Release_GDK|x64.Build.0 = Release_GDK|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.ActiveCfg = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.Build.0 = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|Win32.ActiveCfg = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|Win32.Build.0 = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|x64.ActiveCfg = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|x64.Build.0 = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|x64.ActiveCfg = Release|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|x64.Build.0 = Release|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|Win32.Build.0 = Release|Win32 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug_GDK|x64.Build.0 = Debug|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.ActiveCfg = Release|x64 - {F433DB3C-1223-489A-AD0C-C64B09F51139}.Release_GDK|x64.Build.0 = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|Win32.Build.0 = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|Win32.ActiveCfg = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|Win32.Build.0 = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|x64.ActiveCfg = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug|x64.Build.0 = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|x64.ActiveCfg = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release|x64.Build.0 = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|Win32.Build.0 = Release|Win32 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Debug_GDK|x64.Build.0 = Debug|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.ActiveCfg = Release|x64 - {0DA94D83-B64E-40AC-8074-96C2416BBBE8}.Release_GDK|x64.Build.0 = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|Win32.ActiveCfg = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|Win32.Build.0 = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|Win32.ActiveCfg = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|Win32.Build.0 = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|x64.ActiveCfg = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug|x64.Build.0 = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|x64.ActiveCfg = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release|x64.Build.0 = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|Win32.Build.0 = Release|Win32 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Debug_GDK|x64.Build.0 = Debug|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.ActiveCfg = Release|x64 - {B8849C58-6773-453C-A2E5-00F02EE20B18}.Release_GDK|x64.Build.0 = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|Win32.Build.0 = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|Win32.ActiveCfg = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|Win32.Build.0 = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|x64.ActiveCfg = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug|x64.Build.0 = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|x64.ActiveCfg = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release|x64.Build.0 = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|Win32.Build.0 = Release|Win32 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Debug_GDK|x64.Build.0 = Debug|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.ActiveCfg = Release|x64 - {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}.Release_GDK|x64.Build.0 = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|Win32.ActiveCfg = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|Win32.Build.0 = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|Win32.ActiveCfg = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|Win32.Build.0 = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|x64.ActiveCfg = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|x64.Build.0 = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.ActiveCfg = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.Build.0 = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|Win32.Build.0 = Release|Win32 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug_GDK|x64.Build.0 = Debug|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.ActiveCfg = Release|x64 - {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release_GDK|x64.Build.0 = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.Build.0 = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.ActiveCfg = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.Build.0 = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.ActiveCfg = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.Build.0 = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.ActiveCfg = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.Build.0 = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|Win32.Build.0 = Release|Win32 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug_GDK|x64.Build.0 = Debug|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.ActiveCfg = Release|x64 - {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release_GDK|x64.Build.0 = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.Build.0 = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.ActiveCfg = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.Build.0 = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.ActiveCfg = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.Build.0 = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.ActiveCfg = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.Build.0 = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|Win32.Build.0 = Release|Win32 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug_GDK|x64.Build.0 = Debug|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.ActiveCfg = Release|x64 - {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release_GDK|x64.Build.0 = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.ActiveCfg = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.Build.0 = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.ActiveCfg = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.Build.0 = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.ActiveCfg = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.Build.0 = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.ActiveCfg = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.Build.0 = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|Win32.Build.0 = Release|Win32 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug_GDK|x64.Build.0 = Debug|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.ActiveCfg = Release|x64 - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release_GDK|x64.Build.0 = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.ActiveCfg = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.Build.0 = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.ActiveCfg = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.Build.0 = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.ActiveCfg = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.Build.0 = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.ActiveCfg = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.Build.0 = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|Win32.Build.0 = Release|Win32 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug_GDK|x64.Build.0 = Debug|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.ActiveCfg = Release|x64 - {011F9197-F986-44BD-A8F2-045C746B1B70}.Release_GDK|x64.Build.0 = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.ActiveCfg = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.Build.0 = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.ActiveCfg = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.Build.0 = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.ActiveCfg = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.Build.0 = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.ActiveCfg = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.Build.0 = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|Win32.Build.0 = Release|Win32 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug_GDK|x64.Build.0 = Debug|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.ActiveCfg = Release|x64 - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release_GDK|x64.Build.0 = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.Build.0 = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.ActiveCfg = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.Build.0 = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.ActiveCfg = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.Build.0 = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.ActiveCfg = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.Build.0 = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|Win32.Build.0 = Release|Win32 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug_GDK|x64.Build.0 = Debug|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.ActiveCfg = Release|x64 - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release_GDK|x64.Build.0 = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.ActiveCfg = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.Build.0 = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.ActiveCfg = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.Build.0 = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.ActiveCfg = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.Build.0 = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.ActiveCfg = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.Build.0 = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|Win32.Build.0 = Release|Win32 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Debug_GDK|x64.Build.0 = Debug|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.ActiveCfg = Release|x64 - {2035D56A-E748-475F-B3D5-C123BF652143}.Release_GDK|x64.Build.0 = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.ActiveCfg = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.Build.0 = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|Win32.ActiveCfg = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|Win32.Build.0 = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|x64.ActiveCfg = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|x64.Build.0 = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|x64.ActiveCfg = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|x64.Build.0 = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|Win32.Build.0 = Release|Win32 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug_GDK|x64.Build.0 = Debug|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.ActiveCfg = Release|x64 - {27BA2900-A28A-4869-B16D-FBE581A12402}.Release_GDK|x64.Build.0 = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|Win32.ActiveCfg = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|Win32.Build.0 = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|Win32.ActiveCfg = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|Win32.Build.0 = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|x64.ActiveCfg = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug|x64.Build.0 = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|x64.ActiveCfg = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release|x64.Build.0 = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|Win32.Build.0 = Release|Win32 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Debug_GDK|x64.Build.0 = Debug|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.ActiveCfg = Release|x64 - {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}.Release_GDK|x64.Build.0 = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|Win32.ActiveCfg = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|Win32.Build.0 = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|Win32.ActiveCfg = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|Win32.Build.0 = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|x64.ActiveCfg = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug|x64.Build.0 = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|x64.ActiveCfg = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release|x64.Build.0 = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|Win32.Build.0 = Release|Win32 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Debug_GDK|x64.Build.0 = Debug|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.ActiveCfg = Release|x64 - {2D1AD595-270B-4B38-9475-A269E225C10C}.Release_GDK|x64.Build.0 = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|Win32.Build.0 = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|Win32.ActiveCfg = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|Win32.Build.0 = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|x64.ActiveCfg = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug|x64.Build.0 = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|x64.ActiveCfg = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release|x64.Build.0 = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|Win32.Build.0 = Release|Win32 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Debug_GDK|x64.Build.0 = Debug|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.ActiveCfg = Release|x64 - {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}.Release_GDK|x64.Build.0 = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|Win32.ActiveCfg = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|Win32.Build.0 = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.ActiveCfg = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.Build.0 = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|x64.ActiveCfg = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug|x64.Build.0 = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.ActiveCfg = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.Build.0 = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|Win32.Build.0 = Release|Win32 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.Build.0 = Debug|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.ActiveCfg = Release|x64 - {E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.Build.0 = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.ActiveCfg = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.Build.0 = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.ActiveCfg = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.Build.0 = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|x64.ActiveCfg = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|x64.Build.0 = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.ActiveCfg = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.Build.0 = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|Win32.Build.0 = Release|Win32 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.Build.0 = Debug|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|x64.ActiveCfg = Release|x64 - {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release_GDK|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}.Release|Win32.ActiveCfg = Release|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|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|x64.ActiveCfg = Release|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin deleted file mode 100644 index ee549d8fc..000000000 --- a/build/win32/vs9/clutter.vcprojin +++ /dev/null @@ -1,692 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "clutter.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-cogl-perf.vcproj b/build/win32/vs9/test-cogl-perf.vcproj deleted file mode 100644 index 9326e6431..000000000 --- a/build/win32/vs9/test-cogl-perf.vcproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-interactive-clutter.vcprojin b/build/win32/vs9/test-interactive-clutter.vcprojin deleted file mode 100644 index f5add5279..000000000 --- a/build/win32/vs9/test-interactive-clutter.vcprojin +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "testinteractive.sourcefiles" - - - - - diff --git a/build/win32/vs9/test-picking-performance.vcproj b/build/win32/vs9/test-picking-performance.vcproj deleted file mode 100644 index 9fa7b6071..000000000 --- a/build/win32/vs9/test-picking-performance.vcproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-picking.vcproj b/build/win32/vs9/test-picking.vcproj deleted file mode 100644 index f635e9cea..000000000 --- a/build/win32/vs9/test-picking.vcproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-random-text.vcproj b/build/win32/vs9/test-random-text.vcproj deleted file mode 100644 index f8b5d8e4f..000000000 --- a/build/win32/vs9/test-random-text.vcproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-state-hidden-performance.vcproj b/build/win32/vs9/test-state-hidden-performance.vcproj deleted file mode 100644 index 8fe32b736..000000000 --- a/build/win32/vs9/test-state-hidden-performance.vcproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-state-interactive-performance.vcproj b/build/win32/vs9/test-state-interactive-performance.vcproj deleted file mode 100644 index 2f4d01121..000000000 --- a/build/win32/vs9/test-state-interactive-performance.vcproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-state-mini-performance.vcproj b/build/win32/vs9/test-state-mini-performance.vcproj deleted file mode 100644 index 7c9f8380a..000000000 --- a/build/win32/vs9/test-state-mini-performance.vcproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-state-performance.vcproj b/build/win32/vs9/test-state-performance.vcproj deleted file mode 100644 index 71f5c4219..000000000 --- a/build/win32/vs9/test-state-performance.vcproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-state-pick-performance.vcproj b/build/win32/vs9/test-state-pick-performance.vcproj deleted file mode 100644 index 5775970b8..000000000 --- a/build/win32/vs9/test-state-pick-performance.vcproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-text-perf-performance.vcproj b/build/win32/vs9/test-text-perf-performance.vcproj deleted file mode 100644 index 3c0afe6aa..000000000 --- a/build/win32/vs9/test-text-perf-performance.vcproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-text-perf.vcproj b/build/win32/vs9/test-text-perf.vcproj deleted file mode 100644 index 385451410..000000000 --- a/build/win32/vs9/test-text-perf.vcproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/test-text.vcproj b/build/win32/vs9/test-text.vcproj deleted file mode 100644 index 56f5a3d12..000000000 --- a/build/win32/vs9/test-text.vcproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/clutter/Makefile.am b/clutter/Makefile.am index c285f433c..ae8ffd9f4 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -348,12 +348,6 @@ built_source_h = \ DISTCLEANFILES += clutter-config.h EXTRA_DIST += clutter-config.h.in -# win32 config header -EXTRA_DIST += \ - config.h.win32.in \ - config.h.win32 \ - $(NULL) - # version header DISTCLEANFILES += clutter-version.h EXTRA_DIST += clutter-version.h.in clutter-version.h @@ -536,57 +530,6 @@ pc_files += clutter-gdk-$(CLUTTER_API_VERSION).pc gdk_introspection = $(gdk_source_c) $(gdk_source_h) endif # SUPPORT_GDK -# Windows backend rules -win32_source_c = \ - win32/clutter-backend-win32.c \ - win32/clutter-device-manager-win32.c \ - win32/clutter-event-win32.c \ - win32/clutter-stage-win32.c \ - $(NULL) - -win32_source_h = \ - win32/clutter-win32.h \ - $(NULL) - -win32_source_h_priv = \ - win32/clutter-backend-win32.h \ - win32/clutter-device-manager-win32.h \ - win32/clutter-stage-win32.h \ - $(NULL) - -if SUPPORT_WIN32 -# Ideally this resources stuff would go in win32/ but libtool doesn't -# seem to pass on the -Wl argument when linking a convenience library -# so we need to do it here as part of linking the dll. libtool also -# won't let you link against the .o directly because it wants you to -# link against libtool objects for dynamic libraries. -.rc.o : - mkdir -p win32 - $(WINDRES) -I$(srcdir)/win32 $< $@ - -win32/resources.o : win32/invisible-cursor.cur - -win32_resources = win32/resources.o -win32_resources_ldflag = -Wl,win32/resources.o - -backend_source_h += $(win32_source_h) -backend_source_c += $(win32_source_c) -backend_source_h_priv += $(win32_source_h_priv) - -clutterwin_includedir = $(clutter_includedir)/win32 -clutterwin_include_HEADERS = $(win32_source_h) - -clutter-win32-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc - $(QUIET_GEN)cp -f $< $(@F) - -pc_files += clutter-win32-$(CLUTTER_API_VERSION).pc -endif # SUPPORT_WIN32 - -EXTRA_DIST += \ - win32/invisible-cursor.cur \ - win32/resources.rc \ - $(NULL) - egl_tslib_h = tslib/clutter-event-tslib.h egl_tslib_c = tslib/clutter-event-tslib.c @@ -843,7 +786,6 @@ clutter_deprecated_HEADERS = $(deprecated_h) lib_LTLIBRARIES += libclutter-@CLUTTER_API_VERSION@.la libclutter_@CLUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(CLUTTER_LIBS) -libclutter_@CLUTTER_API_VERSION@_la_DEPENDENCIES = $(win32_resources) libclutter_@CLUTTER_API_VERSION@_la_SOURCES = \ $(backend_source_c) \ @@ -873,89 +815,8 @@ libclutter_@CLUTTER_API_VERSION@_la_LDFLAGS = \ $(CLUTTER_LT_LDFLAGS) \ -export-dynamic \ -rpath $(libdir) \ - $(win32_resources_ldflag) \ $(NULL) -dist-hook: ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj ../build/win32/vs10/clutter.vcxproj.filters ../build/win32/gen-enums.bat - -../build/win32/vs9/clutter.vcproj: $(top_srcdir)/build/win32/vs9/clutter.vcprojin - for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >clutter.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/clutter.vcprojin >$@ - rm clutter.sourcefiles - -../build/win32/vs10/clutter.vcxproj: $(top_srcdir)/build/win32/vs10/clutter.vcxprojin - for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >clutter.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/clutter.vcxprojin >$@ - rm clutter.vs10.sourcefiles - -../build/win32/vs10/clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/clutter.vcxproj.filtersin - for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' Sources' \ - ;; \ - esac; \ - done >clutter.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/clutter.vcxproj.filtersin >$@ - rm clutter.vs10.sourcefiles.filters - -clutter.vsenums_h: - echo 'perl %1\bin\glib-mkenums --template ../../clutter/clutter-enum-types.h.in ' >vsenums_h.temp1 - for F in `echo $(source_h) $(backend_source_h) $(srcdir)/win32/clutter-win32.h`; do \ - case $$F in \ - *-x11*.h|*-wayland*.h|*-gdk*.h|*-glx*.h|*-cex*.h|*-egl*.h|*-osx*.h|*-mir*.h) ;; \ - *.h) echo '../../clutter'$$F' ' \ - ;; \ - esac; \ - done >>vsenums_h.temp1 - cat vsenums_h.temp1 | sed 's_/clutter./_/clutter/_' >vsenums_h.temp - cat vsenums_h.temp | tr -d '\n' >>$@ - echo '> ..\..\clutter\clutter-enum-types.h' >>$@ - rm vsenums_h.temp1 - rm vsenums_h.temp - -clutter.vsenums_c: - echo 'perl %1\bin\glib-mkenums --template ../../clutter/clutter-enum-types.c.in ' >vsenums_c.temp1 - for F in `echo $(source_h) $(backend_source_h) $(srcdir)/win32/clutter-win32.h`; do \ - case $$F in \ - *-x11*.h|*-wayland*.h|*-gdk*.h|*-glx*.h|*-cex*.h|*-egl*.h|*-osx*.h|*-mir*.h) ;; \ - *.h) echo '../../clutter'$$F' ' \ - ;; \ - esac; \ - done >>vsenums_c.temp1 - cat vsenums_c.temp1 | sed 's_/clutter./_/clutter/_' >vsenums_c.temp - cat vsenums_c.temp | tr -d '\n' >>$@ - echo '> ..\..\clutter\clutter-enum-types.c' >>$@ - rm vsenums_c.temp1 - rm vsenums_c.temp - -../build/win32/gen-enums.bat: clutter.vsenums_h clutter.vsenums_c - echo 'if exist ..\..\clutter\clutter-enum-types.h goto DONE_COGL_ENUMS_H' >$@ - cat clutter.vsenums_h >>$@ - echo ':DONE_COGL_ENUMS_H' >>$@ - echo 'if exist ..\..\clutter\clutter-enum-types.c goto DONE_COGL_ENUMS_C' >>$@ - cat clutter.vsenums_c >>$@ - echo ':DONE_COGL_ENUMS_C' >>$@ - rm clutter.vsenums_h - rm clutter.vsenums_c - -EXTRA_DIST += \ - clutter-config.h.win32 \ - clutter-config.h.win32_GDK \ - $(NULL) - -# Let the VS9/VS10 Project files be cleared out before they are re-expanded... -DISTCLEANFILES += ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj ../build/win32/vs10/clutter.vcxproj.filters ../build/win32/gen-enums.bat - install-exec-local: test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" for lib in `echo $(compat_libs)`; do \ diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index bce4e9138..133fb2667 100644 --- a/clutter/clutter-backend.c +++ b/clutter/clutter-backend.c @@ -67,9 +67,6 @@ #ifdef CLUTTER_INPUT_X11 #include "x11/clutter-backend-x11.h" #endif -#ifdef CLUTTER_INPUT_WIN32 -#include "win32/clutter-backend-win32.h" -#endif #ifdef CLUTTER_INPUT_OSX #include "osx/clutter-backend-osx.h" #endif @@ -539,9 +536,6 @@ static const struct { #ifdef CLUTTER_WINDOWING_OSX { CLUTTER_WINDOWING_OSX, clutter_backend_osx_new }, #endif -#ifdef CLUTTER_WINDOWING_WIN32 - { CLUTTER_WINDOWING_WIN32, clutter_backend_win32_new }, -#endif #ifdef CLUTTER_WINDOWING_GDK { CLUTTER_WINDOWING_GDK, clutter_backend_gdk_new }, #endif @@ -626,14 +620,6 @@ clutter_backend_real_init_events (ClutterBackend *backend) } else #endif -#ifdef CLUTTER_INPUT_WIN32 - if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32) && - (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_WIN32))) - { - _clutter_backend_win32_events_init (backend); - } - else -#endif #ifdef CLUTTER_INPUT_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) && (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_X11))) diff --git a/clutter/clutter-config.h.win32 b/clutter/clutter-config.h.win32 deleted file mode 100644 index 21076fa84..000000000 --- a/clutter/clutter-config.h.win32 +++ /dev/null @@ -1,18 +0,0 @@ -#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __CLUTTER_CONFIG_H__ -#define __CLUTTER_CONFIG_H__ - -#include - -G_BEGIN_DECLS - -#define CLUTTER_WINDOWING_WIN32 "win32" -#define CLUTTER_INPUT_WIN32 "win32" -#define CLUTTER_INPUT_NULL "null" - -G_END_DECLS - -#endif /* __CLUTTER_CONFIG_H__ */ diff --git a/clutter/clutter-config.h.win32_GDK b/clutter/clutter-config.h.win32_GDK deleted file mode 100644 index b9ddcdbe7..000000000 --- a/clutter/clutter-config.h.win32_GDK +++ /dev/null @@ -1,20 +0,0 @@ -#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __CLUTTER_CONFIG_H__ -#define __CLUTTER_CONFIG_H__ - -#include - -G_BEGIN_DECLS - -#define CLUTTER_WINDOWING_WIN32 "win32" -#define CLUTTER_INPUT_WIN32 "win32" -#define CLUTTER_WINDOWING_GDK "gdk" -#define CLUTTER_INPUT_GDK "gdk" -#define CLUTTER_INPUT_NULL "null" - -G_END_DECLS - -#endif /* __CLUTTER_CONFIG_H__ */ diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 10fcc2085..600e745cf 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -73,9 +73,6 @@ #ifdef CLUTTER_WINDOWING_OSX #include "osx/clutter-backend-osx.h" #endif -#ifdef CLUTTER_WINDOWING_WIN32 -#include "win32/clutter-backend-win32.h" -#endif #ifdef CLUTTER_WINDOWING_GDK #include "gdk/clutter-backend-gdk.h" #endif @@ -194,17 +191,11 @@ clutter_threads_init_default (void) { g_mutex_init (&clutter_threads_mutex); -#ifndef CLUTTER_WINDOWING_WIN32 - /* we don't need nor want locking functions on Windows.here - * as Windows GUI system assumes multithreadedness - * see bug: https://bugzilla.gnome.org/show_bug.cgi?id=662071 - */ if (clutter_threads_lock == NULL) clutter_threads_lock = clutter_threads_impl_lock; if (clutter_threads_unlock == NULL) clutter_threads_unlock = clutter_threads_impl_unlock; -#endif /* CLUTTER_WINDOWING_WIN32 */ } #define ENVIRONMENT_GROUP "Environment" @@ -3614,8 +3605,7 @@ _clutter_context_get_motion_events_enabled (void) * @backend_type: the name of the backend to check * * Checks the run-time name of the Clutter windowing system backend, using - * the symbolic macros like %CLUTTER_WINDOWING_WIN32 or - * %CLUTTER_WINDOWING_X11. + * the symbolic macros like %CLUTTER_WINDOWING_X11. * * This function should be used in conjuction with the compile-time macros * inside applications and libraries that are using the platform-specific @@ -3630,13 +3620,6 @@ _clutter_context_get_motion_events_enabled (void) * } * else * #endif - * #ifdef CLUTTER_WINDOWING_WIN32 - * if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) - * { - * // it is safe to use the clutter_win32_* API - * } - * else - * #endif * g_error ("Unknown Clutter backend."); * ]| * @@ -3660,12 +3643,6 @@ clutter_check_windowing_backend (const char *backend_type) return TRUE; else #endif -#ifdef CLUTTER_WINDOWING_WIN32 - if (backend_type == I_(CLUTTER_WINDOWING_WIN32) && - CLUTTER_IS_BACKEND_WIN32 (context->backend)) - return TRUE; - else -#endif #ifdef CLUTTER_WINDOWING_WAYLAND if (backend_type == I_(CLUTTER_WINDOWING_WAYLAND) && CLUTTER_IS_BACKEND_WAYLAND (context->backend)) diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in index b7a86b686..29cf5375c 100644 --- a/clutter/clutter-version.h.in +++ b/clutter/clutter-version.h.in @@ -298,19 +298,7 @@ G_BEGIN_DECLS #define _CLUTTER_EXTERN extern #endif -#ifdef CLUTTER_WINDOWING_WIN32 -# ifdef CLUTTER_COMPILATION -# ifdef DLL_EXPORT -# define CLUTTER_VAR __declspec(dllexport) -# else -# define CLUTTER_VAR extern -# endif -# else -# define CLUTTER_VAR __declspec(dllimport) -# endif -#else -# define CLUTTER_VAR _CLUTTER_EXTERN -#endif +#define CLUTTER_VAR _CLUTTER_EXTERN /** * clutter_major_version: @@ -324,7 +312,7 @@ G_BEGIN_DECLS * * Since: 1.2 */ -CLUTTER_VAR const guint clutter_major_version; +const guint clutter_major_version; /** * clutter_minor_version: @@ -338,7 +326,7 @@ CLUTTER_VAR const guint clutter_major_version; * * Since: 1.2 */ -CLUTTER_VAR const guint clutter_minor_version; +const guint clutter_minor_version; /** * clutter_micro_version: @@ -352,7 +340,7 @@ CLUTTER_VAR const guint clutter_minor_version; * * Since: 1.2 */ -CLUTTER_VAR const guint clutter_micro_version; +const guint clutter_micro_version; G_END_DECLS diff --git a/clutter/config.h.win32.in b/clutter/config.h.win32.in deleted file mode 100644 index b649d9884..000000000 --- a/clutter/config.h.win32.in +++ /dev/null @@ -1,153 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* List of Cogl drivers */ -#define CLUTTER_DRIVERS "*" - -/* Use CEX100 EGL backend */ -/* #undef CLUTTER_EGL_BACKEND_CEX100 */ - -/* Use Generic EGL backend */ -/* #undef CLUTTER_EGL_BACKEND_GENERIC*/ - -/* Can use Cogl 2.0 API internally */ -#define COGL_ENABLE_EXPERIMENTAL_2_0_API 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@" - -/* 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 */ - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#define HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Have evdev support for input handling */ -/* #undef HAVE_EVDEV */ - -/* Whether you have gcov */ -/* #undef HAVE_GCOV */ - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT 1 - -/* Define if you have the iconv() function and it works. */ -#define HAVE_ICONV 1 - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#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 header file. */ -#define HAVE_MEMORY_H 1 - -/* Supports PangoFt2 */ -/* #undef HAVE_PANGO_FT2 */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1600) -#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 - -/* Have tslib for touchscreen handling */ -/* #undef HAVE_TSLIB */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_UNISTD_H 1 -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_X11_EXTENSIONS_XINPUT2_H */ - -/* Define to 1 if we have the XCOMPOSITE X extension */ -/* #undef HAVE_XCOMPOSITE */ - -/* Define to 1 if we have the XDAMAGE X extension */ -/* #undef HAVE_XDAMAGE */ - -/* Define to 1 if we have the XEXT X extension */ -/* #undef HAVE_XEXT */ - -/* Define to 1 if X Generic Extensions is available */ -/* #undef HAVE_XGE */ - -/* Define to 1 if XI2 is available */ -/* #undef HAVE_XINPUT_2 */ - -/* Define to 1 if XInput 2.2 is available */ -/* #undef HAVE_XINPUT_2_2 */ - -/* Define to use XKB extension */ -/* #undef HAVE_XKB */ - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Define to 1 if building for Linux */ -/* #undef OS_LINUX */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://bugzilla.gnome.org/enter_bug.cgi?product=clutter" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "clutter" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "clutter @CLUTTER_VERSION@" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "clutter" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "http://www.clutter-project.org" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "@CLUTTER_VERSION@" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* defines how to decorate public symbols while building */ -#ifdef _MSC_VER -#define _CLUTTER_EXTERN __declspec(dllexport) extern -#else -#define _CLUTTER_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern -#endif diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c index 25c687b99..1ec293848 100644 --- a/clutter/gdk/clutter-backend-gdk.c +++ b/clutter/gdk/clutter-backend-gdk.c @@ -39,9 +39,7 @@ #include #include -#ifndef GDK_WINDOWING_WIN32 #include -#endif #if defined(GDK_WINDOWING_X11) && defined(COGL_HAS_XLIB_SUPPORT) #include @@ -59,10 +57,6 @@ #include #endif -#ifdef GDK_WINDOWING_WIN32 -#include -#endif - #include "clutter-backend-gdk.h" #include "clutter-device-manager-gdk.h" #include "clutter-settings-gdk.h" @@ -278,15 +272,6 @@ clutter_backend_gdk_get_renderer (ClutterBackend *backend, cogl_wayland_renderer_set_event_dispatch_enabled (renderer, !disable_event_retrieval); } else -#endif -#if defined(GDK_WINDOWING_WIN32) - if (GDK_IS_WIN32_DISPLAY (backend_gdk->display)) - { - /* Force a WGL winsys on windows */ - cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_WGL); - cogl_win32_renderer_set_event_retrieval_enabled (renderer, FALSE); - } - else #endif { g_set_error (error, CLUTTER_INIT_ERROR, diff --git a/clutter/gdk/clutter-stage-gdk.c b/clutter/gdk/clutter-stage-gdk.c index 742de5867..144b4c32c 100644 --- a/clutter/gdk/clutter-stage-gdk.c +++ b/clutter/gdk/clutter-stage-gdk.c @@ -42,9 +42,6 @@ #ifdef GDK_WINDOWING_WAYLAND #include #endif -#ifdef GDK_WINDOWING_WIN32 -#include -#endif #include "clutter-backend-gdk.h" #include "clutter-stage-gdk.h" @@ -453,14 +450,6 @@ clutter_stage_gdk_realize (ClutterStageWindow *stage_window) clutter_stage_gdk_wayland_surface (stage_gdk)); } else -#endif -#if defined(GDK_WINDOWING_WIN32) && defined(COGL_HAS_WIN32_SUPPORT) - if (GDK_IS_WIN32_WINDOW (stage_gdk->window)) - { - cogl_win32_onscreen_set_foreign_window (stage_cogl->onscreen, - gdk_win32_window_get_handle (stage_gdk->window)); - } - else #endif { g_warning ("Cannot find an appropriate CoglWinsys for a " diff --git a/clutter/win32/clutter-backend-win32.c b/clutter/win32/clutter-backend-win32.c deleted file mode 100644 index 1811c7396..000000000 --- a/clutter/win32/clutter-backend-win32.c +++ /dev/null @@ -1,247 +0,0 @@ -/* Clutter. - * An OpenGL based 'interactive canvas' library. - * Authored By Matthew Allum - * Copyright (C) 2006-2007 OpenedHand - * - * 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 . - * - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include "clutter-backend-win32.h" -#include "clutter-stage-win32.h" -#include "clutter-win32.h" -#include "clutter-device-manager-win32.h" - -#include "clutter-event.h" -#include "clutter-main.h" -#include "clutter-device-manager-private.h" -#include "clutter-debug.h" -#include "clutter-private.h" -#include "clutter-stage-private.h" - -#include "cogl/cogl.h" - -/* prototype decleration for DllMain to satisfy compiler checking in - * maintainer mode build. - */ -BOOL WINAPI DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved); - -G_DEFINE_TYPE (ClutterBackendWin32, clutter_backend_win32, - CLUTTER_TYPE_BACKEND); - -typedef int (WINAPI * SwapIntervalProc) (int interval); - -/* singleton object */ -static ClutterBackendWin32 *backend_singleton = NULL; - -static HINSTANCE clutter_hinst = NULL; - -/* various flags corresponding to pre init setup calls */ -static gboolean _no_event_retrieval = FALSE; - -static void -clutter_backend_win32_init_events (ClutterBackend *backend) -{ - ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend); - - CLUTTER_NOTE (EVENT, "initialising the event loop"); - - backend->device_manager = - g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_WIN32, - "backend", backend_win32, - NULL); - - if (!_no_event_retrieval) - _clutter_backend_win32_events_init (backend); -} - -HCURSOR -_clutter_backend_win32_get_invisible_cursor (ClutterBackend *backend) -{ - ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend); - - if (backend_win32->invisible_cursor == NULL) - backend_win32->invisible_cursor = - LoadCursor (clutter_hinst, MAKEINTRESOURCE (42)); - - return backend_win32->invisible_cursor; -} - -static void -clutter_backend_win32_finalize (GObject *gobject) -{ - backend_singleton = NULL; - - timeEndPeriod (1); - - G_OBJECT_CLASS (clutter_backend_win32_parent_class)->finalize (gobject); -} - -static void -clutter_backend_win32_dispose (GObject *gobject) -{ - ClutterBackend *backend = CLUTTER_BACKEND (gobject); - ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (gobject); - ClutterStageManager *stage_manager; - - CLUTTER_NOTE (BACKEND, "Disposing the of stages"); - stage_manager = clutter_stage_manager_get_default (); - - g_object_unref (stage_manager); - - CLUTTER_NOTE (BACKEND, "Removing the event source"); - _clutter_backend_win32_events_uninit (CLUTTER_BACKEND (backend_win32)); - - G_OBJECT_CLASS (clutter_backend_win32_parent_class)->dispose (gobject); - - if (backend->cogl_context) - { - cogl_object_unref (backend->cogl_context); - backend->cogl_context = NULL; - } -} - -static GObject * -clutter_backend_win32_constructor (GType gtype, - guint n_params, - GObjectConstructParam *params) -{ - GObjectClass *parent_class; - GObject *retval; - - if (!backend_singleton) - { - parent_class = G_OBJECT_CLASS (clutter_backend_win32_parent_class); - retval = parent_class->constructor (gtype, n_params, params); - - backend_singleton = CLUTTER_BACKEND_WIN32 (retval); - - return retval; - } - - g_warning ("Attempting to create a new backend object. This should " - "never happen, so we return the singleton instance."); - - return g_object_ref (backend_singleton); -} - -ClutterFeatureFlags -clutter_backend_win32_get_features (ClutterBackend *backend) -{ - ClutterBackendClass *parent_class; - - parent_class = CLUTTER_BACKEND_CLASS (clutter_backend_win32_parent_class); - - return parent_class->get_features (backend) - | CLUTTER_FEATURE_STAGE_USER_RESIZE - | CLUTTER_FEATURE_STAGE_CURSOR; -} - -/** - * clutter_win32_disable_event_retrieval - * - * Disables retrieval of Windows messages in the main loop. Use to - * create event-less canvas. - * - * This function can only be called before calling clutter_init(). - * - * Since: 0.8 - */ -void -clutter_win32_disable_event_retrieval (void) -{ - if (_clutter_context_is_initialized ()) - { - g_warning ("clutter_win32_disable_event_retrieval() can only be " - "called before clutter_init()"); - return; - } - - _no_event_retrieval = TRUE; -} - -static CoglRenderer * -clutter_backend_win32_get_renderer (ClutterBackend *backend, - GError **error) -{ - CoglRenderer *renderer; - - CLUTTER_NOTE (BACKEND, "Creating a new WGL renderer"); - - renderer = cogl_renderer_new (); - cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_WGL); - - /* We don't want Cogl to install its default event handler because - * we'll handle them manually */ - cogl_win32_renderer_set_event_retrieval_enabled (renderer, FALSE); - - return renderer; -} - -static void -clutter_backend_win32_class_init (ClutterBackendWin32Class *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - ClutterBackendClass *backend_class = CLUTTER_BACKEND_CLASS (klass); - - gobject_class->constructor = clutter_backend_win32_constructor; - gobject_class->dispose = clutter_backend_win32_dispose; - gobject_class->finalize = clutter_backend_win32_finalize; - - backend_class->stage_window_type = CLUTTER_TYPE_STAGE_WIN32; - - backend_class->init_events = clutter_backend_win32_init_events; - backend_class->get_features = clutter_backend_win32_get_features; - backend_class->get_renderer = clutter_backend_win32_get_renderer; -} - -static void -clutter_backend_win32_init (ClutterBackendWin32 *backend_win32) -{ - backend_win32->invisible_cursor = NULL; - - /* FIXME: get from GetSystemMetric? - clutter_backend_set_double_click_time (backend, 250); - clutter_backend_set_double_click_distance (backend, 5); - clutter_backend_set_resolution (backend, 96.0); - */ - - /* Set the maximum precision for Windows time functions. Without - this glib will not be able to sleep accurately enough to give a - reasonable frame rate */ - timeBeginPeriod (1); -} - -BOOL WINAPI -DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - /* Store the module handle so that we can use it to load resources */ - clutter_hinst = hinst; - - return TRUE; -} - -ClutterBackend * -clutter_backend_win32_new (void) -{ - return g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL); -} diff --git a/clutter/win32/clutter-backend-win32.h b/clutter/win32/clutter-backend-win32.h deleted file mode 100644 index 3981ed3d0..000000000 --- a/clutter/win32/clutter-backend-win32.h +++ /dev/null @@ -1,79 +0,0 @@ -/* Clutter. - * An OpenGL based 'interactive canvas' library. - * Authored By Matthew Allum - * Copyright (C) 2006-2007 OpenedHand - * - * 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 . - * - * - */ - -#ifndef __CLUTTER_BACKEND_WIN32_H__ -#define __CLUTTER_BACKEND_WIN32_H__ - -#include -#include -#include - -#include "clutter-backend-private.h" - -#include "clutter-win32.h" - -G_BEGIN_DECLS - -#define CLUTTER_TYPE_BACKEND_WIN32 (clutter_backend_win32_get_type ()) -#define CLUTTER_BACKEND_WIN32(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND_WIN32, ClutterBackendWin32)) -#define CLUTTER_IS_BACKEND_WIN32(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND_WIN32)) -#define CLUTTER_BACKEND_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND_WIN32, ClutterBackendWin32Class)) -#define CLUTTER_IS_BACKEND_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND_WIN32)) -#define CLUTTER_BACKEND_WIN32_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BACKEND_WIN32, ClutterBackendWin32Class)) - -typedef struct _ClutterBackendWin32 ClutterBackendWin32; -typedef struct _ClutterBackendWin32Class ClutterBackendWin32Class; - -struct _ClutterBackendWin32 -{ - ClutterBackend parent_instance; - - HCURSOR invisible_cursor; - - GSource *event_source; - - ClutterDeviceManager *device_manager; -}; - -struct _ClutterBackendWin32Class -{ - ClutterBackendClass parent_class; -}; - -void _clutter_backend_win32_events_init (ClutterBackend *backend); -void _clutter_backend_win32_events_uninit (ClutterBackend *backend); - -GType clutter_backend_win32_get_type (void) G_GNUC_CONST; - -void -clutter_backend_win32_add_options (ClutterBackend *backend, - GOptionGroup *group); - -ClutterFeatureFlags -clutter_backend_win32_get_features (ClutterBackend *backend); - -HCURSOR _clutter_backend_win32_get_invisible_cursor (ClutterBackend *backend); - -ClutterBackend *clutter_backend_win32_new (void); - -G_END_DECLS - -#endif /* __CLUTTER_BACKEND_WIN32_H__ */ diff --git a/clutter/win32/clutter-device-manager-win32.c b/clutter/win32/clutter-device-manager-win32.c deleted file mode 100644 index 3527c9cf3..000000000 --- a/clutter/win32/clutter-device-manager-win32.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Copyright (C) 2009 Intel Corp. - * - * 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 . - * - * Author: Emmanuele Bassi - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "clutter-backend-win32.h" -#include "clutter-device-manager-win32.h" -#include "clutter-device-manager-win32.h" -#include "clutter-stage-win32.h" - -#include "clutter-backend.h" -#include "clutter-debug.h" -#include "clutter-device-manager-private.h" -#include "clutter-private.h" - -enum -{ - PROP_0 -}; - -G_DEFINE_TYPE (ClutterDeviceManagerWin32, - clutter_device_manager_win32, - CLUTTER_TYPE_DEVICE_MANAGER); - -static void -clutter_device_manager_win32_constructed (GObject *gobject) -{ - ClutterDeviceManager *manager = CLUTTER_DEVICE_MANAGER (gobject); - ClutterDeviceManagerWin32 *manager_win32; - ClutterInputDevice *device; - - device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE, - "id", 0, - "name", "Core Pointer", - "device-type", CLUTTER_POINTER_DEVICE, - "device-mode", CLUTTER_INPUT_MODE_MASTER, - "has-cursor", TRUE, - "enabled", TRUE, - NULL); - CLUTTER_NOTE (BACKEND, "Added core pointer device"); - _clutter_device_manager_add_device (manager, device); - - device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE, - "id", 1, - "name", "Core Keyboard", - "device-type", CLUTTER_KEYBOARD_DEVICE, - "device-mode", CLUTTER_INPUT_MODE_MASTER, - "enabled", TRUE, - NULL); - CLUTTER_NOTE (BACKEND, "Added core keyboard device"); - _clutter_device_manager_add_device (manager, device); - - manager_win32 = CLUTTER_DEVICE_MANAGER_WIN32 (manager); - - _clutter_input_device_set_associated_device (manager_win32->core_pointer, - manager_win32->core_keyboard); - _clutter_input_device_set_associated_device (manager_win32->core_keyboard, - manager_win32->core_pointer); -} - -static void -clutter_device_manager_win32_add_device (ClutterDeviceManager *manager, - ClutterInputDevice *device) -{ - ClutterDeviceManagerWin32 *manager_win32 = CLUTTER_DEVICE_MANAGER_WIN32 (manager); - ClutterInputDeviceType device_type; - gboolean is_pointer, is_keyboard; - - device_type = clutter_input_device_get_device_type (device); - is_pointer = (device_type == CLUTTER_POINTER_DEVICE) ? TRUE : FALSE; - is_keyboard = (device_type == CLUTTER_KEYBOARD_DEVICE) ? TRUE : FALSE; - - manager_win32->devices = g_slist_prepend (manager_win32->devices, device); - - if (is_pointer && manager_win32->core_pointer == NULL) - manager_win32->core_pointer = device; - - if (is_keyboard && manager_win32->core_keyboard == NULL) - manager_win32->core_keyboard = device; -} - -static void -clutter_device_manager_win32_remove_device (ClutterDeviceManager *manager, - ClutterInputDevice *device) -{ - ClutterDeviceManagerWin32 *manager_win32 = CLUTTER_DEVICE_MANAGER_WIN32 (manager); - - manager_win32->devices = g_slist_remove (manager_win32->devices, device); -} - -static const GSList * -clutter_device_manager_win32_get_devices (ClutterDeviceManager *manager) -{ - return CLUTTER_DEVICE_MANAGER_WIN32 (manager)->devices; -} - -static ClutterInputDevice * -clutter_device_manager_win32_get_core_device (ClutterDeviceManager *manager, - ClutterInputDeviceType type) -{ - ClutterDeviceManagerWin32 *manager_win32; - - manager_win32 = CLUTTER_DEVICE_MANAGER_WIN32 (manager); - - switch (type) - { - case CLUTTER_POINTER_DEVICE: - return manager_win32->core_pointer; - - case CLUTTER_KEYBOARD_DEVICE: - return manager_win32->core_keyboard; - - case CLUTTER_EXTENSION_DEVICE: - default: - return NULL; - } - - return NULL; -} - -static ClutterInputDevice * -clutter_device_manager_win32_get_device (ClutterDeviceManager *manager, - gint id) -{ - ClutterDeviceManagerWin32 *manager_win32 = CLUTTER_DEVICE_MANAGER_WIN32 (manager); - GSList *l; - - for (l = manager_win32->devices; l != NULL; l = l->next) - { - ClutterInputDevice *device = l->data; - - if (clutter_input_device_get_device_id (device) == id) - return device; - } - - return NULL; -} - -static void -clutter_device_manager_win32_class_init (ClutterDeviceManagerWin32Class *klass) -{ - ClutterDeviceManagerClass *manager_class; - GObjectClass *gobject_class = (GObjectClass *) klass; - - gobject_class->constructed = clutter_device_manager_win32_constructed; - - manager_class = CLUTTER_DEVICE_MANAGER_CLASS (klass); - manager_class->add_device = clutter_device_manager_win32_add_device; - manager_class->remove_device = clutter_device_manager_win32_remove_device; - manager_class->get_devices = clutter_device_manager_win32_get_devices; - manager_class->get_core_device = clutter_device_manager_win32_get_core_device; - manager_class->get_device = clutter_device_manager_win32_get_device; -} - -static void -clutter_device_manager_win32_init (ClutterDeviceManagerWin32 *self) -{ -} diff --git a/clutter/win32/clutter-device-manager-win32.h b/clutter/win32/clutter-device-manager-win32.h deleted file mode 100644 index 4e1b0af71..000000000 --- a/clutter/win32/clutter-device-manager-win32.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Copyright (C) 2010 Intel Corp. - * - * 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 . - * - * Author: Emmanuele Bassi - */ - -#ifndef __CLUTTER_DEVICE_MANAGER_WIN32_H__ -#define __CLUTTER_DEVICE_MANAGER_WIN32_H__ - -#include - -G_BEGIN_DECLS - -#define CLUTTER_TYPE_DEVICE_MANAGER_WIN32 (clutter_device_manager_win32_get_type ()) -#define CLUTTER_DEVICE_MANAGER_WIN32(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_DEVICE_MANAGER_WIN32, ClutterDeviceManagerWin32)) -#define CLUTTER_IS_DEVICE_MANAGER_WIN32(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_DEVICE_MANAGER_WIN32)) -#define CLUTTER_DEVICE_MANAGER_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_DEVICE_MANAGER_WIN32, ClutterDeviceManagerWin32Class)) -#define CLUTTER_IS_DEVICE_MANAGER_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DEVICE_MANAGER_WIN32)) -#define CLUTTER_DEVICE_MANAGER_WIN32_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DEVICE_MANAGER_WIN32, ClutterDeviceManagerWin32Class)) - -typedef struct _ClutterDeviceManagerWin32 ClutterDeviceManagerWin32; -typedef struct _ClutterDeviceManagerWin32Class ClutterDeviceManagerWin32Class; - -struct _ClutterDeviceManagerWin32 -{ - ClutterDeviceManager parent_instance; - - GSList *devices; - - ClutterInputDevice *core_pointer; - ClutterInputDevice *core_keyboard; -}; - -struct _ClutterDeviceManagerWin32Class -{ - ClutterDeviceManagerClass parent_class; -}; - -GType clutter_device_manager_win32_get_type (void) G_GNUC_CONST; - -G_END_DECLS - -#endif /* __CLUTTER_DEVICE_MANAGER_WIN32_H__ */ diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c deleted file mode 100644 index 7a360c625..000000000 --- a/clutter/win32/clutter-event-win32.c +++ /dev/null @@ -1,754 +0,0 @@ -/* Clutter. - * An OpenGL based 'interactive canvas' library. - * Authored By Matthew Allum - * Copyright (C) 2006-2007 OpenedHand - * - * 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 . - * - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "clutter-stage-win32.h" -#include "clutter-backend-win32.h" -#include "clutter-win32.h" - -#include "clutter-backend.h" -#include "clutter-debug.h" -#include "clutter-device-manager-private.h" -#include "clutter-event-private.h" -#include "clutter-keysyms.h" -#include "clutter-main.h" -#include "clutter-private.h" -#include "clutter-stage-private.h" - -#include -#include -#include -#include -#include - -typedef struct _ClutterEventSource ClutterEventSource; - -struct _ClutterEventSource -{ - GSource source; - - ClutterBackend *backend; - GPollFD event_poll_fd; -}; - -static gboolean clutter_event_prepare (GSource *source, - gint *timeout); -static gboolean clutter_event_check (GSource *source); -static gboolean clutter_event_dispatch (GSource *source, - GSourceFunc callback, - gpointer user_data); - -static GSourceFuncs event_funcs = { - clutter_event_prepare, - clutter_event_check, - clutter_event_dispatch, - NULL -}; - -/* Special mapping for some keys that don't have a direct Unicode - value. Must be sorted by the numeric value of the Windows key - virtual key code */ -static const struct -{ - gushort win_sym, clutter_sym; -} clutter_win32_key_map[] = - { - { VK_CANCEL, CLUTTER_KEY_Cancel }, - { VK_BACK, CLUTTER_KEY_BackSpace }, - { VK_TAB, CLUTTER_KEY_Tab }, - { VK_CLEAR, CLUTTER_KEY_Clear }, - { VK_RETURN, CLUTTER_KEY_Return }, - { VK_MENU, CLUTTER_KEY_Menu }, - { VK_PAUSE, CLUTTER_KEY_Pause }, - { VK_HANGUL, CLUTTER_KEY_Hangul }, - { VK_KANJI, CLUTTER_KEY_Kanji }, - { VK_ESCAPE, CLUTTER_KEY_Escape }, - { VK_SPACE, CLUTTER_KEY_space }, - { VK_PRIOR, CLUTTER_KEY_Prior }, - { VK_NEXT, CLUTTER_KEY_Next }, - { VK_END, CLUTTER_KEY_End }, - { VK_HOME, CLUTTER_KEY_Home }, - { VK_LEFT, CLUTTER_KEY_Left }, - { VK_UP, CLUTTER_KEY_Up }, - { VK_RIGHT, CLUTTER_KEY_Right }, - { VK_DOWN, CLUTTER_KEY_Down }, - { VK_SELECT, CLUTTER_KEY_Select }, - { VK_PRINT, CLUTTER_KEY_Print }, - { VK_EXECUTE, CLUTTER_KEY_Execute }, - { VK_INSERT, CLUTTER_KEY_Insert }, - { VK_DELETE, CLUTTER_KEY_Delete }, - { VK_HELP, CLUTTER_KEY_Help }, - { VK_MULTIPLY, CLUTTER_KEY_multiply }, - { VK_F1, CLUTTER_KEY_F1 }, - { VK_F2, CLUTTER_KEY_F2 }, - { VK_F3, CLUTTER_KEY_F3 }, - { VK_F4, CLUTTER_KEY_F4 }, - { VK_F5, CLUTTER_KEY_F5 }, - { VK_F6, CLUTTER_KEY_F6 }, - { VK_F7, CLUTTER_KEY_F7 }, - { VK_F8, CLUTTER_KEY_F8 }, - { VK_F9, CLUTTER_KEY_F9 }, - { VK_F10, CLUTTER_KEY_F10 }, - { VK_F11, CLUTTER_KEY_F11 }, - { VK_F12, CLUTTER_KEY_F12 }, - { VK_F13, CLUTTER_KEY_F13 }, - { VK_F14, CLUTTER_KEY_F14 }, - { VK_F15, CLUTTER_KEY_F15 }, - { VK_F16, CLUTTER_KEY_F16 }, - { VK_F17, CLUTTER_KEY_F17 }, - { VK_F18, CLUTTER_KEY_F18 }, - { VK_F19, CLUTTER_KEY_F19 }, - { VK_F20, CLUTTER_KEY_F20 }, - { VK_F21, CLUTTER_KEY_F21 }, - { VK_F22, CLUTTER_KEY_F22 }, - { VK_F23, CLUTTER_KEY_F23 }, - { VK_F24, CLUTTER_KEY_F24 }, - { VK_LSHIFT, CLUTTER_KEY_Shift_L }, - { VK_RSHIFT, CLUTTER_KEY_Shift_R }, - { VK_LCONTROL, CLUTTER_KEY_Control_L }, - { VK_RCONTROL, CLUTTER_KEY_Control_R } - }; - -#define CLUTTER_WIN32_KEY_MAP_SIZE (G_N_ELEMENTS (clutter_win32_key_map)) - -static GSource * -clutter_event_source_new (ClutterBackend *backend) -{ - GSource *source = g_source_new (&event_funcs, sizeof (ClutterEventSource)); - ClutterEventSource *event_source = (ClutterEventSource *) source; - - event_source->backend = backend; - - g_source_set_name (source, "Clutter Win32 Event Source"); - - return source; -} - -void -_clutter_backend_win32_events_init (ClutterBackend *backend) -{ - ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend); - GSource *source; - ClutterEventSource *event_source; - - source = backend_win32->event_source = clutter_event_source_new (backend); - event_source = (ClutterEventSource *) source; - g_source_set_priority (source, CLUTTER_PRIORITY_EVENTS); - - event_source->event_poll_fd.fd = G_WIN32_MSG_HANDLE; - event_source->event_poll_fd.events = G_IO_IN; - - g_source_add_poll (source, &event_source->event_poll_fd); - g_source_set_can_recurse (source, TRUE); - g_source_attach (source, NULL); -} - -void -_clutter_backend_win32_events_uninit (ClutterBackend *backend) -{ - ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend); - - if (backend_win32->event_source) - { - CLUTTER_NOTE (EVENT, "Destroying the event source"); - - g_source_destroy (backend_win32->event_source); - g_source_unref (backend_win32->event_source); - backend_win32->event_source = NULL; - } -} - -static gboolean -check_msg_pending () -{ - MSG msg; - - return PeekMessageW (&msg, NULL, 0, 0, PM_NOREMOVE) ? TRUE : FALSE; -} - -static ClutterModifierType -get_modifier_state (WPARAM wparam) -{ - ClutterModifierType ret = 0; - - if ((wparam & MK_SHIFT)) - ret |= CLUTTER_SHIFT_MASK; - if ((wparam & MK_CONTROL)) - ret |= CLUTTER_CONTROL_MASK; - if ((wparam & MK_LBUTTON)) - ret |= CLUTTER_BUTTON1_MASK; - if ((wparam & MK_MBUTTON)) - ret |= CLUTTER_BUTTON2_MASK; - if ((wparam & MK_RBUTTON)) - ret |= CLUTTER_BUTTON3_MASK; - - return ret; -} - -static inline void -take_and_queue_event (ClutterEvent *event) -{ - /* The event is added directly to the queue instead of using - clutter_event_put so that it can avoid a copy. This takes - ownership of the event */ - _clutter_event_push (event, FALSE); -} - -static inline void -make_button_event (const MSG *msg, - ClutterStage *stage, - int button, - int click_count, - gboolean release, - ClutterInputDevice *device) -{ - ClutterEvent *event = clutter_event_new (release ? - CLUTTER_BUTTON_RELEASE : - CLUTTER_BUTTON_PRESS); - - event->any.stage = stage; - - event->button.time = msg->time; - event->button.x = GET_X_LPARAM (msg->lParam); - event->button.y = GET_Y_LPARAM (msg->lParam); - event->button.modifier_state = get_modifier_state (msg->wParam); - event->button.button = button; - event->button.click_count = click_count; - clutter_event_set_device (event, device); - - take_and_queue_event (event); -} - -static gboolean -clutter_event_prepare (GSource *source, - gint *timeout) -{ - gboolean retval; - - _clutter_threads_acquire_lock (); - - *timeout = -1; - retval = (clutter_events_pending () || check_msg_pending ()); - - _clutter_threads_release_lock (); - - return retval; -} - -static gboolean -clutter_event_check (GSource *source) -{ - ClutterEventSource *event_source = (ClutterEventSource *) source; - gboolean retval; - - _clutter_threads_acquire_lock (); - - if ((event_source->event_poll_fd.revents & G_IO_IN)) - retval = (clutter_events_pending () || check_msg_pending ()); - else - retval = FALSE; - - _clutter_threads_release_lock (); - - return retval; -} - -static gboolean -clutter_event_dispatch (GSource *source, - GSourceFunc callback, - gpointer user_data) -{ - ClutterEvent *event; - MSG msg; - - _clutter_threads_acquire_lock (); - - /* Process Windows messages until we've got one that translates into - the clutter event queue */ - while (!clutter_events_pending () && PeekMessageW (&msg, NULL, - 0, 0, PM_REMOVE)) - DispatchMessageW (&msg); - - /* Pop an event off the queue if any */ - if ((event = clutter_event_get ())) - { - /* forward the event into clutter for emission etc. */ - if (event->any.stage) - _clutter_stage_queue_event (event->any.stage, event, FALSE); - } - - _clutter_threads_release_lock (); - - return TRUE; -} - -static ClutterModifierType -get_key_modifier_state (const BYTE *key_states) -{ - ClutterModifierType ret = 0; - - if ((key_states[VK_SHIFT] & 0x80) - || (key_states[VK_LSHIFT] & 0x80) - || (key_states[VK_RSHIFT] & 0x80)) - ret |= CLUTTER_SHIFT_MASK; - if ((key_states[VK_CONTROL] & 0x80) - || (key_states[VK_LCONTROL] & 0x80) - || (key_states[VK_RCONTROL] & 0x80)) - ret |= CLUTTER_CONTROL_MASK; - if ((key_states[VK_MENU] & 0x80) - || (key_states[VK_LMENU] & 0x80) - || (key_states[VK_RMENU] & 0x80)) - ret |= CLUTTER_MOD1_MASK; - if (key_states[VK_CAPITAL]) - ret |= CLUTTER_LOCK_MASK; - - return ret; -} - -/** - * clutter_win32_handle_event: - * @msg: A pointer to a structure describing a Win32 message. - * - * This function processes a single Win32 message. It can be used to - * hook into external windows message processing (for example, a GDK - * filter function). - * - * If clutter_win32_disable_event_retrieval() has been called, you must - * let this function process events to update Clutter's internal state. - * - * Return value: %TRUE if the message was handled entirely by Clutter - * and no further processing (such as calling the default window - * procedure) should take place. %FALSE is returned if is the message - * was not handled at all or if Clutter expects processing to take - * place. - * - * Since: 1.6 - */ -gboolean -clutter_win32_handle_event (const MSG *msg) -{ - ClutterBackend *backend; - ClutterBackendWin32 *backend_win32; - ClutterStageWin32 *stage_win32; - ClutterDeviceManager *manager; - ClutterInputDevice *core_pointer, *core_keyboard; - ClutterStage *stage; - ClutterStageWindow *impl; - gboolean return_value = FALSE; - - stage = clutter_win32_get_stage_from_window (msg->hwnd); - - /* Ignore any messages for windows which we don't have a stage for */ - if (stage == NULL) - return FALSE; - - impl = _clutter_stage_get_window (stage); - stage_win32 = CLUTTER_STAGE_WIN32 (impl); - backend_win32 = stage_win32->backend; - backend = CLUTTER_BACKEND (backend_win32); - - /* Give Cogl a chance to handle the message first */ - if (backend->cogl_renderer != NULL && - cogl_win32_renderer_handle_event (backend->cogl_renderer, - (void *) msg) == COGL_FILTER_REMOVE) - return TRUE; - - manager = clutter_device_manager_get_default (); - if (manager == NULL) - return FALSE; - - core_pointer = - clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE); - core_keyboard = - clutter_device_manager_get_core_device (manager, CLUTTER_KEYBOARD_DEVICE); - - switch (msg->message) - { - case WM_SIZE: - if (!stage_win32->is_foreign_win - /* Ignore size changes resulting from the stage being - minimized - otherwise the window size will be set to - 0,0 */ - && msg->wParam != SIZE_MINIMIZED) - { - WORD new_width = LOWORD (msg->lParam); - WORD new_height = HIWORD (msg->lParam); - gfloat old_width, old_height; - - clutter_actor_get_size (CLUTTER_ACTOR (stage), - &old_width, &old_height); - - if (new_width != old_width || new_height != old_height) - clutter_actor_set_size (CLUTTER_ACTOR (stage), - new_width, new_height); - } - break; - - case WM_SHOWWINDOW: - if (msg->wParam) - clutter_stage_win32_map (stage_win32); - else - clutter_stage_win32_unmap (stage_win32); - break; - - case WM_ACTIVATE: - if (msg->wParam == WA_INACTIVE) - { - if (_clutter_stage_is_activated (stage_win32->wrapper)) - { - _clutter_stage_update_state (stage_win32->wrapper, - CLUTTER_STAGE_STATE_ACTIVATED, - 0); - } - } - else if (!_clutter_stage_is_activated (stage_win32->wrapper)) - { - _clutter_stage_update_state (stage_win32->wrapper, - 0, - CLUTTER_STAGE_STATE_ACTIVATED); - } - break; - - case WM_PAINT: - CLUTTER_NOTE (BACKEND, "expose for stage:%p, redrawing", stage); - clutter_stage_ensure_redraw (stage); - break; - - case WM_DESTROY: - { - ClutterEvent *event = clutter_event_new (CLUTTER_DESTROY_NOTIFY); - - CLUTTER_NOTE (EVENT, "WM_DESTROY"); - - event->any.stage = stage; - - take_and_queue_event (event); - } - break; - - case WM_CLOSE: - { - ClutterEvent *event = clutter_event_new (CLUTTER_DELETE); - - CLUTTER_NOTE (EVENT, "WM_CLOSE"); - - event->any.stage = stage; - - take_and_queue_event (event); - - /* The default window proc will destroy the window so we want to - prevent this to allow applications to optionally destroy the - window themselves */ - return_value = TRUE; - } - break; - - case WM_LBUTTONDOWN: - make_button_event (msg, stage, 1, 1, FALSE, core_pointer); - break; - - case WM_MBUTTONDOWN: - make_button_event (msg, stage, 2, 1, FALSE, core_pointer); - break; - - case WM_RBUTTONDOWN: - make_button_event (msg, stage, 3, 1, FALSE, core_pointer); - break; - - case WM_LBUTTONUP: - make_button_event (msg, stage, 1, 1, TRUE, core_pointer); - break; - - case WM_MBUTTONUP: - make_button_event (msg, stage, 2, 1, TRUE, core_pointer); - break; - - case WM_RBUTTONUP: - make_button_event (msg, stage, 3, 1, TRUE, core_pointer); - break; - - case WM_LBUTTONDBLCLK: - make_button_event (msg, stage, 1, 2, FALSE, core_pointer); - break; - - case WM_MBUTTONDBLCLK: - make_button_event (msg, stage, 2, 2, FALSE, core_pointer); - break; - - case WM_RBUTTONDBLCLK: - make_button_event (msg, stage, 3, 2, FALSE, core_pointer); - break; - - case WM_MOUSEWHEEL: - stage_win32->scroll_pos += (SHORT) HIWORD (msg->wParam); - - while (abs (stage_win32->scroll_pos) >= WHEEL_DELTA) - { - ClutterEvent *event = clutter_event_new (CLUTTER_SCROLL); - POINT pt; - - event->scroll.time = msg->time; - event->scroll.modifier_state = - get_modifier_state (LOWORD (msg->wParam)); - event->any.stage = stage; - - clutter_event_set_device (event, core_pointer); - - /* conversion to window coordinates is required */ - pt.x = GET_X_LPARAM (msg->lParam); - pt.y = GET_Y_LPARAM (msg->lParam); - ScreenToClient (msg->hwnd, &pt); - event->scroll.x = pt.x; - event->scroll.y = pt.y; - - if (stage_win32->scroll_pos > 0) - { - event->scroll.direction = CLUTTER_SCROLL_UP; - stage_win32->scroll_pos -= WHEEL_DELTA; - } - else - { - event->scroll.direction = CLUTTER_SCROLL_DOWN; - stage_win32->scroll_pos += WHEEL_DELTA; - } - - take_and_queue_event (event); - } - break; - - case WM_MOUSEMOVE: - { - ClutterEvent *event = clutter_event_new (CLUTTER_MOTION); - - event->motion.time = msg->time; - event->motion.x = GET_X_LPARAM (msg->lParam); - event->motion.y = GET_Y_LPARAM (msg->lParam); - event->motion.modifier_state = get_modifier_state (msg->wParam); - event->any.stage = stage; - - clutter_event_set_device (event, core_pointer); - - /* We need to start tracking when the mouse enters the stage if - we're not already */ - if (!stage_win32->tracking_mouse) - { - ClutterEvent *crossing = clutter_event_new (CLUTTER_ENTER); - TRACKMOUSEEVENT tmevent; - - tmevent.cbSize = sizeof (tmevent); - tmevent.dwFlags = TME_LEAVE; - tmevent.hwndTrack = stage_win32->hwnd; - TrackMouseEvent (&tmevent); - - event->crossing.time = msg->time; - event->crossing.x = event->motion.x; - event->crossing.y = event->motion.y; - event->crossing.stage = stage; - event->crossing.source = CLUTTER_ACTOR (stage); - event->crossing.related = NULL; - - clutter_event_set_device (event, core_pointer); - - /* we entered the stage */ - _clutter_input_device_set_stage (core_pointer, stage); - - take_and_queue_event (crossing); - - stage_win32->tracking_mouse = TRUE; - } - - take_and_queue_event (event); - } - break; - - case WM_MOUSELEAVE: - { - ClutterEvent *event = clutter_event_new (CLUTTER_LEAVE); - - event->crossing.time = msg->time; - event->crossing.x = msg->pt.x; - event->crossing.y = msg->pt.y; - event->crossing.stage = stage; - event->crossing.source = CLUTTER_ACTOR (stage); - event->crossing.related = NULL; - - clutter_event_set_device (event, core_pointer); - - /* we left the stage */ - _clutter_input_device_set_stage (core_pointer, NULL); - - /* When we get a leave message the mouse tracking is - automatically cancelled so we'll need to start it again when - the mouse next enters the window */ - stage_win32->tracking_mouse = FALSE; - - take_and_queue_event (event); - } - break; - - case WM_KEYDOWN: - case WM_KEYUP: - case WM_SYSKEYDOWN: - case WM_SYSKEYUP: - { - ClutterEvent *event = clutter_event_new (CLUTTER_EVENT_NONE); - int scan_code = (msg->lParam >> 16) & 0xff; - int min = 0, max = CLUTTER_WIN32_KEY_MAP_SIZE, mid; - BYTE key_states[256]; - - /* Get the keyboard modifier states. GetKeyboardState - conveniently gets the key state that was current when the - last keyboard message read was generated */ - GetKeyboardState(key_states); - - /* Binary chop to check if we have a direct mapping for this - key code */ - while (min < max) - { - mid = (min + max) / 2; - if (clutter_win32_key_map[mid].win_sym == msg->wParam) - { - event->key.keyval = clutter_win32_key_map[mid].clutter_sym; - event->key.unicode_value = 0; - break; - } - else if (clutter_win32_key_map[mid].win_sym < msg->wParam) - min = mid + 1; - else - max = mid; - } - - /* If we don't have a direct mapping then try getting the - unicode value of the key sym */ - if (min >= max) - { - WCHAR ch; - BYTE shift_state[256]; - - /* Translate to a Unicode value, but only take into - account the shift key. That way Ctrl+Shift+C will - generate a capital C virtual key code with a zero - unicode value for example */ - memset (shift_state, 0, 256); - shift_state[VK_SHIFT] = key_states[VK_SHIFT]; - shift_state[VK_LSHIFT] = key_states[VK_LSHIFT]; - shift_state[VK_RSHIFT] = key_states[VK_RSHIFT]; - shift_state[VK_CAPITAL] = key_states[VK_CAPITAL]; - - if (ToUnicode (msg->wParam, scan_code, - shift_state, &ch, 1, 0) == 1 - /* The codes in this range directly match the Latin 1 - codes so we can just use the Unicode value as the - key sym */ - && ch >= 0x20 && ch <= 0xff) - event->key.keyval = ch; - else - /* Otherwise we don't know what the key means but the - application might be able to do something with the - scan code so we might as well still generate the - event */ - event->key.keyval = CLUTTER_KEY_VoidSymbol; - - /* Get the unicode value of the keypress again using the - full modifier state */ - if (ToUnicode (msg->wParam, scan_code, - key_states, &ch, 1, 0) == 1) - event->key.unicode_value = ch; - else - event->key.unicode_value = 0; - } - - event->key.type = msg->message == WM_KEYDOWN - || msg->message == WM_SYSKEYDOWN - ? CLUTTER_KEY_PRESS : CLUTTER_KEY_RELEASE; - event->key.time = msg->time; - event->key.modifier_state = get_key_modifier_state (key_states); - event->key.hardware_keycode = scan_code; - event->any.stage = stage; - - clutter_event_set_device (event, core_keyboard); - - take_and_queue_event (event); - } - break; - - case WM_GETMINMAXINFO: - { - MINMAXINFO *min_max_info = (MINMAXINFO *) msg->lParam; - _clutter_stage_win32_get_min_max_info (stage_win32, min_max_info); - return_value = TRUE; - } - break; - - case WM_SETCURSOR: - /* If the cursor is in the window's client area and the stage's - cursor should be invisible then we'll set a blank cursor - instead */ - if (LOWORD (msg->lParam) == HTCLIENT && !stage_win32->is_cursor_visible) - { - return_value = TRUE; - _clutter_stage_win32_update_cursor (stage_win32); - } - break; - } - - return return_value; -} - -LRESULT CALLBACK -_clutter_stage_win32_window_proc (HWND hwnd, UINT umsg, - WPARAM wparam, LPARAM lparam) -{ - gboolean message_handled = FALSE; - - /* Windows sends some messages such as WM_GETMINMAXINFO and - WM_CREATE before returning from CreateWindow. The stage point - will not yet be stored in the Window structure in this case so we - need to skip these messages because we can't know which stage the - window belongs to */ - if (GetWindowLongPtrW (hwnd, 0)) - { - MSG msg; - DWORD message_pos = GetMessagePos (); - - /* Convert the parameters to a MSG struct */ - msg.hwnd = hwnd; - msg.message = umsg; - msg.wParam = wparam; - msg.lParam = lparam; - msg.time = GetMessageTime (); - /* Neither MAKE_POINTS nor GET_[XY]_LPARAM is defined in MinGW - headers so we need to convert to a signed type explicitly */ - msg.pt.x = (SHORT) LOWORD (message_pos); - msg.pt.y = (SHORT) HIWORD (message_pos); - - /* Process the message */ - message_handled = clutter_win32_handle_event (&msg); - } - - if (!message_handled) - return DefWindowProcW (hwnd, umsg, wparam, lparam); - else - return 0; -} diff --git a/clutter/win32/clutter-stage-win32.c b/clutter/win32/clutter-stage-win32.c deleted file mode 100644 index cdc1fc69b..000000000 --- a/clutter/win32/clutter-stage-win32.c +++ /dev/null @@ -1,865 +0,0 @@ -/* Clutter. - * An OpenGL based 'interactive canvas' library. - * Authored By Matthew Allum - * Copyright (C) 2006-2007 OpenedHand - * - * 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 . - * - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "clutter-backend-win32.h" -#include "clutter-stage-win32.h" -#include "clutter-win32.h" - -#include "clutter-actor-private.h" -#include "clutter-main.h" -#include "clutter-feature.h" -#include "clutter-event.h" -#include "clutter-enum-types.h" -#include "clutter-private.h" -#include "clutter-debug.h" -#include "clutter-stage-private.h" - -#include "cogl/cogl.h" - -#include - -static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface); - -enum -{ - PROP_0, - - PROP_BACKEND, - PROP_WRAPPER -}; - -G_DEFINE_TYPE_WITH_CODE (ClutterStageWin32, - clutter_stage_win32, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE - (CLUTTER_TYPE_STAGE_WINDOW, - clutter_stage_window_iface_init)); - -static void -clutter_stage_win32_show (ClutterStageWindow *stage_window, - gboolean do_raise) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - if (stage_win32->hwnd) - { - ShowWindow (stage_win32->hwnd, do_raise ? SW_SHOW : SW_SHOWNA); - - if (stage_win32->accept_focus) - SetForegroundWindow (stage_win32->hwnd); - - clutter_actor_map (CLUTTER_ACTOR (stage_win32->wrapper)); - } -} - -static void -clutter_stage_win32_hide (ClutterStageWindow *stage_window) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - if (stage_win32->hwnd) - { - clutter_actor_unmap (CLUTTER_ACTOR (stage_win32->wrapper)); - ShowWindow (stage_win32->hwnd, SW_HIDE); - } -} - -static void -clutter_stage_win32_get_geometry (ClutterStageWindow *stage_window, - cairo_rectangle_int_t *geometry) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - if (_clutter_stage_is_fullscreen (stage_win32->wrapper)) - { - geometry->width = stage_win32->fullscreen_rect.right - - stage_win32->fullscreen_rect.left; - geometry->height = stage_win32->fullscreen_rect.bottom - - stage_win32->fullscreen_rect.top; - return; - } - - geometry->width = stage_win32->win_width; - geometry->height = stage_win32->win_height; -} - -static void -get_fullscreen_rect (ClutterStageWin32 *stage_win32) -{ - HMONITOR monitor; - MONITORINFO monitor_info; - - /* If we already have a window then try to use the same monitor that - is already on */ - if (stage_win32->hwnd) - monitor = MonitorFromWindow (stage_win32->hwnd, MONITOR_DEFAULTTONEAREST); - else - { - /* Otherwise just guess that they will want the monitor where - the cursor is */ - POINT cursor; - GetCursorPos (&cursor); - monitor = MonitorFromPoint (cursor, MONITOR_DEFAULTTONEAREST); - } - - monitor_info.cbSize = sizeof (monitor_info); - GetMonitorInfoW (monitor, &monitor_info); - stage_win32->fullscreen_rect = monitor_info.rcMonitor; -} - -static void -get_full_window_size (ClutterStageWin32 *stage_win32, - int width_in, int height_in, - int *width_out, int *height_out) -{ - gboolean resizable - = clutter_stage_get_user_resizable (stage_win32->wrapper); - /* The window size passed to CreateWindow includes the window - decorations */ - gint frame_width, frame_height; - -#if !defined (_MSC_VER) || (_MSC_VER < 1700) - frame_width = GetSystemMetrics (resizable ? SM_CXSIZEFRAME : SM_CXFIXEDFRAME); - frame_height = GetSystemMetrics (resizable ? SM_CYSIZEFRAME : SM_CYFIXEDFRAME); -#else - /* MSVC 2012 and later returns wrong values from GetSystemMetrics() - * http://connect.microsoft.com/VisualStudio/feedback/details/753224/regression-getsystemmetrics-delivers-different-values - * - * For AdjustWindowRectEx(), it doesn't matter much whether the Window is resizble. - */ - - RECT cxrect = {0, 0, 0, 0}; - AdjustWindowRectEx (&cxrect, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_THICKFRAME | WS_DLGFRAME, FALSE, 0); - - frame_width = abs (cxrect.bottom); - frame_height = abs (cxrect.left); -#endif - *width_out = width_in + frame_width * 2; - *height_out = height_in + frame_height * 2 + GetSystemMetrics (SM_CYCAPTION); -} - -void -_clutter_stage_win32_get_min_max_info (ClutterStageWin32 *stage_win32, - MINMAXINFO *min_max_info) -{ - /* If the window isn't resizable then set the max and min size to - the current size */ - if (!clutter_stage_get_user_resizable (CLUTTER_STAGE (stage_win32->wrapper))) - { - int full_width, full_height; - get_full_window_size (stage_win32, - stage_win32->win_width, stage_win32->win_height, - &full_width, &full_height); - min_max_info->ptMaxTrackSize.x = full_width; - min_max_info->ptMinTrackSize.x = full_width; - min_max_info->ptMaxTrackSize.y = full_height; - min_max_info->ptMinTrackSize.y = full_height; - } -} - -static void -clutter_stage_win32_resize (ClutterStageWindow *stage_window, - gint width, - gint height) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - gboolean resize; - - resize = clutter_stage_get_user_resizable (stage_win32->wrapper); - - if (width != stage_win32->win_width || height != stage_win32->win_height) - { - /* Ignore size requests if we are in full screen mode */ - if (!_clutter_stage_is_fullscreen (stage_win32->wrapper)) - { - stage_win32->win_width = width; - stage_win32->win_height = height; - - if (stage_win32->hwnd != NULL && !stage_win32->is_foreign_win) - { - int full_width, full_height; - - get_full_window_size (stage_win32, - width, height, - &full_width, &full_height); - - SetWindowPos (stage_win32->hwnd, NULL, - 0, 0, - full_width, full_height, - SWP_NOZORDER | SWP_NOMOVE); - } - } - } -} - -static void -clutter_stage_win32_set_title (ClutterStageWindow *stage_window, - const gchar *title) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - /* Empty window titles not allowed, so set it to just a period. */ - if (title == NULL || !title[0]) - title = "."; - - if (stage_win32->wtitle != NULL) - g_free (stage_win32->wtitle); - stage_win32->wtitle = g_utf8_to_utf16 (title, -1, NULL, NULL, NULL); - - /* If the window is not yet created, the title will be set during the - window creation */ - if (stage_win32->hwnd != NULL) - SetWindowTextW (stage_win32->hwnd, stage_win32->wtitle); -} - -void -_clutter_stage_win32_update_cursor (ClutterStageWin32 *stage_win32) -{ - HCURSOR cursor; - - if (stage_win32->is_cursor_visible) - cursor = (HCURSOR) GetClassLongPtrW (stage_win32->hwnd, GCLP_HCURSOR); - else - { - ClutterBackend *backend = clutter_get_default_backend (); - /* The documentation implies that we can just use - SetCursor(NULL) to get rid of the cursor but apparently this - doesn't work very well so instead we create an invisible - cursor */ - cursor = _clutter_backend_win32_get_invisible_cursor (backend); - } - - SetCursor (cursor); -} - -static void -clutter_stage_win32_set_cursor_visible (ClutterStageWindow *stage_window, - gboolean cursor_visible) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - if (stage_win32->is_cursor_visible != cursor_visible) - { - POINT cursor_pos; - RECT client_rect; - - stage_win32->is_cursor_visible = cursor_visible; - - /* If the cursor is already over the client area of the window - then we need to update it immediately */ - GetCursorPos (&cursor_pos); - if (WindowFromPoint (cursor_pos) == stage_win32->hwnd && - ScreenToClient (stage_win32->hwnd, &cursor_pos) && - GetClientRect (stage_win32->hwnd, &client_rect) && - cursor_pos.x >= client_rect.left && - cursor_pos.y >= client_rect.top && - cursor_pos.x < client_rect.right && - cursor_pos.y < client_rect.bottom) - _clutter_stage_win32_update_cursor (stage_win32); - } -} - -static LONG -get_requested_window_style (ClutterStageWin32 *stage_win32, - gboolean want_fullscreen) -{ - ClutterStage *wrapper = stage_win32->wrapper; - - /* Fullscreen mode shouldn't have any borders */ - if (want_fullscreen) - return WS_POPUP; - /* Otherwise it's an overlapped window but if it isn't resizable - then it shouldn't have a thick frame */ - else if (clutter_stage_get_user_resizable (wrapper)) - return WS_OVERLAPPEDWINDOW; - else - return WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX; -} - -static LONG -get_window_style (ClutterStageWin32 *stage_win32) -{ - ClutterStage *wrapper = stage_win32->wrapper; - - return get_requested_window_style (stage_win32, - _clutter_stage_is_fullscreen (wrapper)); -} - -static void -clutter_stage_win32_set_user_resize (ClutterStageWindow *stage_window, - gboolean value) -{ - HWND hwnd = CLUTTER_STAGE_WIN32 (stage_window)->hwnd; - LONG old_style = GetWindowLongW (hwnd, GWL_STYLE); - - /* Update the window style but preserve the visibility */ - SetWindowLongW (hwnd, GWL_STYLE, - get_window_style (CLUTTER_STAGE_WIN32 (stage_window)) - | (old_style & WS_VISIBLE)); - /* Queue a redraw of the frame */ - RedrawWindow (hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE); -} - -static void -clutter_stage_win32_set_accept_focus (ClutterStageWindow *stage_window, - gboolean accept_focus) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - accept_focus = !!accept_focus; - - stage_win32->accept_focus = accept_focus; -} - -static ClutterActor * -clutter_stage_win32_get_wrapper (ClutterStageWindow *stage_window) -{ - return CLUTTER_ACTOR (CLUTTER_STAGE_WIN32 (stage_window)->wrapper); -} - -static void -clutter_stage_win32_set_fullscreen (ClutterStageWindow *stage_window, - gboolean value) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - HWND hwnd = CLUTTER_STAGE_WIN32 (stage_window)->hwnd; - LONG old_style = GetWindowLongW (hwnd, GWL_STYLE); - ClutterStageStateEvent event; - - if (hwnd) - { - /* Update the window style but preserve the visibility */ - SetWindowLongW (hwnd, GWL_STYLE, - get_requested_window_style (stage_win32, value) - | (old_style & WS_VISIBLE)); - /* Update the window size */ - if (value) - { - get_fullscreen_rect (stage_win32); - SetWindowPos (hwnd, HWND_TOP, - stage_win32->fullscreen_rect.left, - stage_win32->fullscreen_rect.top, - stage_win32->fullscreen_rect.right - - stage_win32->fullscreen_rect.left, - stage_win32->fullscreen_rect.bottom - - stage_win32->fullscreen_rect.top, - 0); - } - else - { - int full_width, full_height; - - get_full_window_size (stage_win32, - stage_win32->win_width, - stage_win32->win_height, - &full_width, &full_height); - - SetWindowPos (stage_win32->hwnd, NULL, - 0, 0, - full_width, full_height, - SWP_NOZORDER | SWP_NOMOVE); - } - } - - /* Report the state change */ - if (value) - { - _clutter_stage_update_state (stage_win32->wrapper, - 0, - CLUTTER_STAGE_STATE_FULLSCREEN); - } - else - { - _clutter_stage_update_state (stage_win32->wrapper, - CLUTTER_STAGE_STATE_FULLSCREEN, - 0); - } -} - -static ATOM -clutter_stage_win32_get_window_class () -{ - static ATOM klass = 0; - - if (klass == 0) - { - WNDCLASSW wndclass; - memset (&wndclass, 0, sizeof (wndclass)); - wndclass.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = _clutter_stage_win32_window_proc; - wndclass.cbWndExtra = sizeof (LONG_PTR); - wndclass.hInstance = GetModuleHandleW (NULL); - wndclass.hIcon = LoadIconW (NULL, (LPWSTR) IDI_APPLICATION); - wndclass.hCursor = LoadCursorW (NULL, (LPWSTR) IDC_ARROW); - wndclass.hbrBackground = NULL; - wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = L"ClutterStageWin32"; - klass = RegisterClassW (&wndclass); - } - - return klass; -} - -static gboolean -clutter_stage_win32_realize (ClutterStageWindow *stage_window) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - ClutterBackend *backend; - ClutterBackendWin32 *backend_win32; - CoglFramebuffer *framebuffer; - gfloat width; - gfloat height; - GError *error = NULL; - - CLUTTER_NOTE (MISC, "Realizing main stage"); - - backend = CLUTTER_BACKEND (stage_win32->backend); - backend_win32 = CLUTTER_BACKEND_WIN32 (backend); - - clutter_actor_get_size (CLUTTER_ACTOR (stage_win32->wrapper), - &width, &height); - - stage_win32->onscreen = cogl_onscreen_new (backend->cogl_context, - width, height); - - if (stage_win32->hwnd == NULL) - { - ATOM window_class = clutter_stage_win32_get_window_class (); - int win_xpos, win_ypos, win_width, win_height; - - if (window_class == 0) - { - g_critical ("Unable to register window class"); - goto fail; - } - - /* If we're in fullscreen mode then use the fullscreen rect - instead */ - if (_clutter_stage_is_fullscreen (stage_win32->wrapper)) - { - get_fullscreen_rect (stage_win32); - win_xpos = stage_win32->fullscreen_rect.left; - win_ypos = stage_win32->fullscreen_rect.top; - win_width = stage_win32->fullscreen_rect.right - win_xpos; - win_height = stage_win32->fullscreen_rect.bottom - win_ypos; - } - else - { - win_xpos = win_ypos = CW_USEDEFAULT; - - get_full_window_size (stage_win32, - stage_win32->win_width, - stage_win32->win_height, - &win_width, &win_height); - } - - if (stage_win32->wtitle == NULL) - stage_win32->wtitle = g_utf8_to_utf16 (".", -1, NULL, NULL, NULL); - - stage_win32->hwnd = CreateWindowW ((LPWSTR) MAKEINTATOM (window_class), - stage_win32->wtitle, - get_window_style (stage_win32), - win_xpos, - win_ypos, - win_width, - win_height, - NULL, NULL, - GetModuleHandle (NULL), - NULL); - - if (stage_win32->hwnd == NULL) - { - g_critical ("Unable to create stage window"); - goto fail; - } - - /* Store a pointer to the actor in the extra bytes of the window - so we can quickly access it in the window procedure */ - SetWindowLongPtrW (stage_win32->hwnd, 0, (LONG_PTR) stage_win32); - } - - cogl_win32_onscreen_set_foreign_window (stage_win32->onscreen, - stage_win32->hwnd); - - cogl_onscreen_set_swap_throttled (stage_win32->onscreen, - _clutter_get_sync_to_vblank ()); - - framebuffer = COGL_FRAMEBUFFER (stage_win32->onscreen); - if (!cogl_framebuffer_allocate (framebuffer, &error)) - { - g_warning ("Failed to allocate stage: %s", error->message); - g_error_free (error); - cogl_object_unref (stage_win32->onscreen); - stage_win32->onscreen = NULL; - goto fail; - } - - /* Create a context. This will be a no-op if we already have one */ - if (!_clutter_backend_create_context (CLUTTER_BACKEND (backend_win32), - &error)) - { - g_critical ("Unable to realize stage: %s", error->message); - g_error_free (error); - goto fail; - } - - CLUTTER_NOTE (BACKEND, "Successfully realized stage"); - - return TRUE; - - fail: - return FALSE; -} - -static void -clutter_stage_win32_unprepare_window (ClutterStageWin32 *stage_win32) -{ - if (!stage_win32->is_foreign_win && stage_win32->hwnd) - { - /* Drop the pointer to this stage in the window so that any - further messages won't be processed. The stage might be being - destroyed so otherwise the messages would be handled with an - invalid stage instance */ - SetWindowLongPtrW (stage_win32->hwnd, 0, (LONG_PTR) 0); - DestroyWindow (stage_win32->hwnd); - } -} - -static void -clutter_stage_win32_unrealize (ClutterStageWindow *stage_window) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - CLUTTER_NOTE (BACKEND, "Unrealizing stage"); - - clutter_stage_win32_unprepare_window (stage_win32); -} - -static void -clutter_stage_win32_redraw (ClutterStageWindow *stage_window) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - /* this will cause the stage implementation to be painted */ - _clutter_stage_do_paint (stage_win32->wrapper, NULL); - cogl_flush (); - - if (stage_win32->onscreen) - cogl_onscreen_swap_buffers (COGL_FRAMEBUFFER (stage_win32->onscreen)); -} - -static CoglFramebuffer * -clutter_stage_win32_get_active_framebuffer (ClutterStageWindow *stage_window) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (stage_window); - - return COGL_FRAMEBUFFER (stage_win32->onscreen); -} - -static void -clutter_stage_win32_set_property (GObject *gobject, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - ClutterStageWin32 *self = CLUTTER_STAGE_WIN32 (gobject); - - switch (prop_id) - { - case PROP_BACKEND: - self->backend = g_value_get_object (value); - break; - - case PROP_WRAPPER: - self->wrapper = g_value_get_object (value); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); - } -} - -static void -clutter_stage_win32_dispose (GObject *gobject) -{ - ClutterStageWin32 *stage_win32 = CLUTTER_STAGE_WIN32 (gobject); - - /* Make sure that context and window are destroyed in case unrealize - * hasn't been called yet. - */ - if (stage_win32->hwnd) - clutter_stage_win32_unprepare_window (stage_win32); - - if (stage_win32->wtitle) - { - g_free (stage_win32->wtitle); - stage_win32->wtitle = NULL; - } - - G_OBJECT_CLASS (clutter_stage_win32_parent_class)->dispose (gobject); -} - -static void -clutter_stage_win32_class_init (ClutterStageWin32Class *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->set_property = clutter_stage_win32_set_property; - gobject_class->dispose = clutter_stage_win32_dispose; - - g_object_class_override_property (gobject_class, PROP_BACKEND, "backend"); - g_object_class_override_property (gobject_class, PROP_WRAPPER, "wrapper"); -} - -static void -clutter_stage_win32_init (ClutterStageWin32 *stage) -{ - stage->hwnd = NULL; - stage->win_width = 640; - stage->win_height = 480; - stage->backend = NULL; - stage->scroll_pos = 0; - stage->wtitle = NULL; - stage->wrapper = NULL; - - stage->is_foreign_win = FALSE; - stage->is_cursor_visible = TRUE; - stage->accept_focus = TRUE; -} - -static void -clutter_stage_window_iface_init (ClutterStageWindowIface *iface) -{ - iface->get_wrapper = clutter_stage_win32_get_wrapper; - iface->set_title = clutter_stage_win32_set_title; - iface->set_fullscreen = clutter_stage_win32_set_fullscreen; - iface->set_cursor_visible = clutter_stage_win32_set_cursor_visible; - iface->set_user_resizable = clutter_stage_win32_set_user_resize; - iface->set_accept_focus = clutter_stage_win32_set_accept_focus; - iface->show = clutter_stage_win32_show; - iface->hide = clutter_stage_win32_hide; - iface->resize = clutter_stage_win32_resize; - iface->get_geometry = clutter_stage_win32_get_geometry; - iface->realize = clutter_stage_win32_realize; - iface->unrealize = clutter_stage_win32_unrealize; - iface->redraw = clutter_stage_win32_redraw; - iface->get_active_framebuffer = clutter_stage_win32_get_active_framebuffer; -} - -/** - * clutter_win32_get_stage_window: - * @stage: a #ClutterStage - * - * Gets the stage's window handle - * - * Return value: An HWND for the stage window. - * - * Since: 0.8 - */ -HWND -clutter_win32_get_stage_window (ClutterStage *stage) -{ - ClutterStageWindow *impl; - - g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL); - - impl = _clutter_stage_get_window (stage); - - g_return_val_if_fail (CLUTTER_IS_STAGE_WIN32 (impl), NULL); - - return CLUTTER_STAGE_WIN32 (impl)->hwnd; -} - -/** - * clutter_win32_get_stage_from_window: - * @hwnd: a window handle - * - * Gets the stage for a particular window. - * - * Return value: The stage or NULL if a stage does not exist for the - * window. - * - * Since: 0.8 - */ -ClutterStage * -clutter_win32_get_stage_from_window (HWND hwnd) -{ - /* Check whether the window handle is an instance of the stage - window class */ - if ((ATOM) GetClassLongPtrW (hwnd, GCW_ATOM) - == clutter_stage_win32_get_window_class ()) - /* If it is there should be a pointer to the stage in the window - extra data */ - return CLUTTER_STAGE_WIN32 (GetWindowLongPtrW (hwnd, 0))->wrapper; - else - { - /* Otherwise it might be a foreign window so we should check the - stage list */ - ClutterStageManager *stage_manager; - const GSList *stages, *l; - - stage_manager = clutter_stage_manager_get_default (); - stages = clutter_stage_manager_peek_stages (stage_manager); - - for (l = stages; l != NULL; l = l->next) - { - ClutterStage *stage = l->data; - ClutterStageWindow *impl; - - impl = _clutter_stage_get_window (stage); - g_assert (CLUTTER_IS_STAGE_WIN32 (impl)); - - if (CLUTTER_STAGE_WIN32 (impl)->hwnd == hwnd) - return stage; - } - } - - return NULL; -} - -typedef struct { - ClutterStageWin32 *stage_win32; - cairo_rectangle_int_t geom; - HWND hwnd; - guint destroy_old_hwnd : 1; -} ForeignWindowData; - -static void -set_foreign_window_callback (ClutterActor *actor, - void *data) -{ - ForeignWindowData *fwd = data; - - CLUTTER_NOTE (BACKEND, "Setting foreign window (0x%x)", - (guint) fwd->hwnd); - - if (fwd->destroy_old_hwnd && fwd->stage_win32->hwnd != NULL) - { - CLUTTER_NOTE (BACKEND, "Destroying previous window (0x%x)", - (guint) fwd->stage_win32->hwnd); - DestroyWindow (fwd->stage_win32->hwnd); - } - - fwd->stage_win32->hwnd = fwd->hwnd; - fwd->stage_win32->is_foreign_win = TRUE; - - fwd->stage_win32->win_width = fwd->geom.width; - fwd->stage_win32->win_height = fwd->geom.height; - - clutter_actor_set_size (actor, fwd->geom.width, fwd->geom.height); - - /* calling this with the stage unrealized will unset the stage - * from the GL context; once the stage is realized the GL context - * will be set again - */ - clutter_stage_ensure_current (CLUTTER_STAGE (actor)); -} - -/** - * clutter_win32_set_stage_foreign: - * @stage: a #ClutterStage - * @hwnd: an existing window handle - * - * Target the #ClutterStage to use an existing external window handle. - * - * Return value: %TRUE if foreign window is valid - * - * Since: 0.8 - */ -gboolean -clutter_win32_set_stage_foreign (ClutterStage *stage, - HWND hwnd) -{ - ClutterStageWin32 *stage_win32; - ClutterStageWindow *impl; - ClutterActor *actor; - RECT client_rect; - ForeignWindowData fwd; - - g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE); - g_return_val_if_fail (hwnd != NULL, FALSE); - - impl = _clutter_stage_get_window (stage); - if (!CLUTTER_IS_STAGE_WIN32 (impl)) - { - g_critical ("The Clutter backend is not a Windows backend"); - return FALSE; - } - - stage_win32 = CLUTTER_STAGE_WIN32 (impl); - - if (!GetClientRect (hwnd, &client_rect)) - { - g_warning ("Unable to retrieve the new window geometry"); - return FALSE; - } - - fwd.stage_win32 = stage_win32; - fwd.hwnd = hwnd; - - /* destroy the old HWND, if we have one and it's ours */ - if (stage_win32->hwnd != NULL && !stage_win32->is_foreign_win) - fwd.destroy_old_hwnd = TRUE; - else - fwd.destroy_old_hwnd = FALSE; - - fwd.geom.x = 0; - fwd.geom.y = 0; - fwd.geom.width = client_rect.right - client_rect.left; - fwd.geom.height = client_rect.bottom - client_rect.top; - - actor = CLUTTER_ACTOR (stage); - - _clutter_actor_rerealize (actor, - set_foreign_window_callback, - &fwd); - - /* Queue a relayout - so the stage will be allocated the new - * window size. - * - * Note also that when the stage gets allocated the new - * window size that will result in the stage's - * priv->viewport being changed, which will in turn result - * in the Cogl viewport changing when _clutter_do_redraw - * calls _clutter_stage_maybe_setup_viewport(). - */ - clutter_actor_queue_relayout (CLUTTER_ACTOR (stage)); - - return TRUE; -} - -void -clutter_stage_win32_map (ClutterStageWin32 *stage_win32) -{ - clutter_actor_map (CLUTTER_ACTOR (stage_win32->wrapper)); - - clutter_actor_queue_relayout (CLUTTER_ACTOR (stage_win32->wrapper)); -} - -void -clutter_stage_win32_unmap (ClutterStageWin32 *stage_win32) -{ - clutter_actor_unmap (CLUTTER_ACTOR (stage_win32->wrapper)); -} diff --git a/clutter/win32/clutter-stage-win32.h b/clutter/win32/clutter-stage-win32.h deleted file mode 100644 index 0aa259796..000000000 --- a/clutter/win32/clutter-stage-win32.h +++ /dev/null @@ -1,89 +0,0 @@ -/* Clutter. - * An OpenGL based 'interactive canvas' library. - * Authored By Matthew Allum - * Copyright (C) 2006-2007 OpenedHand - * - * 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 . - * - * - */ - -#ifndef __CLUTTER_STAGE_WIN32_H__ -#define __CLUTTER_STAGE_WIN32_H__ - -#include -#include -#include - -#include "clutter-backend-win32.h" - -G_BEGIN_DECLS - -#define CLUTTER_TYPE_STAGE_WIN32 (clutter_stage_win32_get_type ()) -#define CLUTTER_STAGE_WIN32(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_WIN32, ClutterStageWin32)) -#define CLUTTER_IS_STAGE_WIN32(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_WIN32)) -#define CLUTTER_STAGE_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STAGE_WIN32, ClutterStageWin32Class)) -#define CLUTTER_IS_STAGE_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_STAGE_WIN32)) -#define CLUTTER_STAGE_WIN32_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STAGE_WIN32, ClutterStageWin32Class)) - -typedef struct _ClutterStageWin32 ClutterStageWin32; -typedef struct _ClutterStageWin32Class ClutterStageWin32Class; - -struct _ClutterStageWin32 -{ - ClutterGroup parent_instance; - - CoglOnscreen *onscreen; - - HWND hwnd; - gint win_width; - gint win_height; - gint scroll_pos; - RECT fullscreen_rect; - wchar_t *wtitle; - - ClutterBackendWin32 *backend; - - ClutterStage *wrapper; - - guint is_foreign_win : 1; - guint tracking_mouse : 1; - guint is_cursor_visible : 1; - guint accept_focus : 1; -}; - -struct _ClutterStageWin32Class -{ - ClutterGroupClass parent_class; -}; - -GType clutter_stage_win32_get_type (void) G_GNUC_CONST; - -void clutter_stage_win32_map (ClutterStageWin32 *stage_win32); -void clutter_stage_win32_unmap (ClutterStageWin32 *stage_win32); - -/* Defined in clutter-event-win32.c */ -LRESULT CALLBACK _clutter_stage_win32_window_proc (HWND hwnd, - UINT msg, - WPARAM wparam, - LPARAM lparam); - -void _clutter_stage_win32_get_min_max_info (ClutterStageWin32 *stage_win32, - MINMAXINFO *min_max_info); - -void _clutter_stage_win32_update_cursor (ClutterStageWin32 *stage_win32); - -G_END_DECLS - -#endif /* __CLUTTER_STAGE_H__ */ diff --git a/clutter/win32/clutter-win32.h b/clutter/win32/clutter-win32.h deleted file mode 100644 index 5112c3928..000000000 --- a/clutter/win32/clutter-win32.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Authored By Matthew Allum - * - * Copyright (C) 2006 OpenedHand - * - * 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 . - * - * - */ - -/** - * SECTION:clutter-win32 - * @short_description: Win32 specific API - * - * The Win32 backend for Clutter provides some specific API, allowing - * integration with the Win32 API for embedding and manipulating the - * stage window. - * - * The ClutterWin32 API is available since Clutter 0.8 - */ - -#ifndef __CLUTTER_WIN32_H__ -#define __CLUTTER_WIN32_H__ - -#include -#include -#include - -G_BEGIN_DECLS - -CLUTTER_AVAILABLE_IN_ALL -HWND clutter_win32_get_stage_window (ClutterStage *stage); -CLUTTER_AVAILABLE_IN_ALL -ClutterStage *clutter_win32_get_stage_from_window (HWND hwnd); - -CLUTTER_AVAILABLE_IN_ALL -gboolean clutter_win32_set_stage_foreign (ClutterStage *stage, - HWND hwnd); - -CLUTTER_AVAILABLE_IN_ALL -void clutter_win32_disable_event_retrieval (void); - -CLUTTER_AVAILABLE_IN_ALL -gboolean clutter_win32_handle_event (const MSG *msg); - -G_END_DECLS - -#endif /* __CLUTTER_WIN32_H__ */ diff --git a/clutter/win32/invisible-cursor.cur b/clutter/win32/invisible-cursor.cur deleted file mode 100644 index 64f53b7cd7ea3af6ad3c8007a85ed6a1c4ed0553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 wcmZQzU}9ioU}9oo009Re76W1pAO?xB05KyFf&d4Ygb)zbNCHsie;^IQ05ntrm;e9( diff --git a/clutter/win32/resources.rc b/clutter/win32/resources.rc deleted file mode 100644 index 2a73874e5..000000000 --- a/clutter/win32/resources.rc +++ /dev/null @@ -1 +0,0 @@ -42 CURSOR "invisible-cursor.cur" diff --git a/configure.ac b/configure.ac index 6fc8ff959..cfea65abe 100644 --- a/configure.ac +++ b/configure.ac @@ -87,29 +87,9 @@ dnl = Preliminary platform checks ============================================= AC_CANONICAL_HOST -platform_win32=no platform_quartz=no platform_linux=no -AC_MSG_CHECKING([if building for some Win32 platform]) -AS_CASE([$host], - [*-*-mingw*|*-*-cygwin*], - [ - CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined" - platform_win32=yes - ], - - [*-*-linux*], - [ - platform_linux=yes - ], - - [] -) -AC_MSG_RESULT([$platform_win32]) - -AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"]) - AC_CHECK_HEADER([OpenGL/gl.h], [platform_quartz=yes], [platform_quartz=no]) AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"]) @@ -191,32 +171,22 @@ AC_SUBST(CLUTTER_LINK_FLAGS) # Check for the visibility flags CLUTTER_HIDDEN_VISIBILITY_CFLAGS="" -case "$host" in - *-*-mingw*) - dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport) - AC_DEFINE([_CLUTTER_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern], - [defines how to decorate public symbols while building]) - CFLAGS="${CFLAGS} -fvisibility=hidden" - ;; - *) - dnl on other compilers, check if we can do -fvisibility=hidden - SAVED_CFLAGS="${CFLAGS}" - CFLAGS="-fvisibility=hidden" - AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) - AC_TRY_COMPILE([], [int main (void) { return 0; }], - AC_MSG_RESULT(yes) - enable_fvisibility_hidden=yes, - AC_MSG_RESULT(no) - enable_fvisibility_hidden=no) - CFLAGS="${SAVED_CFLAGS}" +dnl on other compilers, check if we can do -fvisibility=hidden +SAVED_CFLAGS="${CFLAGS}" +CFLAGS="-fvisibility=hidden" +AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) +AC_TRY_COMPILE([], [int main (void) { return 0; }], + AC_MSG_RESULT(yes) + enable_fvisibility_hidden=yes, + AC_MSG_RESULT(no) + enable_fvisibility_hidden=no) +CFLAGS="${SAVED_CFLAGS}" - AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [ - AC_DEFINE([_CLUTTER_EXTERN], [__attribute__((visibility("default"))) extern], - [defines how to decorate public symbols while building]) - CLUTTER_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" - ]) - ;; -esac +AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [ + AC_DEFINE([_CLUTTER_EXTERN], [__attribute__((visibility("default"))) extern], + [defines how to decorate public symbols while building]) + CLUTTER_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" +]) AC_SUBST(CLUTTER_HIDDEN_VISIBILITY_CFLAGS) AC_CACHE_SAVE @@ -250,10 +220,6 @@ AC_ARG_ENABLE([x11-backend], [AS_HELP_STRING([--enable-x11-backend=@<:@yes/no@:>@], [Enable the X11 backend (default=check)])], [enable_x11=$enableval], [enable_x11=check]) -AC_ARG_ENABLE([win32-backend], - [AS_HELP_STRING([--enable-win32-backend=@<:@yes/no@:>@], [Enable the Windows backend (default=check)])], - [enable_win32=$enableval], - [enable_win32=check]) AC_ARG_ENABLE([quartz-backend], [AS_HELP_STRING([--enable-quartz-backend=@<:@yes/no@:>@], [Enable the OS X backend (default=check)])], [enable_osx=$enableval], @@ -294,10 +260,6 @@ AS_IF([test "x$enable_x11" = xcheck], [ PKG_CHECK_EXISTS([x11], [enable_x11=yes], [enable_x11=no]) ]) -AS_IF([test "x$enable_win32" = xcheck], [ - AS_IF([test "x$platform_win32" = "xyes"], [enable_win32=yes], [enable_win32=no]) -]) - AS_IF([test "x$enable_osx" = xcheck], [ AS_IF([test "x$platform_quartz" = "xyes"], [enable_osx=yes], [enable_osx=no]) ]) @@ -476,19 +438,6 @@ AS_IF([test "x$enable_osx" = "xyes"], SUPPORT_OSX=1 ]) -AS_IF([test "x$enable_win32" = "xyes"], - [ - CLUTTER_BACKENDS="$CLUTTER_BACKENDS win32" - CLUTTER_INPUT_BACKENDS="$CLUTTER_INPUT_BACKENDS win32" - - FLAVOUR_LIBS="$FLAVOUR_LIBS -lopengl32 -lgdi32 -lwinmm" - FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS -D_WIN32_WINNT=0x0500" - - AC_CHECK_TOOL(WINDRES, [windres], [AC_MSG_ERROR([*** windres is required])]) - - SUPPORT_WIN32=1 - ]) - AS_IF([test "x$enable_mir" = "xyes"], [ CLUTTER_BACKENDS="$CLUTTER_BACKENDS mir" @@ -562,7 +511,6 @@ AM_CONDITIONAL(SUPPORT_X11, [test "x$SUPPORT_X11" = "x1"]) AM_CONDITIONAL(SUPPORT_GDK, [test "x$SUPPORT_GDK" = "x1"]) AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "x1"]) AM_CONDITIONAL(SUPPORT_OSX, [test "x$SUPPORT_OSX" = "x1"]) -AM_CONDITIONAL(SUPPORT_WIN32, [test "x$SUPPORT_WIN32" = "x1"]) AM_CONDITIONAL(SUPPORT_CEX100, [test "x$SUPPORT_CEX100" = "x1"]) AM_CONDITIONAL(SUPPORT_WAYLAND, [test "x$SUPPORT_WAYLAND" = "x1"]) AM_CONDITIONAL(SUPPORT_MIR, [test "x$SUPPORT_MIR" = "x1"]) @@ -625,10 +573,6 @@ AS_IF([test "x$SUPPORT_OSX" = "x1"], [CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES #define CLUTTER_WINDOWING_OSX \"osx\" #define CLUTTER_INPUT_OSX \"osx\""]) -AS_IF([test "x$SUPPORT_WIN32" = "x1"], - [CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES -#define CLUTTER_WINDOWING_WIN32 \"win32\" -#define CLUTTER_INPUT_WIN32 \"win32\""]) AS_IF([test "x$SUPPORT_CEX100" = "x1"], [CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES #define CLUTTER_WINDOWING_CEX100 \"cex100\""]) @@ -1195,13 +1139,8 @@ AC_CONFIG_FILES([ build/Makefile build/autotools/Makefile - build/mingw/Makefile - build/win32/Makefile - build/win32/vs9/Makefile - build/win32/vs10/Makefile clutter/Makefile - clutter/config.h.win32 clutter/clutter-config.h clutter/clutter-version.h clutter/clutter-$CLUTTER_API_VERSION.pc:clutter/clutter.pc.in diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index bb935ccdc..126f10377 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -61,11 +61,7 @@ UNIT_TESTS += \ test-image.c endif -if OS_WIN32 -SHEXT = -else SHEXT = $(EXEEXT) -endif # For convenience, this provides a way to easily run individual unit tests: wrappers: stamp-test-interactive @@ -93,23 +89,6 @@ stamp-test-interactive: Makefile done \ && echo timestamp > $(@F) -$(top_builddir)/build/win32/test-interactive-clutter.bat: Makefile - @echo " GEN test-interactive-clutter.bat" ; \ - for i in $(UNIT_TESTS); \ - do \ - case $$i in \ - test-pixmap.c|test-devices.c) ;; \ - *.c) test_bin=$${i%*.c} \ - ;; \ - esac; \ - ( echo "test-interactive-clutter $$test_bin" ) > $$test_bin-clutter.bat ; \ - ( echo "test-interactive-clutter $$test_bin" ) >> test-interactive-clutter.bat ; \ - done \ - && mv -f *.bat $(top_builddir)/build/win32/ - -$(top_builddir)/build/win32/test-unit-names.h: test-unit-names.h - @echo " CP "; cp test-unit-names.h $(top_builddir)/build/win32/ - test-unit-names.h: stamp-test-unit-names @true @@ -132,7 +111,6 @@ clean-wrappers: echo " RM $$test_bin"; \ rm -f $$test_bin$(SHEXT); \ done \ - && rm -f $(top_builddir)/build/win32/*.bat \ && rm -f stamp-test-unit-names \ && rm -f stamp-test-interactive @@ -141,7 +119,7 @@ clean-wrappers: common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la check_PROGRAMS = test-interactive -check_SCRIPTS = wrappers $(top_builddir)/build/win32/test-interactive-clutter.bat +check_SCRIPTS = wrappers test_interactive_SOURCES = test-main.c $(UNIT_TESTS) nodist_test_interactive_SOURCES = test-unit-names.h @@ -161,7 +139,6 @@ test_interactive_LDADD = $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(common_ldadd) $(LI EXTRA_DIST = \ wrapper.sh.in \ - $(top_builddir)/build/win32/test-unit-names.h \ test-script.json \ test-script-signals.json \ redhand.png @@ -170,51 +147,4 @@ DISTCLEANFILES = wrapper.sh .gitignore test-unit-names.h BUILT_SOURCES = test-unit-names.h -dist-hook: $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters - -$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin - for F in $(test_interactive_SOURCES); do \ - case $$F in \ - test-pixmap.c|test-devices.c) ;; \ - *.c) echo ' ' \ - ;; \ - esac; \ - done > testinteractive.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin >$@ - rm -f testinteractive.sourcefiles - -$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin - for F in $(test_interactive_SOURCES); do \ - case $$F in \ - test-pixmap.c|test-devices.c) ;; \ - *.c) echo ' ' \ - ;; \ - esac; \ - done > testinteractive.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin >$@ - rm -f testinteractive.vs10.sourcefiles - -$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin - for F in $(test_interactive_SOURCES); do \ - case $$F in \ - test-pixmap.c|test-devices.c) ;; \ - *.c) echo ' Sources' \ - ;; \ - esac; \ - done > testinteractive.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin >$@ - rm -f testinteractive.vs10.sourcefiles.filters - -# Let the VS9/VS10 Project files be cleared out before they are re-expanded... -DISTCLEANFILES += \ - $(top_builddir)/build/win32/test-unit-names.h \ - $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \ - $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \ - $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters - -EXTRA_DIST += \ - $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \ - $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \ - $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters - clean-local: clean-wrappers