Skip to content

Commit

Permalink
Updated .gitignore to allow .cfg files in res/dist/bin to be committed
Browse files Browse the repository at this point in the history
  • Loading branch information
NelisDrost committed Nov 6, 2012
1 parent 6d3e2d5 commit bda5f46
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ Thumbs.db
*.cache
*.ilk
*.log
[Bb]in
[Dd]ebug*/
*.sbr
obj/
[Rr]elease*/
Expand All @@ -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
Expand Down
17 changes: 17 additions & 0 deletions res/dist/bin/plugins.cfg
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions res/dist/bin/plugins_d.cfg
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions res/dist/bin/resources.cfg
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions res/dist/bin/resources_d.cfg
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit bda5f46

Please sign in to comment.