update version

chukong · Sep 22, 2014 · 5fdd0f9 · 5fdd0f9
1 parent 13776ff
commit 5fdd0f9
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 156 deletions.
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+2.2.5plus
diff --git a/lib/cocos2d-x/cocos2dx/cocos2d.cpp b/lib/cocos2d-x/cocos2dx/cocos2d.cpp
@@ -30,7 +30,7 @@ NS_CC_BEGIN
 
 const char* cocos2dVersion()
 {
-    return "quick-cocos2d-x 2.2.5";
+    return "quick-cocos2d-x 2.2.5plus";
 }
 
 NS_CC_END

diff --git a/lib/proj.win32/cocos2dx_2012.vcxproj b/lib/proj.win32/cocos2dx_2012.vcxproj
@@ -1040,13 +1040,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/player/mac/player.app/Contents/MacOS/player b/player/mac/player.app/Contents/MacOS/player
diff --git a/player/mac/player.app/Contents/Resources/CreateNewProjectDialog.nib b/player/mac/player.app/Contents/Resources/CreateNewProjectDialog.nib
diff --git a/player/mac/player.app/Contents/_CodeSignature/CodeDirectory b/player/mac/player.app/Contents/_CodeSignature/CodeDirectory
diff --git a/player/mac/player.app/Contents/_CodeSignature/CodeRequirements b/player/mac/player.app/Contents/_CodeSignature/CodeRequirements
diff --git a/player/mac/player.app/Contents/_CodeSignature/CodeResources b/player/mac/player.app/Contents/_CodeSignature/CodeResources
diff --git a/player/mac/player.app/Contents/_CodeSignature/CodeSignature b/player/mac/player.app/Contents/_CodeSignature/CodeSignature
diff --git a/player/mac/player.app/Contents/embedded.provisionprofile b/player/mac/player.app/Contents/embedded.provisionprofile
diff --git a/player/proj.mac/Info.plist b/player/proj.mac/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20140609</string>
+	<string>20140922</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/player/proj.mac/player.xcodeproj/project.pbxproj b/player/proj.mac/player.xcodeproj/project.pbxproj
@@ -388,8 +388,8 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
-				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
+				CODE_SIGN_IDENTITY = "Mac Developer";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -444,8 +444,8 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
-				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
+				CODE_SIGN_IDENTITY = "Mac Developer";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;

diff --git a/player/proj.mac/player.xcworkspace/contents.xcworkspacedata b/player/proj.mac/player.xcworkspace/contents.xcworkspacedata
diff --git a/player/proj.mac/player.xcworkspace/xcshareddata/player.xccheckout b/player/proj.mac/player.xcworkspace/xcshareddata/player.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>AC8EAD50-ECCE-4326-9E1D-9FE3C38296D2</string>
+	<key>IDESourceControlProjectName</key>
+	<string>player</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>A5D9563D-774B-4704-9E09-5B6AD6D546C3</key>
+		<string>ssh://github.com/chukong/quick-cocos2d-x.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>player/proj.mac/player.xcodeproj/project.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>A5D9563D-774B-4704-9E09-5B6AD6D546C3</key>
+		<string>../../../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/chukong/quick-cocos2d-x.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>A5D9563D-774B-4704-9E09-5B6AD6D546C3</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>A5D9563D-774B-4704-9E09-5B6AD6D546C3</string>
+			<key>IDESourceControlWCCName</key>
+			<string>v2quick</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/player/proj.win32/player.vcxproj b/player/proj.win32/player.vcxproj
@@ -41,7 +41,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfAtl>false</UseOfAtl>
     <UseOfMfc>false</UseOfMfc>

diff --git a/player/win/player.exe b/player/win/player.exe