From bda5f46c1b41c0dde3824ff24a98df4a4c6682e2 Mon Sep 17 00:00:00 2001
From: Nelis <seregon888@gmail.com>
Date: Tue, 6 Nov 2012 15:45:00 +0000
Subject: [PATCH] Updated .gitignore to allow .cfg files in res/dist/bin to be
 committed

---
 .gitignore                   |  6 ++++--
 res/dist/bin/plugins.cfg     | 17 +++++++++++++++++
 res/dist/bin/plugins_d.cfg   | 17 +++++++++++++++++
 res/dist/bin/resources.cfg   | 11 +++++++++++
 res/dist/bin/resources_d.cfg | 11 +++++++++++
 5 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 res/dist/bin/plugins.cfg
 create mode 100644 res/dist/bin/plugins_d.cfg
 create mode 100644 res/dist/bin/resources.cfg
 create mode 100644 res/dist/bin/resources_d.cfg

diff --git a/.gitignore b/.gitignore
index 009ad6d6af4..a756fec32c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,6 @@ Thumbs.db
 *.cache
 *.ilk
 *.log
-[Bb]in
-[Dd]ebug*/
 *.sbr
 obj/
 [Rr]elease*/
@@ -26,6 +24,10 @@ _ReSharper*/
 *.vssscc
 $tf*/
 
+# Do not ignore the following, some resources are stored in these folders in the res/dist/ tree
+# [Bb]in
+# [Dd]ebug*/
+
 # Libraries
 *.lib
 *.a
diff --git a/res/dist/bin/plugins.cfg b/res/dist/bin/plugins.cfg
new file mode 100644
index 00000000000..25cf52e59d1
--- /dev/null
+++ b/res/dist/bin/plugins.cfg
@@ -0,0 +1,17 @@
+# Defines plugins to load
+
+# Define plugin folder
+PluginFolder=C:\OgreSDK\OgreSDK_MinGW_v1-8-1\bin\release
+
+# Define plugins
+# Plugin=RenderSystem_Direct3D9
+# Plugin=RenderSystem_Direct3D10
+# Plugin=RenderSystem_Direct3D11
+ Plugin=RenderSystem_GL
+# Plugin=RenderSystem_GLES
+ Plugin=Plugin_ParticleFX
+ Plugin=Plugin_BSPSceneManager
+ Plugin=Plugin_CgProgramManager
+ Plugin=Plugin_PCZSceneManager
+ Plugin=Plugin_OctreeZone
+ Plugin=Plugin_OctreeSceneManager
diff --git a/res/dist/bin/plugins_d.cfg b/res/dist/bin/plugins_d.cfg
new file mode 100644
index 00000000000..dbac4ec5ccc
--- /dev/null
+++ b/res/dist/bin/plugins_d.cfg
@@ -0,0 +1,17 @@
+# Defines plugins to load
+
+# Define plugin folder
+PluginFolder=C:\OgreSDK\OgreSDK_MinGW_v1-8-1\bin\debug
+
+# Define plugins
+# Plugin=RenderSystem_Direct3D9
+# Plugin=RenderSystem_Direct3D10
+# Plugin=RenderSystem_Direct3D11
+ Plugin=RenderSystem_GL_d
+# Plugin=RenderSystem_GLES
+ Plugin=Plugin_ParticleFX_d
+ Plugin=Plugin_BSPSceneManager_d
+ Plugin=Plugin_CgProgramManager_d
+ Plugin=Plugin_PCZSceneManager_d
+ Plugin=Plugin_OctreeZone_d
+ Plugin=Plugin_OctreeSceneManager_d
diff --git a/res/dist/bin/resources.cfg b/res/dist/bin/resources.cfg
new file mode 100644
index 00000000000..2af56726d69
--- /dev/null
+++ b/res/dist/bin/resources.cfg
@@ -0,0 +1,11 @@
+# Resources required by the sample browser and most samples.
+[Essential]
+Zip=../media/packs/SdkTrays.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../media
+FileSystem=../media/materials/scripts
+FileSystem=../media/materials/programs
+FileSystem=../media/materials/textures
+FileSystem=../media/models
diff --git a/res/dist/bin/resources_d.cfg b/res/dist/bin/resources_d.cfg
new file mode 100644
index 00000000000..2af56726d69
--- /dev/null
+++ b/res/dist/bin/resources_d.cfg
@@ -0,0 +1,11 @@
+# Resources required by the sample browser and most samples.
+[Essential]
+Zip=../media/packs/SdkTrays.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../media
+FileSystem=../media/materials/scripts
+FileSystem=../media/materials/programs
+FileSystem=../media/materials/textures
+FileSystem=../media/models