From 0a9f59f386ae78ac6d481b56b0d2d6282f9cc5bc Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 11 Jun 2012 13:39:22 +0000 Subject: [PATCH] build: fix the Visual Studio compilation, remove old solution configuration entries, and update bootstrap script. --- .gitignore | 1 + bootstrap | 15 ++++- caca/figfont.c | 12 ++-- caca/libcaca.vcxproj.filters | 88 ++++++++++++++++++++++++++ configure.ac | 8 +-- libcaca.sln | 119 ++--------------------------------- 6 files changed, 118 insertions(+), 125 deletions(-) create mode 100644 caca/libcaca.vcxproj.filters diff --git a/.gitignore b/.gitignore index ab8da48..aba7cb1 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ doc/latex *.vcxproj.user *.sdf *.suo +ipch win32/*Debug win32/*Release # example binaries diff --git a/bootstrap b/bootstrap index f2571da..23d08f6 100755 --- a/bootstrap +++ b/bootstrap @@ -2,7 +2,7 @@ # bootstrap: generic bootstrap/autogen.sh script for autotools projects # -# Copyright (c) 2002-2009 Sam Hocevar +# Copyright (c) 2002-2011 Sam Hocevar # # This program is free software. It comes without any warranty, to # the extent permitted by applicable law. You can redistribute it @@ -11,7 +11,7 @@ # http://sam.zoy.org/wtfpl/COPYING for more details. # # The latest version of this script can be found at the following place: -# http://caca.zoy.org/wiki/build +# http://caca.zoy.org/wiki/build # Die if an error occurs set -e @@ -112,6 +112,17 @@ if test -n "$auxdir"; then aclocalflags="${aclocalflags} -I $auxdir -I ." fi +# Honour M4PATH because sometimes M4 doesn't +save_IFS=$IFS +IFS=: +tmp="$M4PATH" +for x in $tmp; do + if test -n "$x"; then + aclocalflags="${aclocalflags} -I $x" + fi +done +IFS=$save_IFS + # Explain what we are doing from now set -x diff --git a/caca/figfont.c b/caca/figfont.c index b10c505..891e4a3 100644 --- a/caca/figfont.c +++ b/caca/figfont.c @@ -96,11 +96,11 @@ int caca_canvas_set_figfont(caca_canvas_t *cv, char const *path) /** \brief set the width of the figfont rendering */ int caca_set_figfont_width(caca_canvas_t *cv, int width) { + caca_charfont_t *ff = cv->ff; + if (!cv->ff) return 0; - caca_charfont_t *ff = cv->ff; - ff->term_width = width; update_figfont_settings(cv); @@ -111,11 +111,11 @@ int caca_set_figfont_width(caca_canvas_t *cv, int width) /** \brief set the smushing mode of the figfont rendering */ int caca_set_figfont_smush(caca_canvas_t *cv, char const *mode) { + caca_charfont_t *ff = cv->ff; + if (!cv->ff) return 0; - caca_charfont_t *ff = cv->ff; - if (!strcasecmp(mode, "default")) ff->hmode = H_DEFAULT; else if (!strcasecmp(mode, "kern")) @@ -503,11 +503,11 @@ int free_charfont(caca_charfont_t *ff) static void update_figfont_settings(caca_canvas_t *cv) { + caca_charfont_t *ff = cv->ff; + if (!cv->ff) return; - caca_charfont_t *ff = cv->ff; - /* from TOIlet’s figlet.c */ if (ff->full_layout & 0x3f) ff->hsmushrule = ff->full_layout & 0x3f; diff --git a/caca/libcaca.vcxproj.filters b/caca/libcaca.vcxproj.filters new file mode 100644 index 0000000..d4465ae --- /dev/null +++ b/caca/libcaca.vcxproj.filters @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + codec + + + driver + + + codec + + + codec + + + driver + + + driver + + + driver + + + driver + + + driver + + + driver + + + driver + + + driver + + + + + + + + + + + + + codec + + + + + + + + {8d89f435-0811-4f74-894c-2ea644a0748f} + + + {7c5d9690-3944-49a8-9610-59bfa51d4fbc} + + + \ No newline at end of file diff --git a/configure.ac b/configure.ac index 0f94523..147d098 100644 --- a/configure.ac +++ b/configure.ac @@ -547,8 +547,8 @@ if test "${enable_zzuf}" != "no"; then fi AM_CONDITIONAL(USE_ZZUF, test "${ZZUF}" != "no") -AC_CONFIG_FILES([ - Makefile +AC_CONFIG_FILES( + [Makefile kernel/Makefile caca/Makefile src/Makefile @@ -563,8 +563,8 @@ AC_CONFIG_FILES([ doc/Makefile win32/Makefile ]) -AC_CONFIG_FILES([ - caca/caca.pc +AC_CONFIG_FILES( + [caca/caca.pc caca-sharp/caca-sharp.dll.config cxx/caca++.pc doc/doxygen.cfg diff --git a/libcaca.sln b/libcaca.sln index 3de7ff2..ddd4d7d 100644 --- a/libcaca.sln +++ b/libcaca.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AA6407AD-FBEC-4E73-9B1F-D9F582C68B33}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "programs", "programs", "{AA6407AD-FBEC-4E73-9B1F-D9F582C68B33}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp", "csharp", "{277A4F8F-0CDB-4962-8247-8AA839DFDAA4}" EndProject @@ -67,342 +67,232 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conio-snake", "examples\con EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "test\bench.vcxproj", "{3F5133B7-D65C-4BD4-B8CA-247C08A14081}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "caca", "caca", "{DC418FDA-F51C-4D7D-9B4A-46869201E3E6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|Win32 = Debug|Win32 Debug|Win64 = Debug|Win64 - Debug|x64 = Debug|x64 - Release|Any CPU = Release|Any CPU Release|Win32 = Release|Win32 Release|Win64 = Release|Win64 - Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Any CPU.ActiveCfg = Release|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win32.ActiveCfg = Debug|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win32.Build.0 = Debug|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win64.ActiveCfg = Debug|x64 {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win64.Build.0 = Debug|x64 - {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|x64.ActiveCfg = Release|x64 - {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Any CPU.ActiveCfg = Release|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win32.ActiveCfg = Release|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win32.Build.0 = Release|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win64.ActiveCfg = Release|x64 {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win64.Build.0 = Release|x64 - {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|x64.ActiveCfg = Release|x64 - {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Any CPU.ActiveCfg = Release|Win32 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win32.ActiveCfg = Debug|Win32 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win32.Build.0 = Debug|Win32 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win64.ActiveCfg = Debug|x64 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win64.Build.0 = Debug|x64 - {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|x64.ActiveCfg = Release|x64 - {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Any CPU.ActiveCfg = Release|Win32 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win32.ActiveCfg = Release|Win32 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win32.Build.0 = Release|Win32 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win64.ActiveCfg = Release|x64 {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win64.Build.0 = Release|x64 - {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|x64.ActiveCfg = Release|x64 - {EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Any CPU.ActiveCfg = Release|Win32 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win32.ActiveCfg = Debug|Win32 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win32.Build.0 = Debug|Win32 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win64.ActiveCfg = Debug|x64 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win64.Build.0 = Debug|x64 - {EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|x64.ActiveCfg = Release|x64 - {EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Any CPU.ActiveCfg = Release|Win32 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win32.ActiveCfg = Release|Win32 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win32.Build.0 = Release|Win32 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win64.ActiveCfg = Release|x64 {EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win64.Build.0 = Release|x64 - {EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|x64.ActiveCfg = Release|x64 - {046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Any CPU.ActiveCfg = Release|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win32.ActiveCfg = Debug|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win32.Build.0 = Debug|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win64.ActiveCfg = Debug|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win64.Build.0 = Debug|Any CPU - {046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|x64.ActiveCfg = Release|x64 - {046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win32.ActiveCfg = Release|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win32.Build.0 = Release|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win64.ActiveCfg = Release|Any CPU {046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win64.Build.0 = Release|Any CPU - {046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|x64.ActiveCfg = Release|x64 - {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Any CPU.ActiveCfg = Release|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win32.ActiveCfg = Debug|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win32.Build.0 = Debug|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win64.ActiveCfg = Debug|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win64.Build.0 = Debug|Any CPU - {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|x64.ActiveCfg = Release|x64 - {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win32.ActiveCfg = Release|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win32.Build.0 = Release|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win64.ActiveCfg = Release|Any CPU {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win64.Build.0 = Release|Any CPU - {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|x64.ActiveCfg = Release|x64 - {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Any CPU.ActiveCfg = Release|Win32 {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win32.ActiveCfg = Debug|Win32 {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win32.Build.0 = Debug|Win32 {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win64.ActiveCfg = Debug|x64 {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win64.Build.0 = Debug|x64 - {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|x64.ActiveCfg = Release|x64 - {5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Any CPU.ActiveCfg = Release|Win32 {5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win32.ActiveCfg = Release|Win32 {5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win32.Build.0 = Release|Win32 {5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win64.ActiveCfg = Release|x64 {5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win64.Build.0 = Release|x64 - {5AAFB727-094F-4104-A765-A94B32497C7D}.Release|x64.ActiveCfg = Release|x64 - {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Any CPU.ActiveCfg = Release|Win32 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win32.ActiveCfg = Debug|Win32 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win32.Build.0 = Debug|Win32 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win64.ActiveCfg = Debug|x64 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win64.Build.0 = Debug|x64 - {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|x64.ActiveCfg = Release|x64 - {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Any CPU.ActiveCfg = Release|Win32 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win32.ActiveCfg = Release|Win32 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win32.Build.0 = Release|Win32 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win64.ActiveCfg = Release|x64 {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win64.Build.0 = Release|x64 - {F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|x64.ActiveCfg = Release|x64 - {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Any CPU.ActiveCfg = Release|Win32 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win32.ActiveCfg = Debug|Win32 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win32.Build.0 = Debug|Win32 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win64.ActiveCfg = Debug|x64 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win64.Build.0 = Debug|x64 - {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|x64.ActiveCfg = Release|x64 - {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Any CPU.ActiveCfg = Release|Win32 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win32.ActiveCfg = Release|Win32 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win32.Build.0 = Release|Win32 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win64.ActiveCfg = Release|x64 {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win64.Build.0 = Release|x64 - {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|x64.ActiveCfg = Release|x64 - {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Debug|Any CPU.ActiveCfg = Release|x64 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Debug|Win32.ActiveCfg = Debug|Win32 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Debug|Win32.Build.0 = Debug|Win32 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Debug|Win64.ActiveCfg = Debug|x64 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Debug|Win64.Build.0 = Debug|x64 - {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Debug|x64.ActiveCfg = Release|x64 - {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Release|Any CPU.ActiveCfg = Release|x64 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Release|Win32.ActiveCfg = Release|Win32 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Release|Win32.Build.0 = Release|Win32 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Release|Win64.ActiveCfg = Release|x64 {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Release|Win64.Build.0 = Release|x64 - {D5379407-2DCA-4D67-94A9-86EEEF1E5C2D}.Release|x64.ActiveCfg = Release|x64 - {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Debug|Any CPU.ActiveCfg = Release|x64 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Debug|Win32.ActiveCfg = Debug|Win32 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Debug|Win32.Build.0 = Debug|Win32 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Debug|Win64.ActiveCfg = Debug|x64 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Debug|Win64.Build.0 = Debug|x64 - {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Debug|x64.ActiveCfg = Release|x64 - {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Release|Any CPU.ActiveCfg = Release|x64 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Release|Win32.ActiveCfg = Release|Win32 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Release|Win32.Build.0 = Release|Win32 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Release|Win64.ActiveCfg = Release|x64 {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Release|Win64.Build.0 = Release|x64 - {E93DAC8E-1A80-4449-BF9B-36C6CDBB68CE}.Release|x64.ActiveCfg = Release|x64 - {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Debug|Any CPU.ActiveCfg = Release|x64 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Debug|Win32.ActiveCfg = Debug|Win32 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Debug|Win32.Build.0 = Debug|Win32 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Debug|Win64.ActiveCfg = Debug|x64 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Debug|Win64.Build.0 = Debug|x64 - {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Debug|x64.ActiveCfg = Release|x64 - {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Release|Any CPU.ActiveCfg = Release|x64 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Release|Win32.ActiveCfg = Release|Win32 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Release|Win32.Build.0 = Release|Win32 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Release|Win64.ActiveCfg = Release|x64 {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Release|Win64.Build.0 = Release|x64 - {47789F1D-3B1A-4F77-BDF3-4078887ED9FB}.Release|x64.ActiveCfg = Release|x64 - {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Debug|Any CPU.ActiveCfg = Release|x64 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Debug|Win32.ActiveCfg = Debug|Win32 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Debug|Win32.Build.0 = Debug|Win32 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Debug|Win64.ActiveCfg = Debug|x64 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Debug|Win64.Build.0 = Debug|x64 - {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Debug|x64.ActiveCfg = Release|x64 - {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Release|Any CPU.ActiveCfg = Release|x64 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Release|Win32.ActiveCfg = Release|Win32 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Release|Win32.Build.0 = Release|Win32 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Release|Win64.ActiveCfg = Release|x64 {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Release|Win64.Build.0 = Release|x64 - {EEBA3DE9-449E-4101-B5EC-5341EE8AA86A}.Release|x64.ActiveCfg = Release|x64 - {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Debug|Any CPU.ActiveCfg = Release|x64 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Debug|Win32.ActiveCfg = Debug|Win32 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Debug|Win32.Build.0 = Debug|Win32 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Debug|Win64.ActiveCfg = Debug|x64 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Debug|Win64.Build.0 = Debug|x64 - {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Debug|x64.ActiveCfg = Release|x64 - {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Release|Any CPU.ActiveCfg = Release|x64 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Release|Win32.ActiveCfg = Release|Win32 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Release|Win32.Build.0 = Release|Win32 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Release|Win64.ActiveCfg = Release|x64 {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Release|Win64.Build.0 = Release|x64 - {225231EB-FFFE-40D3-805E-A6B4B6B5AE5C}.Release|x64.ActiveCfg = Release|x64 - {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Debug|Any CPU.ActiveCfg = Release|x64 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Debug|Win32.ActiveCfg = Debug|Win32 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Debug|Win32.Build.0 = Debug|Win32 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Debug|Win64.ActiveCfg = Debug|x64 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Debug|Win64.Build.0 = Debug|x64 - {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Debug|x64.ActiveCfg = Release|x64 - {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Release|Any CPU.ActiveCfg = Release|x64 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Release|Win32.ActiveCfg = Release|Win32 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Release|Win32.Build.0 = Release|Win32 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Release|Win64.ActiveCfg = Release|x64 {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Release|Win64.Build.0 = Release|x64 - {EBCAAE35-5A61-4B43-B754-4F7200FC2A8F}.Release|x64.ActiveCfg = Release|x64 - {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Debug|Any CPU.ActiveCfg = Release|x64 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Debug|Win32.ActiveCfg = Debug|Win32 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Debug|Win32.Build.0 = Debug|Win32 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Debug|Win64.ActiveCfg = Debug|x64 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Debug|Win64.Build.0 = Debug|x64 - {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Debug|x64.ActiveCfg = Release|x64 - {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Release|Any CPU.ActiveCfg = Release|x64 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Release|Win32.ActiveCfg = Release|Win32 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Release|Win32.Build.0 = Release|Win32 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Release|Win64.ActiveCfg = Release|x64 {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Release|Win64.Build.0 = Release|x64 - {9002BB07-D372-40AE-BB60-7D7BDD2C2C84}.Release|x64.ActiveCfg = Release|x64 - {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Debug|Any CPU.ActiveCfg = Release|x64 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Debug|Win32.ActiveCfg = Debug|Win32 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Debug|Win32.Build.0 = Debug|Win32 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Debug|Win64.ActiveCfg = Debug|x64 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Debug|Win64.Build.0 = Debug|x64 - {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Debug|x64.ActiveCfg = Release|x64 - {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Release|Any CPU.ActiveCfg = Release|x64 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Release|Win32.ActiveCfg = Release|Win32 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Release|Win32.Build.0 = Release|Win32 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Release|Win64.ActiveCfg = Release|x64 {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Release|Win64.Build.0 = Release|x64 - {6B23C7A5-6B2F-4136-BEBE-B432F8AFF345}.Release|x64.ActiveCfg = Release|x64 - {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Debug|Any CPU.ActiveCfg = Release|x64 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Debug|Win32.ActiveCfg = Debug|Win32 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Debug|Win32.Build.0 = Debug|Win32 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Debug|Win64.ActiveCfg = Debug|x64 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Debug|Win64.Build.0 = Debug|x64 - {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Debug|x64.ActiveCfg = Release|x64 - {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Release|Any CPU.ActiveCfg = Release|x64 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Release|Win32.ActiveCfg = Release|Win32 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Release|Win32.Build.0 = Release|Win32 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Release|Win64.ActiveCfg = Release|x64 {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Release|Win64.Build.0 = Release|x64 - {CC0E6EB2-9630-43E1-872F-721B8D7C0825}.Release|x64.ActiveCfg = Release|x64 - {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Debug|Any CPU.ActiveCfg = Release|x64 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Debug|Win32.ActiveCfg = Debug|Win32 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Debug|Win32.Build.0 = Debug|Win32 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Debug|Win64.ActiveCfg = Debug|x64 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Debug|Win64.Build.0 = Debug|x64 - {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Debug|x64.ActiveCfg = Release|x64 - {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Release|Any CPU.ActiveCfg = Release|x64 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Release|Win32.ActiveCfg = Release|Win32 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Release|Win32.Build.0 = Release|Win32 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Release|Win64.ActiveCfg = Release|x64 {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Release|Win64.Build.0 = Release|x64 - {F49B6231-2C1C-4C76-BCAE-58ABBF66EBB8}.Release|x64.ActiveCfg = Release|x64 - {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Debug|Any CPU.ActiveCfg = Release|x64 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Debug|Win32.ActiveCfg = Debug|Win32 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Debug|Win32.Build.0 = Debug|Win32 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Debug|Win64.ActiveCfg = Debug|x64 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Debug|Win64.Build.0 = Debug|x64 - {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Debug|x64.ActiveCfg = Release|x64 - {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Release|Any CPU.ActiveCfg = Release|x64 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Release|Win32.ActiveCfg = Release|Win32 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Release|Win32.Build.0 = Release|Win32 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Release|Win64.ActiveCfg = Release|x64 {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Release|Win64.Build.0 = Release|x64 - {4559999D-DA0F-4D16-ADD7-FCCC455A1446}.Release|x64.ActiveCfg = Release|x64 - {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Debug|Any CPU.ActiveCfg = Release|x64 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Debug|Win32.ActiveCfg = Debug|Win32 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Debug|Win32.Build.0 = Debug|Win32 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Debug|Win64.ActiveCfg = Debug|x64 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Debug|Win64.Build.0 = Debug|x64 - {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Debug|x64.ActiveCfg = Release|x64 - {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Release|Any CPU.ActiveCfg = Release|x64 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Release|Win32.ActiveCfg = Release|Win32 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Release|Win32.Build.0 = Release|Win32 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Release|Win64.ActiveCfg = Release|x64 {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Release|Win64.Build.0 = Release|x64 - {7BB929A8-2F88-42E1-BB34-2A94CE56F4AE}.Release|x64.ActiveCfg = Release|x64 - {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Debug|Any CPU.ActiveCfg = Release|x64 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Debug|Win32.ActiveCfg = Debug|Win32 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Debug|Win32.Build.0 = Debug|Win32 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Debug|Win64.ActiveCfg = Debug|x64 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Debug|Win64.Build.0 = Debug|x64 - {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Debug|x64.ActiveCfg = Release|x64 - {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Release|Any CPU.ActiveCfg = Release|x64 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Release|Win32.ActiveCfg = Release|Win32 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Release|Win32.Build.0 = Release|Win32 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Release|Win64.ActiveCfg = Release|x64 {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Release|Win64.Build.0 = Release|x64 - {FCDECEF5-B23F-4CA7-A79F-07E8241812A6}.Release|x64.ActiveCfg = Release|x64 - {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Debug|Any CPU.ActiveCfg = Release|x64 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Debug|Win32.ActiveCfg = Debug|Win32 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Debug|Win32.Build.0 = Debug|Win32 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Debug|Win64.ActiveCfg = Debug|x64 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Debug|Win64.Build.0 = Debug|x64 - {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Debug|x64.ActiveCfg = Release|x64 - {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Release|Any CPU.ActiveCfg = Release|x64 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Release|Win32.ActiveCfg = Release|Win32 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Release|Win32.Build.0 = Release|Win32 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Release|Win64.ActiveCfg = Release|x64 {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Release|Win64.Build.0 = Release|x64 - {8338282A-BB63-40D5-B0C0-EA9A94D2EC17}.Release|x64.ActiveCfg = Release|x64 - {78BCD01C-9994-41A7-9618-29602C8644ED}.Debug|Any CPU.ActiveCfg = Release|x64 {78BCD01C-9994-41A7-9618-29602C8644ED}.Debug|Win32.ActiveCfg = Debug|Win32 {78BCD01C-9994-41A7-9618-29602C8644ED}.Debug|Win32.Build.0 = Debug|Win32 {78BCD01C-9994-41A7-9618-29602C8644ED}.Debug|Win64.ActiveCfg = Debug|x64 {78BCD01C-9994-41A7-9618-29602C8644ED}.Debug|Win64.Build.0 = Debug|x64 - {78BCD01C-9994-41A7-9618-29602C8644ED}.Debug|x64.ActiveCfg = Release|x64 - {78BCD01C-9994-41A7-9618-29602C8644ED}.Release|Any CPU.ActiveCfg = Release|x64 {78BCD01C-9994-41A7-9618-29602C8644ED}.Release|Win32.ActiveCfg = Release|Win32 {78BCD01C-9994-41A7-9618-29602C8644ED}.Release|Win32.Build.0 = Release|Win32 {78BCD01C-9994-41A7-9618-29602C8644ED}.Release|Win64.ActiveCfg = Release|x64 {78BCD01C-9994-41A7-9618-29602C8644ED}.Release|Win64.Build.0 = Release|x64 - {78BCD01C-9994-41A7-9618-29602C8644ED}.Release|x64.ActiveCfg = Release|x64 - {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Debug|Any CPU.ActiveCfg = Release|x64 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Debug|Win32.ActiveCfg = Debug|Win32 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Debug|Win32.Build.0 = Debug|Win32 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Debug|Win64.ActiveCfg = Debug|x64 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Debug|Win64.Build.0 = Debug|x64 - {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Debug|x64.ActiveCfg = Release|x64 - {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Release|Any CPU.ActiveCfg = Release|x64 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Release|Win32.ActiveCfg = Release|Win32 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Release|Win32.Build.0 = Release|Win32 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Release|Win64.ActiveCfg = Release|x64 {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Release|Win64.Build.0 = Release|x64 - {C27F686B-6D72-4C5F-A5AA-C4A1924F14EC}.Release|x64.ActiveCfg = Release|x64 - {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Debug|Any CPU.ActiveCfg = Release|x64 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Debug|Win32.ActiveCfg = Debug|Win32 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Debug|Win32.Build.0 = Debug|Win32 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Debug|Win64.ActiveCfg = Debug|x64 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Debug|Win64.Build.0 = Debug|x64 - {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Debug|x64.ActiveCfg = Release|x64 - {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Release|Any CPU.ActiveCfg = Release|x64 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Release|Win32.ActiveCfg = Release|Win32 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Release|Win32.Build.0 = Release|Win32 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Release|Win64.ActiveCfg = Release|x64 {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Release|Win64.Build.0 = Release|x64 - {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5}.Release|x64.ActiveCfg = Release|x64 - {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Debug|Any CPU.ActiveCfg = Release|x64 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Debug|Win32.ActiveCfg = Debug|Win32 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Debug|Win32.Build.0 = Debug|Win32 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Debug|Win64.ActiveCfg = Debug|x64 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Debug|Win64.Build.0 = Debug|x64 - {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Debug|x64.ActiveCfg = Release|x64 - {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Release|Any CPU.ActiveCfg = Release|x64 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Release|Win32.ActiveCfg = Release|Win32 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Release|Win32.Build.0 = Release|Win32 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Release|Win64.ActiveCfg = Release|x64 {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Release|Win64.Build.0 = Release|x64 - {687FE90A-6B2F-4136-BEBE-798A98B98FE8}.Release|x64.ActiveCfg = Release|x64 - {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Debug|Any CPU.ActiveCfg = Release|x64 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Debug|Win32.ActiveCfg = Debug|Win32 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Debug|Win32.Build.0 = Debug|Win32 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Debug|Win64.ActiveCfg = Debug|x64 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Debug|Win64.Build.0 = Debug|x64 - {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Debug|x64.ActiveCfg = Release|x64 - {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Release|Any CPU.ActiveCfg = Release|x64 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Release|Win32.ActiveCfg = Release|Win32 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Release|Win32.Build.0 = Release|Win32 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Release|Win64.ActiveCfg = Release|x64 {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Release|Win64.Build.0 = Release|x64 - {3F5133B7-D65C-4BD4-B8CA-247C08A14081}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -434,5 +324,8 @@ Global {B6327C5A-6B2F-4136-BEEB-38ABF32F44F5} = {44C085D0-3AA8-41E0-A3B3-416C5BDE44E4} {687FE90A-6B2F-4136-BEBE-798A98B98FE8} = {44C085D0-3AA8-41E0-A3B3-416C5BDE44E4} {3F5133B7-D65C-4BD4-B8CA-247C08A14081} = {11FAFB04-761F-4B93-B456-51AE124F1405} + {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {DC418FDA-F51C-4D7D-9B4A-46869201E3E6} + {277A4F8F-0CDB-4962-8247-8AA839DFDAA4} = {DC418FDA-F51C-4D7D-9B4A-46869201E3E6} + {5B207DC7-7AC3-4C51-889F-36C504812ECE} = {DC418FDA-F51C-4D7D-9B4A-46869201E3E6} EndGlobalSection EndGlobal