summaryrefslogtreecommitdiff
path: root/libre/ogre-libre
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-03-21 03:22:19 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-03-21 03:22:19 +0000
commitd0f33415f254cb2fee06fd89f9cfed4535322f37 (patch)
tree66c13d72eac4f0110772b4675231c891334137bc /libre/ogre-libre
parent7e108c74958ec076a3734822f61f145d0d69547f (diff)
Fri Mar 21 03:19:28 UTC 2014
Diffstat (limited to 'libre/ogre-libre')
-rw-r--r--libre/ogre-libre/PKGBUILD165
-rw-r--r--libre/ogre-libre/libre.patch694
2 files changed, 0 insertions, 859 deletions
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
deleted file mode 100644
index 9648e5f24..000000000
--- a/libre/ogre-libre/PKGBUILD
+++ /dev/null
@@ -1,165 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_bldname=blender
-_bldver=2.69
-_bldep=10
-
-# ($srcdir/Tools/${_bldname^}2.6Export/__init__.py:bl_info>version)
-_addver=2.0.3
-_addrel=1
-
-pkgbase=ogre
-pkgname=(
- $pkgbase-libre
- #$_bldname-addon-$pkgbase # package unstable
-)
-pkgver=1.9.0
-pkgrel=4
-pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
-arch=(
- mips64el
- x86_64
- i686
-)
-url=http://www.${pkgbase}3d.org
-license=MIT
-depends=(
- boost-libs
- freeimage
- freetype2
- glu
- libxaw
- libxrandr
- ois
- tinyxml
- zziplib
-)
-makedepends=(
- boost
- cmake
- doxygen
- graphviz
- mesa
- mercurial
- ttf-dejavu
-)
-mksource=(
- ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-}
- libre.patch
-)
-source=(
- https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-libre-$pkgver.tar.xz
-)
-mksha512sums=(
- SKIP
- e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767
-)
-sha512sums=(
- 9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a
-)
-
-mksource() {
- cd ${pkgbase}
-
- # remove nonfree files
- rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h
- rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h
- rm -rv Samples/Media/materials/textures/nvidia
- rm -v Samples/Media/packs/chiropteraDM.{pk3,txt}
- rm -v CMake/Templates/quakemap{,_d}.cfg.in
- patch -Np1 -i $srcdir/libre.patch
-}
-
-build() {
- cd ${pkgbase}
-
- # add symlinks to point to mesa header files
- cd RenderSystems/GL/include/GL
- ln -sv /usr/include/GL/gl.h gl.h
- ln -sv /usr/include/GL/glext.h glext.h
- ln -sv /usr/include/GL/wglext.h wglext.h
- ln -sv /usr/include/GL/glxtokens.h glxtokens.h
- ln -sv /usr/include/GL/glxext.h glxext.h
-
- # get a clean build dir
- [[ -d build ]] && rm -vrf build
- mkdir -v build && cd build
-
- # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree
- cmake .. \
- -DCMAKE_BUILD_TYPE=Release\
- -DCMAKE_INSTALL_PREFIX=/usr\
- -DCPACK_PACKAGE_DESCRIPTION_SUMMARY='Libre 3D Graphics Engine'\
- -D${pkgbase^^}_BUILD_COMPONENT_PAGING=TRUE\
- -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\
- -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\
- -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\
- -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\
- -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\
- -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\
- -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\
- -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\
- -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\
- -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\
- -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\
- -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\
- -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\
- -D${pkgbase^^}_BUILD_SAMPLES=FALSE\
- -D${pkgbase^^}_BUILD_TESTS=FALSE\
- -D${pkgbase^^}_BUILD_TOOLS=TRUE\
- -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\
- -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\
- -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\
- -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\
- -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\
- -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\
- -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\
- -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\
- -D${pkgbase^^}_INSTALL_DOCS=FALSE\
- -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\
- -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\
- -D${pkgbase^^}_INSTALL_TOOLS=TRUE\
- -D${pkgbase^^}_LIB_DIRECTORY=lib\
- -D${pkgbase^^}_PROFILING=TRUE\
- -D${pkgbase^^}_USE_BOOST=TRUE
- make V=0
-}
-
-package_ogre-libre() {
- optdepends=(
- "boost: for developing using $pkgbase"
- "$pkgbase-docs: documentation"
- )
- provides=($pkgbase=$pkgver)
- conflicts=$pkgbase
- replaces=$pkgbase
-
- cd ${pkgbase}/build
-
- make DESTDIR=$pkgdir install
-
- # install license
- install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html
-
- # remove nonfree files
- rm -vr $pkgdir/usr/lib/OGRE/cmake
- rm -v $pkgdir/usr/include/OGRE/Example*.h
-}
-
-package_blender-addon-ogre() {
- pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname-libre package)"
- arch=any
- depends=(
- "$_bldname-libre>=$(($_bldep-1)):$_bldver"
- "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
- )
- _pkgver=$pkgver
- pkgver=$_addver.v$_bldver
- pkgrel=$_addrel
-
- cd ${pkgbase}
- a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
- install -vd $a && cp -va Tools/${_bldname^}2.6Export $a/$pkgbase
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch
deleted file mode 100644
index 77c32c8d4..000000000
--- a/libre/ogre-libre/libre.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake
---- ogre.orig/CMake/InstallResources.cmake 2014-01-15 01:56:25.549401653 -0200
-+++ ogre/CMake/InstallResources.cmake 2014-01-21 21:24:52.510763877 -0200
-@@ -116,9 +116,6 @@
- # create plugins.cfg
- configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg)
--# create quakemap.cfg
--configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg)
--configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg)
- # create samples.cfg
- configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)
-@@ -219,11 +216,6 @@
- configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg)
-- # create quakemap.cfg
-- configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg)
-- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg)
-- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg)
-- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg)
- # create samples.cfg
- configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg)
-diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in
---- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-01-15 01:56:25.652728172 -0200
-+++ ogre/CMake/Templates/demomedia.wxi.in 2014-01-21 21:49:24.962291640 -0200
-@@ -295,13 +295,6 @@
- <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" />
- <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" />
- <ComponentRef Id="cmp0344A18C23958D312C044A6E8443CD9D" />
-- <ComponentRef Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" />
-- <ComponentRef Id="cmp376B3837DF007338AC14AB58C726A8B1" />
-- <ComponentRef Id="cmp02B151F3B587EAF5AF116E6A3B09E247" />
-- <ComponentRef Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" />
-- <ComponentRef Id="cmpB11E2174087D0D3FC791806231C1DBF5" />
-- <ComponentRef Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" />
-- <ComponentRef Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" />
- <ComponentRef Id="cmpEA39DA48CA01586DF3412795541AD2FC" />
- <ComponentRef Id="cmp50C3E068724D3C32847EEB132308B147" />
- <ComponentRef Id="cmp78D10E140133F6977C74A8F912B2B217" />
-@@ -328,8 +321,6 @@
- <ComponentRef Id="cmpDFD58144C55506C82E22CF1AC14714B8" />
- <ComponentRef Id="cmp9BF13256D468C8147B7050A93B09C032" />
- <ComponentRef Id="cmp86F908FD9E8E5FFAD0C2D9A37A098E4C" />
-- <ComponentRef Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" />
-- <ComponentRef Id="cmp98499D3076FA7324AFE1F9F8D10FB421" />
- <ComponentRef Id="cmp532E67011B733ACE674692F6ED52775D" />
- <ComponentRef Id="cmp572AE70CCC0D85E8DA35F87B45768634" />
- <ComponentRef Id="cmp013036935784DEC9BAE62831C93EFA18" />
-@@ -1338,29 +1329,6 @@
- <Component Id="cmp0344A18C23958D312C044A6E8443CD9D" Guid="{E47FE6B7-B6BD-4FCA-A903-87281A6B8CEB}">
- <File Id="fil39C72570EB0CBAC9AF4FF900C2D5D525" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\WoodPallet.png" />
- </Component>
-- <Directory Id="dir11696C93BEAB38C45931BCBDDB2A6789" Name="nvidia">
-- <Component Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" Guid="{68CA4BF9-5A51-400F-B5C2-701A4DA8D331}">
-- <File Id="fil40BA6B2C4D12AD2C5710179390B9D2DB" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds" />
-- </Component>
-- <Component Id="cmp376B3837DF007338AC14AB58C726A8B1" Guid="{CF5BBEF1-4E44-46E9-8373-4FF589D19F6F}">
-- <File Id="fil6A9EC7DE38E4F700741187344AAB9A4C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_normalheight.dds" />
-- </Component>
-- <Component Id="cmp02B151F3B587EAF5AF116E6A3B09E247" Guid="{EB6D162E-A67A-4CD1-948D-66B84457AFBD}">
-- <File Id="fil30FFE3069E40D44C734E168BEB336DA0" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_diffusespecular.dds" />
-- </Component>
-- <Component Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" Guid="{C6E468AC-67EE-44C6-9F01-69D369D966FC}">
-- <File Id="fil4C7A93A8C53E76F5F5ED65D1F52659DD" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_normalheight.dds" />
-- </Component>
-- <Component Id="cmpB11E2174087D0D3FC791806231C1DBF5" Guid="{3A30B7B3-6D8D-4475-B31E-5626B54DD65B}">
-- <File Id="fil909FAC7A36B3EA5B9F4660701BEC09F5" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds" />
-- </Component>
-- <Component Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" Guid="{EE4979FF-6320-432A-98B2-F183BCAC197A}">
-- <File Id="fil23D0DB8C9CA160970B9C29DD8F77B5CF" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds" />
-- </Component>
-- <Component Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" Guid="{E8AD7243-C2F2-4C00-AE8E-DC38E20927FA}">
-- <File Id="fil6A4613F0DA3B5B562C5C68C05DFF0171" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\TextureUsageAgreement.txt" />
-- </Component>
-- </Directory>
- </Directory>
- </Directory>
- <Directory Id="dir01544E63CCE21518F3D56A0A93D1DC4A" Name="models">
-@@ -1444,12 +1412,6 @@
- </Component>
- </Directory>
- <Directory Id="dir4ABFE5E33570C5CDD587CDA5FEC53CBC" Name="packs">
-- <Component Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" Guid="{5B8E1BED-1BC5-4A20-BA09-9699D0AF7BFC}">
-- <File Id="fil43F38AE712D50BF0076D8C8E08E3264C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.pk3" />
-- </Component>
-- <Component Id="cmp98499D3076FA7324AFE1F9F8D10FB421" Guid="{38CA3EF3-96E4-47D1-8B4C-682BCCF91E99}">
-- <File Id="fil98BCB56BE20EF36A4F72F07CDADC63DE" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.txt" />
-- </Component>
- <Component Id="cmp532E67011B733ACE674692F6ED52775D" Guid="{9AC3FA7E-FBDC-4448-A61B-615EF43EB923}">
- <File Id="filC6E116063CEC1DFBE1D6B452FD089931" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\cubemap.zip" />
- </Component>
-@@ -1794,4 +1756,4 @@
- </Directory>
- </DirectoryRef>
- </Fragment>
--</Include>
-\ No newline at end of file
-+</Include>
-diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-15 01:56:25.872713663 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-21 22:20:00.343185180 -0200
-@@ -555,48 +555,6 @@
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
- <None Include="..\..\Media\materials\textures\ogreborder.png">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-@@ -3671,15 +3629,6 @@
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.pk3">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
- <None Include="..\..\Media\packs\cubemap.zip">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
- <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-@@ -4867,20 +4816,6 @@
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.txt">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- </None>
- <None Include="..\..\Media\RTShaderLib\cache\dummy.txt">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-@@ -4893,4 +4828,4 @@
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-15 01:56:25.872713663 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-21 22:20:41.517291770 -0200
-@@ -628,9 +628,6 @@
- <None Include="..\..\Media\models\Barrel.mesh">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.pk3">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\models\column.mesh">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1075,9 +1072,6 @@
- <None Include="..\..\Media\materials\textures\checker.png">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.txt">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\textures\Chrome.jpg">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1105,12 +1099,6 @@
- <None Include="..\..\Media\materials\textures\dirt01.jpg">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
-- <Filter>Assets\media</Filter>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\textures\dkyellow.png">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1168,24 +1156,12 @@
- <None Include="..\..\Media\materials\textures\grass_1024.jpg">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
-- <Filter>Assets\media</Filter>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\textures\SSAO\gray256.png">
- <Filter>Assets\media</Filter>
- </None>
- <None Include="..\..\Media\materials\textures\GreenSkin.jpg">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
-- <Filter>Assets\media</Filter>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1492,9 +1468,6 @@
- <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\thumbnails\thumb_bezier.png">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1658,4 +1631,4 @@
- <Filter>Assets\media</Filter>
- </None>
- </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-15 01:56:25.896045457 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-21 21:53:56.997551091 -0200
-@@ -4356,21 +4356,6 @@
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.pk3">
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
- <None Include="..\..\Media\packs\cubemap.zip">
- <DeploymentContent>true</DeploymentContent>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-@@ -6443,96 +6428,6 @@
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
- <None Include="..\..\Media\materials\textures\ogreborder.png">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-@@ -9014,36 +8909,6 @@
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.txt">
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
-- <DeploymentContent>true</DeploymentContent>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
-- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
-- </None>
- <None Include="..\..\Media\RTShaderLib\cache\dummy.txt">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
-@@ -9264,4 +9129,4 @@
- <Import Condition="'$(Configuration)'=='Phone Debug' or '$(Configuration)'=='Phone Release'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-15 01:56:25.899378571 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-21 21:54:56.166945128 -0200
-@@ -731,9 +731,6 @@
- <None Include="..\..\Media\models\Barrel.mesh">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.pk3">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\models\column.mesh">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1154,9 +1151,6 @@
- <None Include="..\..\Media\materials\textures\checker.png">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\packs\chiropteraDM.txt">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\textures\Chrome.jpg">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1184,12 +1178,6 @@
- <None Include="..\..\Media\materials\textures\dirt01.jpg">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
-- <Filter>Assets\media</Filter>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\textures\dkyellow.png">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1247,24 +1235,12 @@
- <None Include="..\..\Media\materials\textures\grass_1024.jpg">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
-- <Filter>Assets\media</Filter>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\textures\SSAO\gray256.png">
- <Filter>Assets\media</Filter>
- </None>
- <None Include="..\..\Media\materials\textures\GreenSkin.jpg">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
-- <Filter>Assets\media</Filter>
-- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1571,9 +1547,6 @@
- <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png">
- <Filter>Assets\media</Filter>
- </None>
-- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
-- <Filter>Assets\media</Filter>
-- </None>
- <None Include="..\..\Media\thumbnails\thumb_bezier.png">
- <Filter>Assets\media</Filter>
- </None>
-@@ -1775,4 +1748,4 @@
- <Filter>Assets\for WMAppManifest</Filter>
- </Image>
- </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt
---- ogre.orig/Samples/CMakeLists.txt 2014-01-15 01:56:25.932709706 -0200
-+++ ogre/Samples/CMakeLists.txt 2014-01-21 21:23:53.145016405 -0200
-@@ -238,7 +238,6 @@
- set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL})
- set(OGRE_MEDIA_DIR_REL "Media")
- configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY)
-- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY)
- # restore
- set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP})
- add_custom_target(demo_installer
-diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h
---- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-15 01:56:26.186026332 -0200
-+++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-21 21:51:44.043058960 -0200
-@@ -304,17 +304,6 @@
- defaultimp.inputScale = 600;
- defaultimp.minBatchSize = 33;
- defaultimp.maxBatchSize = 65;
-- // textures
-- defaultimp.layerList.resize(3);
-- defaultimp.layerList[0].worldSize = 100;
-- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
-- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
-- defaultimp.layerList[1].worldSize = 30;
-- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
-- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
-- defaultimp.layerList[2].worldSize = 200;
-- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
-- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
- }
-
- /*-----------------------------------------------------------------------------
-diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material
---- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-15 01:56:27.849249967 -0200
-+++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-21 22:24:19.433708607 -0200
-@@ -11,36 +11,6 @@
- fragment_program_ref TriplanarReferenceHigh_PS
- {
- }
-- texture_unit
-- {
-- texture_alias fromX
-- texture dirt_grayrocky_diffusespecular.dds
-- }
-- texture_unit
-- {
-- texture_alias fromXNormal
-- texture dirt_grayrocky_normalheight.dds
-- }
-- texture_unit
-- {
-- texture_alias fromY
-- texture grass_green-01_diffusespecular.dds
-- }
-- texture_unit
-- {
-- texture_alias fromYNormal
-- texture grass_green-01_normalheight.dds
-- }
-- texture_unit
-- {
-- texture_alias fromZ
-- texture growth_weirdfungus-03_diffusespecular.dds
-- }
-- texture_unit
-- {
-- texture_alias fromZNormal
-- texture growth_weirdfungus-03_normalheight.dds
-- }
- }
- }
- }
-@@ -57,36 +27,6 @@
- fragment_program_ref TriplanarReferenceLow_PS
- {
- }
-- texture_unit
-- {
-- texture_alias fromX
-- texture dirt_grayrocky_diffusespecular.dds
-- }
-- texture_unit
-- {
-- texture_alias fromXNormal
-- texture dirt_grayrocky_normalheight.dds
-- }
-- texture_unit
-- {
-- texture_alias fromY
-- texture grass_green-01_diffusespecular.dds
-- }
-- texture_unit
-- {
-- texture_alias fromYNormal
-- texture grass_green-01_normalheight.dds
-- }
-- texture_unit
-- {
-- texture_alias fromZ
-- texture growth_weirdfungus-03_diffusespecular.dds
-- }
-- texture_unit
-- {
-- texture_alias fromZNormal
-- texture growth_weirdfungus-03_normalheight.dds
-- }
- }
- }
- }
-@@ -101,4 +41,4 @@
- diffuse 1.0 1.0 1.0
- }
- }
--}
-\ No newline at end of file
-+}
-diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h
---- ogre.orig/Samples/Terrain/include/Terrain.h 2014-01-15 01:56:28.209226225 -0200
-+++ ogre/Samples/Terrain/include/Terrain.h 2014-01-21 21:55:51.099952029 -0200
-@@ -533,17 +533,6 @@
- defaultimp.inputScale = 600;
- defaultimp.minBatchSize = 33;
- defaultimp.maxBatchSize = 65;
-- // textures
-- defaultimp.layerList.resize(3);
-- defaultimp.layerList[0].worldSize = 100;
-- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
-- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
-- defaultimp.layerList[1].worldSize = 30;
-- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
-- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
-- defaultimp.layerList[2].worldSize = 200;
-- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
-- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
-
-
- }
-diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp
---- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-01-15 01:56:28.309219629 -0200
-+++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-01-21 22:31:02.415114645 -0200
-@@ -411,16 +411,6 @@
- // mTerrain->update();
- // updateDelay = 0.3;
- // }
--// /*
--// if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0)
--// {
--// StringVector texNames;
--// texNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
--// texNames.push_back("growth_weirdfungus-03_normalheight.dds");
--// mTerrain->addLayer(500, &texNames);
--// updateDelay = 0.3;
--// }
--// */
- // updateDelay -= evt.timeSinceLastFrame;
- // }
- //#endif
-@@ -8185,17 +8175,6 @@
- // imp.inputScale = 600;
- // imp.minBatchSize = 33;
- // imp.maxBatchSize = 65;
--// // textures
--// imp.layerList.resize(3);
--// imp.layerList[0].worldSize = 100;
--// imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
--// imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
--// imp.layerList[1].worldSize = 30;
--// imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
--// imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
--// imp.layerList[2].worldSize = 200;
--// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
--// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
- // terrain->prepare(imp);
- // terrain->load();
- //