rename Resource(in HelloLua and HelloWorld project) and Res(in tests …

…project) to Resources. test ok on win32 and android
georgeyang316 · Feb 14, 2012 · ca1052a · ca1052a
1 parent 3aeb745
commit ca1052a
Show file tree

Hide file tree

Showing 366 changed files with 39,995 additions and 39,976 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -55,6 +55,8 @@ Developers:
     JianHua Chen (Dumganhar)
         author of Bada port
 
+    Erawppa
+        implement CCNotificationCenter
 
 Cocos2d-x can not grow so fast without the active community.
 Thanks to all developers who report & trace bugs, dicuss the engine usage in forum & QQ groups!

diff --git a/HelloLua/Resource/Default.png → HelloLua/Resources/Default.png b/HelloLua/Resource/Default.png → HelloLua/Resources/Default.png
diff --git a/HelloLua/Resource/Icon.png → HelloLua/Resources/Icon.png b/HelloLua/Resource/Icon.png → HelloLua/Resources/Icon.png
diff --git a/HelloLua/Resource/app.icf → HelloLua/Resources/app.icf b/HelloLua/Resource/app.icf → HelloLua/Resources/app.icf
diff --git a/HelloLua/Resource/background.mp3 → HelloLua/Resources/background.mp3 b/HelloLua/Resource/background.mp3 → HelloLua/Resources/background.mp3
diff --git a/HelloLua/Resource/crop.png → HelloLua/Resources/crop.png b/HelloLua/Resource/crop.png → HelloLua/Resources/crop.png
diff --git a/HelloLua/Resource/dog.png → HelloLua/Resources/dog.png b/HelloLua/Resource/dog.png → HelloLua/Resources/dog.png
diff --git a/HelloLua/Resource/effect1.wav → HelloLua/Resources/effect1.wav b/HelloLua/Resource/effect1.wav → HelloLua/Resources/effect1.wav
diff --git a/HelloLua/Resource/farm.jpg → HelloLua/Resources/farm.jpg b/HelloLua/Resource/farm.jpg → HelloLua/Resources/farm.jpg
diff --git a/HelloLua/Resource/fonts/arial.ttf → HelloLua/Resources/fonts/arial.ttf b/HelloLua/Resource/fonts/arial.ttf → HelloLua/Resources/fonts/arial.ttf
diff --git a/HelloLua/Resource/hello.lua → HelloLua/Resources/hello.lua b/HelloLua/Resource/hello.lua → HelloLua/Resources/hello.lua
diff --git a/HelloLua/Resource/hello2.lua → HelloLua/Resources/hello2.lua b/HelloLua/Resource/hello2.lua → HelloLua/Resources/hello2.lua
diff --git a/HelloLua/Resource/land.png → HelloLua/Resources/land.png b/HelloLua/Resource/land.png → HelloLua/Resources/land.png
diff --git a/HelloLua/Resource/menu1.png → HelloLua/Resources/menu1.png b/HelloLua/Resource/menu1.png → HelloLua/Resources/menu1.png
diff --git a/HelloLua/Resource/menu2.png → HelloLua/Resources/menu2.png b/HelloLua/Resource/menu2.png → HelloLua/Resources/menu2.png
diff --git a/HelloLua/android/build_native.sh b/HelloLua/android/build_native.sh
@@ -15,7 +15,7 @@ fi
 
 GAME_ROOT=$COCOS2DX_ROOT_LOCAL/HelloLua
 GAME_ANDROID_ROOT=$GAME_ROOT/android
-GAME_RESOURCE_ROOT=$GAME_ROOT/Resource
+GAME_RESOURCE_ROOT=$GAME_ROOT/Resources
 
 # make sure assets is exist
 if [ -d $GAME_ANDROID_ROOT/assets ]; then

diff --git a/HelloLua/win32/HelloLua.win32.vcproj.user b/HelloLua/win32/HelloLua.win32.vcproj.user
@@ -9,14 +9,14 @@
 			Name="Debug|Win32"
 			>
 			<DebugSettings
-				WorkingDirectory="$(ProjectDir)..\Resource\"
+				WorkingDirectory="$(ProjectDir)..\Resources"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			>
 			<DebugSettings
-				WorkingDirectory="$(ProjectDir)..\Resource\"
+				WorkingDirectory="$(ProjectDir)..\Resources"
 			/>
 		</Configuration>
     </Configurations>

