* modernize, git ignore

itod · Oct 24, 2015 · 0096477 · 0096477
1 parent c219138
commit 0096477
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,12 @@
 # Xcode
-.DS_Store
-*/build/*
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,13 +16,17 @@
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
-profile
+
+## Other
+*.xccheckout
 *.moved-aside
-DerivedData
-.idea/
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
-*.xccheckout
-#CocoaPods
+*.ipa
+
 Pods
 lib/pegkit
 lib/tdtemplateengine
diff --git a/Panthro.xcodeproj/project.pbxproj b/Panthro.xcodeproj/project.pbxproj
@@ -2356,7 +2356,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.celestialteapot.${PRODUCT_NAME:identifier}";
 				PRODUCT_NAME = Panthro;
-				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				WRAPPER_EXTENSION = framework;
 			};
@@ -2387,7 +2386,6 @@
 				INSTALL_PATH = "$(HOME)/Library/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.celestialteapot.${PRODUCT_NAME:identifier}";
 				PRODUCT_NAME = Panthro;
-				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				WRAPPER_EXTENSION = framework;
 			};
@@ -2402,7 +2400,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -2413,7 +2410,6 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -2441,6 +2437,7 @@
 					"\"$(SRCROOT)/lib/tdtemplateengine/include\"",
 					"\"$(SRCROOT)/lib/pegkit/ParserGenApp\"/**",
 					"\"$(SRCROOT)/lib/pegkit/src\"/**",
+					"\"$(SRCROOT)/lib/libxml2-2.9.1/include\"",
 				);
 				INFOPLIST_FILE = "Tests-Info.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
@@ -2473,6 +2470,7 @@
 					"\"$(SRCROOT)/lib/tdtemplateengine/include\"",
 					"\"$(SRCROOT)/lib/pegkit/ParserGenApp\"/**",
 					"\"$(SRCROOT)/lib/pegkit/src\"/**",
+					"\"$(SRCROOT)/lib/libxml2-2.9.1/include\"",
 				);
 				INFOPLIST_FILE = "Tests-Info.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";