diff --git a/cocos2d-x/.gitignore b/cocos2d-x/.gitignore index fa3bc795..1b92cdb0 100644 --- a/cocos2d-x/.gitignore +++ b/cocos2d-x/.gitignore @@ -1,169 +1 @@ -# Ignore thumbnails created by windows -Thumbs.db - -# Ignore npm files -/node_modules -/tools/make-package/cocos2d-x.zip -/simulator_*.zip -/prebuilt_*.zip -/prebuilt_mk -/prebuilt_mk*.zip -/simulator.json - -# Ignore files build by Visual Studio -*.obj -*.exe -*.pdb -*.aps -*.vcproj.*.user -*.vcxproj.user -*.csproj.user -*.vspscc -*_i.c -*.i -*.icf -*_p.c -*.ncb -*.suo -*.tlb -*.tlh -*.bak -*.cache -*.ilk -*.log -[Bb]in -[Dd]ebug/ -[Dd]ebug.win32/ -*.sbr -*.sdf -obj/ -[Rr]elease/ -[Rr]elease.win32/ -_ReSharper*/ -[Tt]est[Rr]esult* -ipch/ -*.opensdf -*.opendb -SubmissionInfo -Generated Files -AppPackages -BundleArtifacts -.vs/ - -# Ignore files build by ndk and eclipse -bin/ -obj/ -gen/ -assets/ -local.properties - -# Ignore python compiled files -*.pyc - -# Ignore files build by airplay and marmalade -build_*_xcode/ -build_*_vc10/ - -# Ignore files build by xcode -*.mode*v* -*.pbxuser -*.xcbkptlist -*.xcworkspacedata -*.xcuserstate -*.xccheckout -xcschememanagement.plist -.DS_Store -._.* -xcuserdata/ -DerivedData/ - -# Ignore files built by AppCode -.idea/ - -# Ignore files built by bada -.Simulator-Debug/ -.Target-Debug/ -.Target-Release/ - -# Ignore files built by blackberry -/simulator/ -Device-Debug/ -Device-Release/ - -# Ignore vim swaps -*.swp -*.swo - -# Ignore files created by create_project.py -projects/ - -# Ignore config files in javascript bindings generator -tools/tojs/user.cfg -# ... userconf.ini generated if running from tools/tojs -tools/tojs/userconf.ini -tools/tolua/userconf.ini -# ... userconf.ini generated if running from tools/jenkins_scripts/mac/android/ -tools/jenkins_scripts/mac/android/userconf.ini - -# CTags -tags - -# ignore files, created with make-all-linux-project script -/lib -/build/linux-build - -# Cmake files -CMakeCache.txt -CMakeFiles -Makefile -cmake_install.cmake -CMakeLists.txt.user - -# Ignore files generated by console -build/build/ -**/proj.ios_mac/build/ -**/tests/*/runtime/ -**/tests/*/publish/ -**/proj.android-studio/app/libs/ -**/proj.android-studio/app/build.xml -**/proj.android-studio/app/proguard-project.txt - -# Android -project.properties -*.iml - -# Ignore prebuilt libraries folder -/external/* -!/external/config.json -/templates/lua-template-runtime/runtime -/v*-deps-*.zip -/new-renderer-*.zip -/v*-lua-runtime-*.zip -/v*-console-*.zip -/tools/fbx-conv/ -tests/cpp-tests/Resources/audio -/tests/lua-empty-test/src/cocos/ -/tests/lua-game-controller-test/src/cocos/ -/tests/lua-tests/src/cocos/ -/tests/js-tests/res/ -/tools/framework-compile/bin/proj_modifier/plutil-win32/ -!/tools/framework-compile/bin/ - -# generated by framework-compile -/prebuilt/ -/*/prebuilt-mk/Android.mk -/*/*/prebuilt-mk/Android.mk -/*/*/*/prebuilt-mk/Android.mk -/*/*/*/*/prebuilt-mk/Android.mk -*.xcscmblueprint - -# generated by vscode -.vscode/ - -# generated by "gulp gen-simulator" -/tools/simulator/runtime/win32 -/tools/simulator/simulator - - -cocos2d-x-lite-external-* -*.zip +build/build diff --git a/cocos2d-x/tools/cocos2d-console/.gitignore b/cocos2d-x/tools/cocos2d-console/.gitignore index 1b5237be..f640b645 100644 --- a/cocos2d-x/tools/cocos2d-console/.gitignore +++ b/cocos2d-x/tools/cocos2d-console/.gitignore @@ -46,15 +46,6 @@ xcuserdata/ DerivedData/ .idea/* -# Ignore the files from download -bin/sdkbox* -plugins/plugin_compile/build_web/bin -plugins/plugin_jscompile/ -plugins/plugin_luacompile/bin/msvcr110.dll -plugins/plugin_generate/proj_modifier/plutil-win32/ -version.json -v*-console-*.zip - # vim *~ diff --git a/engine/.gitignore b/engine/.gitignore index 845739f5..68031fd5 100644 --- a/engine/.gitignore +++ b/engine/.gitignore @@ -1,9 +1,10 @@ /lib -/bin +/bin/.cache /web.config .idea .DS_Store build +!/cocos2d/renderer/build aspnet_client node_modules /tools/jsdoc_toolkit-2.4.0