diff --git a/HelloLua/win32/HelloLua.win32.vcxproj.user b/HelloLua/win32/HelloLua.win32.vcxproj.user
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resource\</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resource\</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
diff --git a/HelloWorld/Resource/CloseNormal.png → HelloWorld/Resources/CloseNormal.png b/HelloWorld/Resource/CloseNormal.png → HelloWorld/Resources/CloseNormal.png
diff --git a/HelloWorld/Resource/CloseSelected.png → HelloWorld/Resources/CloseSelected.png b/HelloWorld/Resource/CloseSelected.png → HelloWorld/Resources/CloseSelected.png
diff --git a/HelloWorld/Resource/HelloWorld.png → HelloWorld/Resources/HelloWorld.png b/HelloWorld/Resource/HelloWorld.png → HelloWorld/Resources/HelloWorld.png
diff --git a/HelloWorld/Resource/Icon.png → HelloWorld/Resources/Icon.png b/HelloWorld/Resource/Icon.png → HelloWorld/Resources/Icon.png
diff --git a/HelloWorld/Resource/app.config.txt → HelloWorld/Resources/app.config.txt b/HelloWorld/Resource/app.config.txt → HelloWorld/Resources/app.config.txt
diff --git a/HelloWorld/Resource/app.icf → HelloWorld/Resources/app.icf b/HelloWorld/Resource/app.icf → HelloWorld/Resources/app.icf
diff --git a/HelloWorld/Resource/fonts/Marker Felt.ttf → HelloWorld/Resources/fonts/Marker Felt.ttf b/HelloWorld/Resource/fonts/Marker Felt.ttf → HelloWorld/Resources/fonts/Marker Felt.ttf
diff --git a/HelloWorld/Resource/fonts/arial.ttf → HelloWorld/Resources/fonts/arial.ttf b/HelloWorld/Resource/fonts/arial.ttf → HelloWorld/Resources/fonts/arial.ttf
diff --git a/HelloWorld/android/build_native.sh b/HelloWorld/android/build_native.sh
@@ -23,7 +23,7 @@ fi
 mkdir $HELLOWORLD_ROOT/assets
 
 # copy resources
