From 51e190039d0b1872f1eecb2ef9901915894d56ca Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 5 Sep 2016 16:37:25 +0200 Subject: [PATCH 01/17] roflmao: Lol Engine sample project --- .gitattributes | 17 ++++++++++++ .gitignore | 63 +++++++++++++++++++++++++++++++++++++++++++++ .gitmodules | 3 +++ Makefile.am | 7 +++++ README.md | 36 ++++++++++++++++++++++++++ bootstrap | 8 ++++++ configure.ac | 47 +++++++++++++++++++++++++++++++++ lol | 1 + roflmao/.gitignore | 2 ++ roflmao/Makefile.am | 10 +++++++ roflmao/roflmao.cpp | 16 ++++++++++++ 11 files changed, 210 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 Makefile.am create mode 100644 README.md create mode 100755 bootstrap create mode 100644 configure.ac create mode 160000 lol create mode 100644 roflmao/.gitignore create mode 100644 roflmao/Makefile.am create mode 100644 roflmao/roflmao.cpp diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..af61d31 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +# Visual Studio wants crlf, but if we do so, git will +# normalise files and git-svn will push LF files to SVN, +# so we revert back to binary. +*.sln -text +*.csproj -text +*.vcxproj -text + +# Vim doesn't like CRLF, even on Windows +*.vim eol=lf + +# Source files should be normalised in the repository +*.c eol=lf +*.cpp eol=lf +*.cc eol=lf +*.h eol=lf +*.hh eol=lf +*.lolfx eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..616a921 --- /dev/null +++ b/.gitignore @@ -0,0 +1,63 @@ +# Autotools cruft +*.o +*.lo +*.a +*.la +*.exe +*.so +*.elf +*.self +*.nexe +*.userprefs +*.usertasks +*.pidb +.auto +.libs +.deps +.dirstamp +.*.androiddir +.*.androidstamp +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.h.in +config.h +config.log +config.status +configure +libtool +stamp-* +*-stamp +test-suite.log +# Personal stuff +patch-*.diff +# Debugging cruft +core +!core/ +core.* +vgcore.* +callgrind.out.* +perf.data* +*.gcda +*.gcno +# Editor cruft +.*.swp +*~ +.ycm_extra_conf.pyc +# Visual Studio cruft +*.vcxproj.user +*.csproj.user +binaries/*Debug +binaries/*Release +build/.vs +build/*.VC.VC.opendb +build/*.VC.db +build/*.sdf +build/*.suo +build/*.opensdf +build/visualstudio/ipch +build/visualstudio/*.log +build/visualstudio/*.XGD +# ReSharper cruft +_ReSharper.* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5dcfd56 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lol"] + path = lol + url = ../../lolengine/lol.git diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..40e118e --- /dev/null +++ b/Makefile.am @@ -0,0 +1,7 @@ + +include $(top_srcdir)/lol/build/autotools/common.am + +ACLOCAL_AMFLAGS = -I lol/build/autotools/m4 + +SUBDIRS = lol roflmao + diff --git a/README.md b/README.md new file mode 100644 index 0000000..419467a --- /dev/null +++ b/README.md @@ -0,0 +1,36 @@ +## roflmao + +`roflmao` is a simple project using Lol Engine. If you want to get +started with Lol Engine, you should fork this project. + +# Setup + +Make sure Lol Engine and its submodules are properly initialised: + + git submodules update --init --recursive + +# Configure + +The default application is called `roflmao` and lies in its own subdirectory. +You should rename it to whatever your application will be called. Make sure +to modify the following files: + + - `configure.ac` + - `Makefile.am` + - `roflmao/Makefile.am` + - `roflmao/roflmao.cpp` + +# Build + +Then bootstrap the project and configure it: + + ./bootstrap + ./configure + +Finally, build the project: + + make + +# Develop + +The sample application is in `roflmao` diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..de08f74 --- /dev/null +++ b/bootstrap @@ -0,0 +1,8 @@ +#!/bin/sh + +# Bootstrap Lol Engine first +(cd lol && ./bootstrap) + +# Then bootstrap this project, using the same script +./lol/bootstrap + diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..b1d5276 --- /dev/null +++ b/configure.ac @@ -0,0 +1,47 @@ +dnl +dnl Configure script for a Lol Engine project +dnl + +AC_INIT(roflmao, 0.0) + +dnl +dnl Standard autoconf setup and tools requirements +dnl + +AC_PREREQ(2.50) +AC_CONFIG_AUX_DIR(.auto) +AC_CANONICAL_SYSTEM +AM_INIT_AUTOMAKE([subdir-objects no-define tar-ustar silent-rules]) +AM_DEFAULT_VERBOSITY=0 + +AC_PROG_CXX +AM_PROG_LIBTOOL +AC_LIBTOOL_CXX + +dnl +dnl Build and configure Lol Engine before our repository +dnl Ensure $lol_srcdir and $lol_builddir are properly set up +dnl + +AC_CONFIG_SUBDIRS([lol]) +AC_SUBST(lol_srcdir, '${top_srcdir}/lol') +AC_SUBST(lol_builddir, '${top_builddir}/lol') + +dnl +dnl Inherit all Lol Engine checks +dnl + +LOL_AC_CHECK() +LOL_AC_SUBST() + +dnl +dnl Export automake variables and write makefiles +dnl + +AC_CONFIG_FILES( + [Makefile + roflmao/Makefile +]) + +AC_OUTPUT + diff --git a/lol b/lol new file mode 160000 index 0000000..b686b9e --- /dev/null +++ b/lol @@ -0,0 +1 @@ +Subproject commit b686b9e965640f4325340fab94089bdebaa3a390 diff --git a/roflmao/.gitignore b/roflmao/.gitignore new file mode 100644 index 0000000..4b8e9f8 --- /dev/null +++ b/roflmao/.gitignore @@ -0,0 +1,2 @@ +roflmao +*.exe diff --git a/roflmao/Makefile.am b/roflmao/Makefile.am new file mode 100644 index 0000000..55d3524 --- /dev/null +++ b/roflmao/Makefile.am @@ -0,0 +1,10 @@ + +include $(top_srcdir)/lol/build/autotools/common.am + +bin_PROGRAMS = roflmao + +roflmao_SOURCES = roflmao.cpp +roflmao_CPPFLAGS = $(AM_CPPFLAGS) +roflmao_DEPENDENCIES = @LOL_DEPS@ +roflmao_LDFLAGS = $(AM_LDFLAGS) + diff --git a/roflmao/roflmao.cpp b/roflmao/roflmao.cpp new file mode 100644 index 0000000..bc76424 --- /dev/null +++ b/roflmao/roflmao.cpp @@ -0,0 +1,16 @@ +// +// Roflmao — Lol Engine Test App +// + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +int main(int argc, char **argv) +{ + lol::System::Init(argc, argv); + return EXIT_SUCCESS; +} + From 0e9098ee9da39c061b1982dd8f5f18d55044e89c Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 5 Sep 2016 19:02:13 +0200 Subject: [PATCH 02/17] build: activate Travis-CI builds --- .travis.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..24b95e3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,33 @@ +sudo: required +dist: trusty +language: c++ +env: VERBOSE=1 + +addons: + apt: + packages: + - build-essential + - automake + - autoconf + - libtool + - pkg-config + - libsdl2-dev + - libsdl2-image-dev + - libsdl2-mixer-dev + - libglew-dev + # this can fix clang compilation + - clang-3.8 + - libc++-dev + +before_install: + - if [ "$CC" = "clang" ]; then export CC="clang-3.8"; fi + - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.8 -stdlib=libc++"; fi + - ./bootstrap + +os: + - linux + +compiler: + - gcc + - clang + From a9915fcd53e4c967ba0d40bc9ca1f44429c3bc2a Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 5 Sep 2016 19:23:26 +0200 Subject: [PATCH 03/17] doc: update README.md --- README.md | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 419467a..00e877c 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,35 @@ -## roflmao +# roflmao `roflmao` is a simple project using Lol Engine. If you want to get -started with Lol Engine, you should fork this project. +started with Lol Engine, you may either: -# Setup + - fork this project + - duplicate this project (see [https://help.github.com/articles/duplicating-a-repository/](“duplicating a repository”)) + +## Setup Make sure Lol Engine and its submodules are properly initialised: git submodules update --init --recursive -# Configure +On Linux, make sure the following packages are installed: + + automake autoconf libtool pkg-config + libglew-dev + libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev + +## Configure The default application is called `roflmao` and lies in its own subdirectory. You should rename it to whatever your application will be called. Make sure to modify the following files: - - `configure.ac` - - `Makefile.am` - - `roflmao/Makefile.am` - - `roflmao/roflmao.cpp` + configure.ac + Makefile.am + roflmao/Makefile.am + roflmao/roflmao.cpp -# Build +## Build Then bootstrap the project and configure it: @@ -31,6 +40,3 @@ Finally, build the project: make -# Develop - -The sample application is in `roflmao` From bedc134fe0c9fcd23dc718cef1d19d030e855103 Mon Sep 17 00:00:00 2001 From: jylam Date: Mon, 5 Sep 2016 20:38:15 +0200 Subject: [PATCH 04/17] roflmao: fucking bullshit in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00e877c..12427d5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ started with Lol Engine, you may either: - fork this project - - duplicate this project (see [https://help.github.com/articles/duplicating-a-repository/](“duplicating a repository”)) + - duplicate this project (see [“duplicating a repository”](https://help.github.com/articles/duplicating-a-repository/)) ## Setup From 78d2ea5ce4e4fed8ce612b9539360fc898fa501c Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 5 Sep 2016 20:56:53 +0200 Subject: [PATCH 05/17] doc: add badges for CI services. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 12427d5..0226deb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # roflmao +[![Build Status (Travis-CI)](https://travis-ci.org/lolengine/lol-roflmao.svg?branch=master)](https://travis-ci.org/lolengine/lol-roflmao) +[![Build Status (Semaphore-CI)](https://semaphoreci.com/api/v1/samhocevar/lol-roflmao/branches/master/badge.svg)](https://semaphoreci.com/samhocevar/lol-roflmao) + `roflmao` is a simple project using Lol Engine. If you want to get started with Lol Engine, you may either: @@ -29,6 +32,8 @@ to modify the following files: roflmao/Makefile.am roflmao/roflmao.cpp +You can of course have several projects in the same repository. + ## Build Then bootstrap the project and configure it: From 20363ec8e7ff04c8267115381f7d0d5557e700ac Mon Sep 17 00:00:00 2001 From: Jean-Yves Lamoureux Date: Mon, 5 Sep 2016 21:05:01 +0200 Subject: [PATCH 06/17] rotflmao: Fix "git submodule" in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0226deb..19d0707 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ started with Lol Engine, you may either: Make sure Lol Engine and its submodules are properly initialised: - git submodules update --init --recursive + git submodule update --init --recursive On Linux, make sure the following packages are installed: From 4a1062ff9554e58864739551ea9dad6dd13fc6ff Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 5 Sep 2016 22:27:06 +0200 Subject: [PATCH 07/17] build: add a Visual Studio 2015 solution --- .gitignore | 15 +- lol | 2 +- roflmao.sln | 330 ++++++++++++++++++++++++++++++++++++++++ roflmao/roflmao.vcxproj | 67 ++++++++ 4 files changed, 404 insertions(+), 10 deletions(-) create mode 100644 roflmao.sln create mode 100644 roflmao/roflmao.vcxproj diff --git a/.gitignore b/.gitignore index 616a921..ac1c5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -50,14 +50,11 @@ perf.data* *.csproj.user binaries/*Debug binaries/*Release -build/.vs -build/*.VC.VC.opendb -build/*.VC.db -build/*.sdf -build/*.suo -build/*.opensdf -build/visualstudio/ipch -build/visualstudio/*.log -build/visualstudio/*.XGD +.vs +*.VC.VC.opendb +*.VC.db +*.sdf +*.suo +*.opensdf # ReSharper cruft _ReSharper.* diff --git a/lol b/lol index b686b9e..cf25d42 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit b686b9e965640f4325340fab94089bdebaa3a390 +Subproject commit cf25d428a2e043cc3f10b09235c2f1e7f389bc43 diff --git a/roflmao.sln b/roflmao.sln new file mode 100644 index 0000000..e78cd21 --- /dev/null +++ b/roflmao.sln @@ -0,0 +1,330 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-core", "lol\src\lol-core.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-bullet", "lol\src\bullet\lol-bullet.vcxproj", "{83D3B207-C601-4025-8F41-01DEDC354661}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-lua", "lol\src\lua\lol-lua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "lol\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-math", "lol\src\t\test-math.vcxproj", "{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-sys", "lol\src\t\test-sys.vcxproj", "{1782F849-B6E1-466D-9F02-A751F3F8712C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "lol\src\t\test-image.vcxproj", "{5A27FF18-A1EC-49BE-9455-415F1C701153}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "lol\src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "lol\doc\samples\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "lol\doc\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "lol\doc\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "lol\doc\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "lol\doc\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}" + ProjectSection(SolutionItems) = preProject + msbuild\config-build.xml = msbuild\config-build.xml + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "lol\doc\samples\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "lol\doc\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_noise", "lol\doc\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "lol\doc\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "lol\doc\samples\meshviewer\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "lol\doc\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "07_input", "lol\doc\tutorial\07_input.vcxproj", "{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06_sprite", "lol\doc\tutorial\06_sprite.vcxproj", "{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "13_shader_builder", "lol\doc\tutorial\13_shader_builder.vcxproj", "{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{65FD48E9-C936-4A23-AD46-BF738B6D4733}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roflmao", "roflmao\roflmao.vcxproj", "{3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roflmao", "Roflmao", "{03B9D2E1-AFBA-4F66-8DE0-6499C9F9155F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ORBIS = Debug|ORBIS + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ORBIS = Release|ORBIS + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.ActiveCfg = Debug|x64 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.Build.0 = Debug|x64 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|ORBIS.ActiveCfg = Release|Win32 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.ActiveCfg = Release|x64 + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.Build.0 = Release|x64 + {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.ActiveCfg = Debug|Win32 + {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.Build.0 = Debug|Win32 + {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.ActiveCfg = Debug|x64 + {83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.Build.0 = Debug|x64 + {83D3B207-C601-4025-8F41-01DEDC354661}.Release|ORBIS.ActiveCfg = Release|Win32 + {83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.ActiveCfg = Release|Win32 + {83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.Build.0 = Release|Win32 + {83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.ActiveCfg = Release|x64 + {83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.Build.0 = Release|x64 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.ActiveCfg = Debug|Win32 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.Build.0 = Debug|Win32 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.ActiveCfg = Debug|x64 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.Build.0 = Debug|x64 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|ORBIS.ActiveCfg = Release|Win32 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.ActiveCfg = Release|Win32 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.Build.0 = Release|Win32 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64 + {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|Win32 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64 + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|Win32 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64 + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|Win32 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64 + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|Win32 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64 + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|Win32 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.ActiveCfg = Debug|x64 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.Build.0 = Debug|x64 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|ORBIS.ActiveCfg = Release|Win32 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64 + {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.ActiveCfg = Debug|x64 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.Build.0 = Debug|x64 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|ORBIS.ActiveCfg = Release|Win32 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.ActiveCfg = Release|Win32 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.Build.0 = Release|Win32 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.ActiveCfg = Release|x64 + {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.Build.0 = Release|x64 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.ActiveCfg = Debug|Win32 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.ActiveCfg = Debug|x64 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.Build.0 = Debug|x64 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|ORBIS.ActiveCfg = Release|Win32 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.ActiveCfg = Release|Win32 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.Build.0 = Release|Win32 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.ActiveCfg = Release|x64 + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.Build.0 = Release|x64 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.Build.0 = Debug|x64 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|ORBIS.ActiveCfg = Release|Win32 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.Build.0 = Release|Win32 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64 + {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.Build.0 = Release|x64 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64 + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.ActiveCfg = Debug|x64 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.Build.0 = Debug|x64 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.ActiveCfg = Release|Win32 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.Build.0 = Release|Win32 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.ActiveCfg = Release|x64 + {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.Build.0 = Release|x64 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.ActiveCfg = Debug|Win32 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.ActiveCfg = Debug|x64 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.Build.0 = Debug|x64 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|ORBIS.ActiveCfg = Release|Win32 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.ActiveCfg = Release|Win32 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.Build.0 = Release|Win32 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.ActiveCfg = Release|x64 + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.Build.0 = Release|x64 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.ActiveCfg = Debug|Win32 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.ActiveCfg = Debug|x64 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.Build.0 = Debug|x64 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|ORBIS.ActiveCfg = Release|Win32 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.ActiveCfg = Release|Win32 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.Build.0 = Release|Win32 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.ActiveCfg = Release|x64 + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.Build.0 = Release|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.ActiveCfg = Debug|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.ActiveCfg = Debug|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.Build.0 = Debug|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|ORBIS.ActiveCfg = Release|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.ActiveCfg = Release|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.Build.0 = Release|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.ActiveCfg = Release|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.Build.0 = Release|x64 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.ActiveCfg = Debug|Win32 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.Build.0 = Debug|Win32 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.ActiveCfg = Debug|x64 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.Build.0 = Debug|x64 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|ORBIS.ActiveCfg = Release|Win32 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.ActiveCfg = Release|Win32 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.Build.0 = Release|Win32 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.ActiveCfg = Release|x64 + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.Build.0 = Release|x64 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64 + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.ActiveCfg = Debug|Win32 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.ActiveCfg = Debug|x64 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.Build.0 = Debug|x64 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|ORBIS.ActiveCfg = Release|Win32 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.ActiveCfg = Release|Win32 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.Build.0 = Release|Win32 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.ActiveCfg = Release|x64 + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.Build.0 = Release|x64 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.ActiveCfg = Debug|x64 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.Build.0 = Debug|x64 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|ORBIS.ActiveCfg = Release|Win32 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.ActiveCfg = Release|Win32 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.Build.0 = Release|Win32 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.ActiveCfg = Release|x64 + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.Build.0 = Release|x64 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.Build.0 = Debug|Win32 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.ActiveCfg = Debug|x64 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.Build.0 = Debug|x64 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|ORBIS.ActiveCfg = Release|Win32 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.ActiveCfg = Release|Win32 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.Build.0 = Release|Win32 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.ActiveCfg = Release|x64 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.Build.0 = Release|x64 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|ORBIS.Build.0 = Debug|ORBIS + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|Win32.Build.0 = Debug|Win32 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|x64.ActiveCfg = Debug|x64 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|x64.Build.0 = Debug|x64 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Release|ORBIS.ActiveCfg = Release|ORBIS + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Release|ORBIS.Build.0 = Release|ORBIS + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Release|Win32.ActiveCfg = Release|Win32 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Release|Win32.Build.0 = Release|Win32 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Release|x64.ActiveCfg = Release|x64 + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} + {1782F849-B6E1-466D-9F02-A751F3F8712C} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} + {5A27FF18-A1EC-49BE-9455-415F1C701153} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} + {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} + {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {65FD48E9-C936-4A23-AD46-BF738B6D4733} + {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {EE203B88-44CF-4859-9D42-7A1F43FECB52} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {834852DB-EDB6-4FD0-BCF9-45CD01126962} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} + {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {572E5B9C-7E19-489C-BD8A-E8401CFBBC47} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} = {65FD48E9-C936-4A23-AD46-BF738B6D4733} + {65FD48E9-C936-4A23-AD46-BF738B6D4733} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C} = {03B9D2E1-AFBA-4F66-8DE0-6499C9F9155F} + EndGlobalSection +EndGlobal diff --git a/roflmao/roflmao.vcxproj b/roflmao/roflmao.vcxproj new file mode 100644 index 0000000..13a2d9b --- /dev/null +++ b/roflmao/roflmao.vcxproj @@ -0,0 +1,67 @@ + + + + $(SolutionDir)\lol + $(SolutionDir)\.. + + + + Debug + ORBIS + + + Debug + Win32 + + + Debug + x64 + + + Release + ORBIS + + + Release + Win32 + + + Release + x64 + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + {83d3b207-c601-4025-8f41-01dedc354661} + + + {d84021ca-b233-4e0f-8a52-071b83bbccc4} + + + + {3d02b33d-c348-43c8-ab6a-fb6e6f3c0e7c} + Application + Win32Proj + + + + + + + + + + + + + + + + + From 6798695810cffbc3c8a8949197676db3fa3084fe Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 5 Sep 2016 23:46:46 +0200 Subject: [PATCH 08/17] build: use new LOL_AC_INIT autoconf macro --- configure.ac | 1 + lol | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b1d5276..1008a39 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ dnl dnl Inherit all Lol Engine checks dnl +LOL_AC_INIT() LOL_AC_CHECK() LOL_AC_SUBST() diff --git a/lol b/lol index cf25d42..2eb7cc5 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit cf25d428a2e043cc3f10b09235c2f1e7f389bc43 +Subproject commit 2eb7cc545e08bdb92579661ccc3174a8b3e7436c From f418cb968faae56b17d9bbb7ea425a866b7e5616 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 00:02:16 +0200 Subject: [PATCH 09/17] =?UTF-8?q?build:=20allow=20=E2=80=9Cmake=20test?= =?UTF-8?q?=E2=80=9D=20in=20addition=20to=20=E2=80=9Cmake=20check=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 40e118e..4121d2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,3 +5,5 @@ ACLOCAL_AMFLAGS = -I lol/build/autotools/m4 SUBDIRS = lol roflmao +test: check + From 6478d3319d6ae42768d88b6fed6dd3eacfdf99fa Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 00:02:47 +0200 Subject: [PATCH 10/17] build: clean up solution --- roflmao.sln | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/roflmao.sln b/roflmao.sln index e78cd21..37091b5 100644 --- a/roflmao.sln +++ b/roflmao.sln @@ -58,8 +58,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "13_shader_builder", "lol\do EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{65FD48E9-C936-4A23-AD46-BF738B6D4733}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roflmao", "roflmao\roflmao.vcxproj", "{3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roflmao", "Roflmao", "{03B9D2E1-AFBA-4F66-8DE0-6499C9F9155F}" @@ -308,7 +306,7 @@ Global {5A27FF18-A1EC-49BE-9455-415F1C701153} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} - {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {65FD48E9-C936-4A23-AD46-BF738B6D4733} + {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {1AFD580B-98B8-4689-B661-38C41132C60E} {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} @@ -323,8 +321,7 @@ Global {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} = {1AFD580B-98B8-4689-B661-38C41132C60E} {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} = {65FD48E9-C936-4A23-AD46-BF738B6D4733} - {65FD48E9-C936-4A23-AD46-BF738B6D4733} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} = {1AFD580B-98B8-4689-B661-38C41132C60E} {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C} = {03B9D2E1-AFBA-4F66-8DE0-6499C9F9155F} EndGlobalSection EndGlobal From bd73503750a3f0c65d12582228adeec748fb2106 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 08:54:32 +0200 Subject: [PATCH 11/17] build: disable doc, samples, tutorials etc. --- configure.ac | 1 + lol | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1008a39..6f9af6f 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ dnl Build and configure Lol Engine before our repository dnl Ensure $lol_srcdir and $lol_builddir are properly set up dnl +ac_configure_args="${ac_configure_args} --disable-test --disable-doc --disable-tutorial --disable-samples" AC_CONFIG_SUBDIRS([lol]) AC_SUBST(lol_srcdir, '${top_srcdir}/lol') AC_SUBST(lol_builddir, '${top_builddir}/lol') diff --git a/lol b/lol index 2eb7cc5..8b4976b 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit 2eb7cc545e08bdb92579661ccc3174a8b3e7436c +Subproject commit 8b4976b5440b6f374e90e0ab3b433e7cfa6d8efc From b3de2f0695bc5756d83b0360e9f05fb98c55210a Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 11:56:25 +0200 Subject: [PATCH 12/17] build: simplify configure.ac --- bootstrap | 8 ++++---- configure.ac | 24 ++++++------------------ lol | 2 +- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/bootstrap b/bootstrap index de08f74..3c86f2f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,8 +1,8 @@ #!/bin/sh -# Bootstrap Lol Engine first -(cd lol && ./bootstrap) - -# Then bootstrap this project, using the same script +# Bootstrap this project first, using the Lol Engine script ./lol/bootstrap +# Then bootstrap Lol Engine itself +(cd lol && ./bootstrap) + diff --git a/configure.ac b/configure.ac index 6f9af6f..f43a1ee 100644 --- a/configure.ac +++ b/configure.ac @@ -18,32 +18,20 @@ AC_PROG_CXX AM_PROG_LIBTOOL AC_LIBTOOL_CXX -dnl -dnl Build and configure Lol Engine before our repository -dnl Ensure $lol_srcdir and $lol_builddir are properly set up -dnl - -ac_configure_args="${ac_configure_args} --disable-test --disable-doc --disable-tutorial --disable-samples" -AC_CONFIG_SUBDIRS([lol]) -AC_SUBST(lol_srcdir, '${top_srcdir}/lol') -AC_SUBST(lol_builddir, '${top_builddir}/lol') +AC_CONFIG_FILES( + [Makefile + roflmao/Makefile +]) dnl dnl Inherit all Lol Engine checks dnl -LOL_AC_INIT() -LOL_AC_CHECK() -LOL_AC_SUBST() +LOL_AC_SUBPROJECT() dnl -dnl Export automake variables and write makefiles +dnl Perform the actual commands dnl -AC_CONFIG_FILES( - [Makefile - roflmao/Makefile -]) - AC_OUTPUT diff --git a/lol b/lol index 8b4976b..cfef38e 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit 8b4976b5440b6f374e90e0ab3b433e7cfa6d8efc +Subproject commit cfef38eb4478b7e0c21c92c37da12b6399bd5be4 From 43b285b2e364d4e9938f89ef522d39888c47c64a Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 20:33:23 +0200 Subject: [PATCH 13/17] build: remove test suite and tutorial from solution --- roflmao.sln | 244 ---------------------------------------------------- 1 file changed, 244 deletions(-) diff --git a/roflmao.sln b/roflmao.sln index 37091b5..989a914 100644 --- a/roflmao.sln +++ b/roflmao.sln @@ -9,55 +9,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-bullet", "lol\src\bulle EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-lua", "lol\src\lua\lol-lua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "lol\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-math", "lol\src\t\test-math.vcxproj", "{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-sys", "lol\src\t\test-sys.vcxproj", "{1782F849-B6E1-466D-9F02-A751F3F8712C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "lol\src\t\test-image.vcxproj", "{5A27FF18-A1EC-49BE-9455-415F1C701153}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "lol\src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "lol\doc\samples\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "lol\doc\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "lol\doc\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "lol\doc\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "lol\doc\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}" ProjectSection(SolutionItems) = preProject msbuild\config-build.xml = msbuild\config-build.xml EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "lol\doc\samples\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "lol\doc\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_noise", "lol\doc\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "lol\doc\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "lol\doc\samples\meshviewer\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "lol\doc\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "07_input", "lol\doc\tutorial\07_input.vcxproj", "{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06_sprite", "lol\doc\tutorial\06_sprite.vcxproj", "{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "13_shader_builder", "lol\doc\tutorial\13_shader_builder.vcxproj", "{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roflmao", "roflmao\roflmao.vcxproj", "{3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roflmao", "Roflmao", "{03B9D2E1-AFBA-4F66-8DE0-6499C9F9155F}" @@ -102,184 +58,6 @@ Global {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.Build.0 = Release|Win32 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|Win32 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|Win32 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|Win32 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|Win32 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|Win32 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.ActiveCfg = Debug|x64 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.Build.0 = Debug|x64 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|ORBIS.ActiveCfg = Release|Win32 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64 - {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.ActiveCfg = Debug|x64 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.Build.0 = Debug|x64 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|ORBIS.ActiveCfg = Release|Win32 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.ActiveCfg = Release|Win32 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.Build.0 = Release|Win32 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.ActiveCfg = Release|x64 - {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.Build.0 = Release|x64 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.ActiveCfg = Debug|x64 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.Build.0 = Debug|x64 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|ORBIS.ActiveCfg = Release|Win32 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.ActiveCfg = Release|Win32 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.Build.0 = Release|Win32 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.ActiveCfg = Release|x64 - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.Build.0 = Release|x64 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.Build.0 = Debug|x64 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|ORBIS.ActiveCfg = Release|Win32 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.Build.0 = Release|Win32 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64 - {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.Build.0 = Release|x64 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64 - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.ActiveCfg = Debug|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.Build.0 = Debug|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.ActiveCfg = Release|Win32 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.Build.0 = Release|Win32 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.ActiveCfg = Release|x64 - {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.Build.0 = Release|x64 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.ActiveCfg = Debug|x64 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.Build.0 = Debug|x64 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|ORBIS.ActiveCfg = Release|Win32 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.ActiveCfg = Release|Win32 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.Build.0 = Release|Win32 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.ActiveCfg = Release|x64 - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.Build.0 = Release|x64 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.ActiveCfg = Debug|x64 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.Build.0 = Debug|x64 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|ORBIS.ActiveCfg = Release|Win32 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.ActiveCfg = Release|Win32 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.Build.0 = Release|Win32 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.ActiveCfg = Release|x64 - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.Build.0 = Release|x64 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.ActiveCfg = Debug|Win32 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.ActiveCfg = Debug|x64 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.Build.0 = Debug|x64 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|ORBIS.ActiveCfg = Release|Win32 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.ActiveCfg = Release|Win32 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.Build.0 = Release|Win32 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.ActiveCfg = Release|x64 - {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.Build.0 = Release|x64 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.ActiveCfg = Debug|Win32 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.Build.0 = Debug|Win32 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.ActiveCfg = Debug|x64 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.Build.0 = Debug|x64 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|ORBIS.ActiveCfg = Release|Win32 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.ActiveCfg = Release|Win32 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.Build.0 = Release|Win32 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.ActiveCfg = Release|x64 - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.Build.0 = Release|x64 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64 - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.ActiveCfg = Debug|Win32 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.ActiveCfg = Debug|x64 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.Build.0 = Debug|x64 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|ORBIS.ActiveCfg = Release|Win32 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.ActiveCfg = Release|Win32 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.Build.0 = Release|Win32 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.ActiveCfg = Release|x64 - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.Build.0 = Release|x64 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.ActiveCfg = Debug|x64 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.Build.0 = Debug|x64 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|ORBIS.ActiveCfg = Release|Win32 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.ActiveCfg = Release|Win32 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.Build.0 = Release|Win32 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.ActiveCfg = Release|x64 - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.Build.0 = Release|x64 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|ORBIS.ActiveCfg = Debug|Win32 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.Build.0 = Debug|Win32 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.ActiveCfg = Debug|x64 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.Build.0 = Debug|x64 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|ORBIS.ActiveCfg = Release|Win32 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.ActiveCfg = Release|Win32 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.Build.0 = Release|Win32 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.ActiveCfg = Release|x64 - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.Build.0 = Release|x64 {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|ORBIS.Build.0 = Debug|ORBIS {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -300,28 +78,6 @@ Global {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} {83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E} {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E} - {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} - {1782F849-B6E1-466D-9F02-A751F3F8712C} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} - {5A27FF18-A1EC-49BE-9455-415F1C701153} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} - {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} - {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {1AFD580B-98B8-4689-B661-38C41132C60E} - {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {EE203B88-44CF-4859-9D42-7A1F43FECB52} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {834852DB-EDB6-4FD0-BCF9-45CD01126962} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} - {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {572E5B9C-7E19-489C-BD8A-E8401CFBBC47} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} = {1AFD580B-98B8-4689-B661-38C41132C60E} - {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} - {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} = {1AFD580B-98B8-4689-B661-38C41132C60E} {3D02B33D-C348-43C8-AB6A-FB6E6F3C0E7C} = {03B9D2E1-AFBA-4F66-8DE0-6499C9F9155F} EndGlobalSection EndGlobal From 75f5e95e5a44bd252422da832429142812c23a37 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 18:52:45 +0200 Subject: [PATCH 14/17] build: update Lol Engine submodule to the latest version --- lol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lol b/lol index cfef38e..ebcb0e2 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit cfef38eb4478b7e0c21c92c37da12b6399bd5be4 +Subproject commit ebcb0e2030bc1912ce0bd8dd694a2435a22f4eba From 088e91905883830d30a11524ee650bc18afba61b Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 20:35:03 +0200 Subject: [PATCH 15/17] build: fix references in roflmao vcxproj --- roflmao/roflmao.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roflmao/roflmao.vcxproj b/roflmao/roflmao.vcxproj index 13a2d9b..ed35ffb 100644 --- a/roflmao/roflmao.vcxproj +++ b/roflmao/roflmao.vcxproj @@ -37,10 +37,10 @@ {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} From 78bc4b8b93ee5edfe467fc3dae3212ca21325f1c Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 7 Sep 2016 10:26:14 +0200 Subject: [PATCH 16/17] git: bring engine submodule up to date --- lol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lol b/lol index ebcb0e2..e277059 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit ebcb0e2030bc1912ce0bd8dd694a2435a22f4eba +Subproject commit e2770595450f709f2b841299ef6a1b7d5fa79a76 From 1fbd309840f70493d58f897c47128d5adaa1ade1 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 8 Sep 2016 11:40:11 +0200 Subject: [PATCH 17/17] build: better error reporting in bootstrap --- bootstrap | 13 +++++++++++++ lol | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index 3c86f2f..af50f77 100755 --- a/bootstrap +++ b/bootstrap @@ -1,5 +1,18 @@ #!/bin/sh +# Check that the repository is properly set up +if [ ! -x "./lol/bootstrap" ]; then +cat << EOF +Error: cannot execute lol/bootstrap + +Did you configure the Lol Engine submodule? The following may help: + + git submodule update --init --recursive + +EOF + exit 1 +fi + # Bootstrap this project first, using the Lol Engine script ./lol/bootstrap diff --git a/lol b/lol index e277059..99c8c23 160000 --- a/lol +++ b/lol @@ -1 +1 @@ -Subproject commit e2770595450f709f2b841299ef6a1b7d5fa79a76 +Subproject commit 99c8c2353e082b20cf8d6f2a5501331dfc2a54ca