Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 36 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
#########################
# openFrameworks patterns
#########################

# OF-specific ignore patterns

# build files
openFrameworks.a
openFrameworksDebug.a
openFrameworksUniversal.a
libs/openFrameworksCompiled/lib/*/*
!libs/openFrameworksCompiled/lib/*/.gitkeep

#rule to avoid non-official addons going into git
#see addons/.gitignore
# rule to avoid non-official addons going into git
# see addons/.gitignore
addons/*

#rule to avoid non-official apps going into git
#see apps/.gitignore
# rule to avoid non-official apps going into git
# see apps/.gitignore
apps/*

#also, see examples/.gitignore
# also, see examples/.gitignore

# Some general ignore patterns
#########################
# general
#########################

[Bb]uild/
[Oo]bj/
Expand All @@ -27,24 +33,29 @@ apps/*
*.pyc
.svn/
*.log
*.cpp.eep
*.cpp.elf
*.cpp.hex

# IDE-specific ignore patterns
#########################
# IDE
#########################

#XCode
# XCode
*.pbxuser
*.perspective
*.perspectivev3
*.mode1v3
*.mode2v3
#XCode 4
# XCode 4
xcuserdata
*.xcworkspace

#Code::Blocks
# Code::Blocks
*.depend
*.layout

#Visual Studio
# Visual Studio
*.sdf
*.opensdf
*.suo
Expand All @@ -53,36 +64,41 @@ xcuserdata
*.aps
ipch/

#Eclipse
# Eclipse
.metadata
local.properties
.externalToolBuilders

# OS-specific ignore patterns
#########################
# operating system
#########################

#Linux
# Linux
*~
# KDE
.directory
.AppleDouble

#OSX
# OSX
.DS_Store
*.swp
*~.nib
# Thumbnails
._*

#Windows
# Windows
# Windows image file caches
Thumbs.db
# Folder config file
Desktop.ini

#Android
# Android
.csettings
/libs/openFrameworksCompiled/project/android/paths.make

# Miscellaneous
#########################
# miscellaneous
#########################

.mailmap

5 changes: 4 additions & 1 deletion addons/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
!ofAddons.h
#########################
# core addons
#########################

!.project
!ofx3DModelLoader
!ofxAccelerometer
Expand Down
9 changes: 6 additions & 3 deletions apps/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# devApps is the only official directory
#########################
# core apps
#########################

# include official directories
!projectGenerator/
!devApps/

# ignore bin folders' contents, except data folder therein
Expand All @@ -12,5 +17,3 @@
# don't ignore the .gitignore file
!.gitignore

# except the projectGenerator directory, too
!projectGenerator/
3 changes: 3 additions & 0 deletions apps/devApps/AdvancedImageLoading/bin/data/resaved/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ignore resaved images, but not the folders they are in
/*/*
!/*/.gitkeep

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.

This file was deleted.

Empty file.
Empty file.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

57 changes: 27 additions & 30 deletions examples/.gitignore
Original file line number Diff line number Diff line change
@@ -1,64 +1,61 @@
android/*/test link
android/*/gen
android/*/res/raw
libOFAndroidApp.so
libOFAndroidApp_neon.so
gdbserver
gdb.setup
libneondetection.so
Application.mk
Android.mk
#########################
# core examples
#########################

*/*/bin/*
!*/*/bin/data/

# IDE-specific ignore patterns
#########################
# IDE
#########################

#XCode
# XCode
/*/*/*.xcodeproj
/*/*/Project.xcconfig
/*/*/openFrameworks-Info.plist
/*/*/ofxiOS-Info.plist
/*/*/ofxiOS_Prefix.pch
/*/*/*/*/Default-568h@2x~iphone.png
/*/*/*/*/Default.png
/*/*/*/*/[email protected]
/*/*/*/*/Default@2x~ipad.png
/*/*/*/*/Default@2x~iphone.png
/*/*/*/*/Default~ipad.png
/*/*/*/*/Default~iphone.png
/*/*/*/*/Icon-72.png
/*/*/*/*/[email protected]
/*/*/*/*/Icon.png
/*/*/*/*/[email protected]
/*/*/*/*/Default*.png
/*/*/*/*/Icon*.png

#Code::Blocks
# Code::Blocks
/*/*/*.cbp
/*/*/*.workspace

#Visual Studio
# Visual Studio
/*/*/*.sln
/*/*/*.vcxproj
/*/*/*.vcxproj.user
/*/*/*.vcxproj.filters
/*/*/icon.rc

#Eclipse
# Eclipse
/*/*/.cproject
/*/*/.project
/*/*/.settings/

# OS-specific ignore patterns
#########################
# operating system
#########################

#Linux
# Linux
/*/*/Makefile
/*/*/config.make
# Leave Android files in until project generation works
!/android/*/Makefile
!/android/*/config.make

#Android
/*/*/test link
# Android
android/*/test link
android/*/gen
android/*/res/raw
libOFAndroidApp*.so
gdbserver
gdb.setup
libneondetection.so
Application.mk
Android.mk

!/android/*/.cproject
!/android/*/.project
!/android/*/.settings
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/android/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/ios/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/linux/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/linux64/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/linuxarmv6l/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/osx/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/vs/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/lib/win_cb/.gitignore

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions other/serialTest/.gitignore

This file was deleted.

Loading