-for file in $COCOS2DX_ROOT_LOCAL/HelloWorld/Resource/*
+for file in $COCOS2DX_ROOT_LOCAL/HelloWorld/Resources/*
 do
     if [ -d $file ]; then
         cp -rf $file $HELLOWORLD_ROOT/assets

diff --git a/HelloWorld/Linux/.cproject → HelloWorld/linux/.cproject b/HelloWorld/Linux/.cproject → HelloWorld/linux/.cproject
diff --git a/HelloWorld/Linux/.project → HelloWorld/linux/.project b/HelloWorld/Linux/.project → HelloWorld/linux/.project
diff --git a/HelloWorld/Linux/Makefile → HelloWorld/linux/Makefile b/HelloWorld/Linux/Makefile → HelloWorld/linux/Makefile
diff --git a/HelloWorld/Linux/main.cpp → HelloWorld/linux/main.cpp b/HelloWorld/Linux/main.cpp → HelloWorld/linux/main.cpp
diff --git a/HelloWorld/Linux/main.h → HelloWorld/linux/main.h b/HelloWorld/Linux/main.h → HelloWorld/linux/main.h
diff --git a/HelloWorld/win32/HelloWorld.win32.vcproj.user b/HelloWorld/win32/HelloWorld.win32.vcproj.user
@@ -9,14 +9,14 @@
 			Name="Debug|Win32"
 			>
 			<DebugSettings
-				WorkingDirectory="$(ProjectDir)..\Resource\"
+				WorkingDirectory="$(ProjectDir)..\Resources"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			>
 			<DebugSettings
-				WorkingDirectory="$(ProjectDir)..\Resource\"
+				WorkingDirectory="$(ProjectDir)..\Resources"
 			/>
 		</Configuration>
 	</Configurations>

diff --git a/HelloWorld/win32/HelloWorld.win32.vcxproj.user b/HelloWorld/win32/HelloWorld.win32.vcxproj.user
@@ -2,8 +2,8 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ShowAllFiles>false</ShowAllFiles>
-    <LocalDebuggerWorkingDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\Resource\</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerWorkingDirectory Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\Resource\</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WindowsLocalDebugger</DebuggerFlavor>
     <DebuggerFlavor Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>

diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk
@@ -36,6 +36,7 @@ cocos2d.cpp \
 CCDirector.cpp \
 effects/CCGrabber.cpp \
 effects/CCGrid.cpp \
+extensions/CCNotificationCenter.cpp \
 keypad_dispatcher/CCKeypadDelegate.cpp \
 keypad_dispatcher/CCKeypadDispatcher.cpp \
 label_nodes/CCLabelAtlas.cpp \
@@ -91,7 +92,6 @@ support/image_support/TGAlib.cpp \
 support/zip_support/ZipUtils.cpp \
 support/zip_support/ioapi.cpp \
 support/zip_support/unzip.cpp \
-support/extensions/CCNotificationCenter.cpp \
 text_input_node/CCIMEDispatcher.cpp \
 text_input_node/CCTextFieldTTF.cpp \
 textures/CCTexture2D.cpp \

diff --git a/cocos2dx/CCDirector.cpp b/cocos2dx/CCDirector.cpp
@@ -48,7 +48,7 @@ THE SOFTWARE.
 #include "CCAnimationCache.h"
 #include "CCTouch.h"
 #include "CCUserDefault.h"
-#include "support/extensions/CCNotificationCenter.h"
+#include "extensions/CCNotificationCenter.h"
 
 #if CC_ENABLE_PROFILERS
 #include "support/CCProfiling.h"

diff --git a/cocos2dx/include/cocos2d.h b/cocos2dx/include/cocos2d.h
@@ -117,7 +117,7 @@ THE SOFTWARE.
 #include "CCAccelerometer.h"
 
 // extensions
-#include "support/extensions/CCNotificationCenter.h"
+#include "extensions/CCNotificationCenter.h"
 
 //
 // cocos2d macros

diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile
@@ -38,6 +38,7 @@ OBJECTS = ../actions/CCAction.o \
 					../cocoa/CCZone.o \
 					../effects/CCGrabber.o \
 					../effects/CCGrid.o \
+					../extensions/CCNotificationCenter.o \
 					../keypad_dispatcher/CCKeypadDelegate.o \
 					../keypad_dispatcher/CCKeypadDispatcher.o \
 					../label_nodes/CCLabelAtlas.o \
@@ -81,7 +82,6 @@ OBJECTS = ../actions/CCAction.o \
 					../support/TransformUtils.o \
 					../support/base64.o \
 					../support/ccUtils.o \
-					../support/extensions/CCNotificationCenter.o \
 					../support/image_support/TGAlib.o \
 					../support/zip_support/ZipUtils.o \
 					../support/zip_support/ioapi.o \

diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcproj b/cocos2dx/proj.win32/cocos2d-win32.vcproj
@@ -991,18 +991,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="extensions"
-				>
-				<File
-					RelativePath="..\support\extensions\CCNotificationCenter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\support\extensions\CCNotificationCenter.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="textures"
@@ -1096,6 +1084,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="extensions"
+			>
+			<File
+				RelativePath="..\extensions\CCNotificationCenter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\extensions\CCNotificationCenter.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\CCCamera.cpp"
 			>

diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
@@ -150,6 +150,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
     <ClCompile Include="..\actions\CCActionPageTurn3D.cpp" />
     <ClCompile Include="..\actions\CCActionProgressTimer.cpp" />
     <ClCompile Include="..\actions\CCActionTiledGrid.cpp" />
+    <ClCompile Include="..\extensions\CCNotificationCenter.cpp" />
     <ClCompile Include="..\label_nodes\CCLabelAtlas.cpp" />
     <ClCompile Include="..\label_nodes\CCLabelBMFont.cpp" />
     <ClCompile Include="..\label_nodes\CCLabelTTF.cpp" />
@@ -191,7 +192,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
     <ClCompile Include="..\support\CCProfiling.cpp" />
     <ClCompile Include="..\support\CCUserDefault.cpp" />
     <ClCompile Include="..\support\ccUtils.cpp" />
-    <ClCompile Include="..\support\extensions\CCNotificationCenter.cpp" />
     <ClCompile Include="..\support\TransformUtils.cpp" />
     <ClCompile Include="..\support\image_support\TGAlib.cpp" />
     <ClCompile Include="..\support\zip_support\ioapi.cpp" />
@@ -225,6 +225,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
     <ClInclude Include="..\cocoa\CCNS.h" />
     <ClInclude Include="..\effects\CCGrabber.h" />
     <ClInclude Include="..\effects\CCGrid.h" />
+    <ClInclude Include="..\extensions\CCNotificationCenter.h" />
     <ClInclude Include="..\include\CCAccelerometer.h" />
     <ClInclude Include="..\include\CCAccelerometerDelegate.h" />
     <ClInclude Include="..\include\CCAction.h" />
@@ -330,7 +331,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
     <ClInclude Include="..\support\base64.h" />
     <ClInclude Include="..\support\CCProfiling.h" />
     <ClInclude Include="..\support\ccUtils.h" />
-    <ClInclude Include="..\support\extensions\CCNotificationCenter.h" />
     <ClInclude Include="..\support\TransformUtils.h" />
     <ClInclude Include="..\support\data_support\ccCArray.h" />
     <ClInclude Include="..\support\data_support\uthash.h" />

diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
@@ -70,8 +70,8 @@
     <Filter Include="script_support">
       <UniqueIdentifier>{e20bbd88-a111-40c3-9d5d-387a4c9cd4d1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="support\extensions">
-      <UniqueIdentifier>{5eb2c043-58bd-4857-aae4-77c2bdea9742}</UniqueIdentifier>
+    <Filter Include="extensions">
+      <UniqueIdentifier>{35a45df9-e7ee-4fba-b38c-7b1369c3385c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -339,8 +339,8 @@
     <ClCompile Include="..\platform\win32\CCAccelerometer_win32.cpp">
       <Filter>platform\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\support\extensions\CCNotificationCenter.cpp">
-      <Filter>support\extensions</Filter>
+    <ClCompile Include="..\extensions\CCNotificationCenter.cpp">
+      <Filter>extensions</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -696,8 +696,8 @@
     <ClInclude Include="..\include\CCTexturePVR.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\support\extensions\CCNotificationCenter.h">
-      <Filter>support\extensions</Filter>
+    <ClInclude Include="..\extensions\CCNotificationCenter.h">
+      <Filter>extensions</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>