Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #211 don't checkout

This commit is contained in:
Walzer 2010-11-18 15:55:00 +00:00
parent 820c2f0714
commit 0ad77b779a
12 changed files with 1103 additions and 1086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CocosDenshion/proj.uphone/CocosDenshion.uphone.vcproj
View File

@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="CocosDenshion_uphone" Name="CocosDenshion"
ProjectGUID="{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}" ProjectGUID="{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}"
RootNamespace="CocosDenshion" RootNamespace="CocosDenshion"
Keyword="Win32Proj" Keyword="Win32Proj"

2
HelloWorld.uphone/HelloWorld.cpp
View File

@ -37,7 +37,7 @@ public:
// AppDelegate // AppDelegate
HelloWorldAppDelegate::HelloWorldAppDelegate() HelloWorldAppDelegate::HelloWorldAppDelegate()
, m_pMainWnd(NULL) :m_pMainWnd(NULL)
{ {
} }

2
TestAudioEngine.uphone/TestAudioEngine.vcproj
View File

@ -63,7 +63,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="WS2_32.Lib ..\..\PRJ_TG3\Common\SoftSupport\EosConfig.lib ..\..\PRJ_TG3\Common\SoftSupport\SoftSupport.lib ..\..\PRJ_TG3\Common\SoftSupport\TG3_DLL.lib libCocosDenishion.lib" AdditionalDependencies="WS2_32.Lib ..\..\PRJ_TG3\Common\SoftSupport\EosConfig.lib ..\..\PRJ_TG3\Common\SoftSupport\SoftSupport.lib ..\..\PRJ_TG3\Common\SoftSupport\TG3_DLL.lib"
OutputFile="$(OutDir)/TestAudioEngine.dll" OutputFile="$(OutDir)/TestAudioEngine.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="../../PRJ_TG3/Common/ICU/lib;../../PRJ_TG3/Mtapi/Win32/lib;../../PRJ_TG3/LIB/Win32Lib;../../PRJ_TG3/Common/SoftSupport" AdditionalLibraryDirectories="../../PRJ_TG3/Common/ICU/lib;../../PRJ_TG3/Mtapi/Win32/lib;../../PRJ_TG3/LIB/Win32Lib;../../PRJ_TG3/Common/SoftSupport"

105
cocos2d-x.uphone.sln
View File

@ -1,87 +1,74 @@
 
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2dx-uphone", "cocos2dx\cocos2dx-uphone.vcproj", "{6AC43F51-A036-4653-B910-BDDC346D15E7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\HelloWorld.vcproj", "{90D08657-A80A-41CD-8AAC-3A3DC8C33041}"
ProjectSection(ProjectDependencies) = postProject
{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "chipmunk\chipmunk.vcproj", "{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "Box2D\Box2D.vcproj", "{83C75293-906B-432E-80B9-A0041043E380}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestAudioEngine", "TestAudioEngine\TestAudioEngine.vcproj", "{93D51450-73EC-48FA-9CFB-2095757678B1}"
ProjectSection(ProjectDependencies) = postProject
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0} = {AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dSimpleGame", "Cocos2dSimpleGame\Cocos2dSimpleGame.vcproj", "{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}"
ProjectSection(ProjectDependencies) = postProject
{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0} = {AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion_uphone", "CocosDenshion\CocosDenshion-uphone.vcproj", "{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocosTemplate", "template\cocosTemplate.vcproj", "{A2338E7B-155B-4A3B-AB4B-518ECDD26564}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocosTemplate", "template\cocosTemplate.vcproj", "{A2338E7B-155B-4A3B-AB4B-518ECDD26564}"
ProjectSection(ProjectDependencies) = postProject
{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_uphone", "tests\proj.uphone\test_uphone.vcproj", "{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "Box2D\proj.uphone\Box2D.uphone.vcproj", "{83C75293-906B-432E-80B9-A0041043E380}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "chipmunk\proj.uphone\chipmunk.uphone.vcproj", "{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2d-uphone", "cocos2dx\proj.uphone\cocos2d-uphone.vcproj", "{6AC43F51-A036-4653-B910-BDDC346D15E7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion", "CocosDenshion\proj.uphone\CocosDenshion.uphone.vcproj", "{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld.uphone\HelloWorld.vcproj", "{90D08657-A80A-41CD-8AAC-3A3DC8C33041}"
ProjectSection(ProjectDependencies) = postProject
{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestAudioEngine", "TestAudioEngine.uphone\TestAudioEngine.vcproj", "{93D51450-73EC-48FA-9CFB-2095757678B1}"
ProjectSection(ProjectDependencies) = postProject
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0} = {AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\proj.uphone\test.uphone.vcproj", "{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7} {6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
{83C75293-906B-432E-80B9-A0041043E380} = {83C75293-906B-432E-80B9-A0041043E380} {83C75293-906B-432E-80B9-A0041043E380} = {83C75293-906B-432E-80B9-A0041043E380}
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463} = {BA00DDF7-0F25-4C1E-B012-FA230C1F6463} {BA00DDF7-0F25-4C1E-B012-FA230C1F6463} = {BA00DDF7-0F25-4C1E-B012-FA230C1F6463}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aaa1.uphone", "aaa1\aaa1.uphone.vcproj", "{79EF9F30-3468-4A0E-A285-16E195DCA0C8}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.ActiveCfg = Debug|Win32
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.Build.0 = Debug|Win32
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.ActiveCfg = Release|Win32
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.Build.0 = Release|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.ActiveCfg = Debug|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.Build.0 = Debug|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.ActiveCfg = Release|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.Build.0 = Release|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.ActiveCfg = Debug|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.Build.0 = Debug|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.ActiveCfg = Release|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.Build.0 = Release|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.ActiveCfg = Debug|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.Build.0 = Debug|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.ActiveCfg = Release|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.Build.0 = Release|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.ActiveCfg = Debug|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.Build.0 = Debug|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.ActiveCfg = Release|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.Build.0 = Release|Win32
{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Debug|Win32.ActiveCfg = Debug|Win32
{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Debug|Win32.Build.0 = Debug|Win32
{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Release|Win32.ActiveCfg = Release|Win32
{ADD7B173-FF61-45DA-BDE0-3E41600D21B0}.Release|Win32.Build.0 = Release|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.ActiveCfg = Debug|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.Build.0 = Debug|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.ActiveCfg = Release|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.Build.0 = Release|Win32
{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Debug|Win32.ActiveCfg = Debug|Win32 {A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Debug|Win32.ActiveCfg = Debug|Win32
{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Debug|Win32.Build.0 = Debug|Win32 {A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Debug|Win32.Build.0 = Debug|Win32
{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Release|Win32.ActiveCfg = Release|Win32 {A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Release|Win32.ActiveCfg = Release|Win32
{A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Release|Win32.Build.0 = Release|Win32 {A2338E7B-155B-4A3B-AB4B-518ECDD26564}.Release|Win32.Build.0 = Release|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.ActiveCfg = Debug|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Debug|Win32.Build.0 = Debug|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.ActiveCfg = Release|Win32
{83C75293-906B-432E-80B9-A0041043E380}.Release|Win32.Build.0 = Release|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.ActiveCfg = Debug|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Debug|Win32.Build.0 = Debug|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.ActiveCfg = Release|Win32
{BA00DDF7-0F25-4C1E-B012-FA230C1F6463}.Release|Win32.Build.0 = Release|Win32
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.ActiveCfg = Debug|Win32
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Debug|Win32.Build.0 = Debug|Win32
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.ActiveCfg = Release|Win32
{6AC43F51-A036-4653-B910-BDDC346D15E7}.Release|Win32.Build.0 = Release|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.ActiveCfg = Debug|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Debug|Win32.Build.0 = Debug|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.ActiveCfg = Release|Win32
{AB17438B-7848-4FD6-AF6E-A6A91F82C6F0}.Release|Win32.Build.0 = Release|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.ActiveCfg = Debug|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Debug|Win32.Build.0 = Debug|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.ActiveCfg = Release|Win32
{90D08657-A80A-41CD-8AAC-3A3DC8C33041}.Release|Win32.Build.0 = Release|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.ActiveCfg = Debug|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Debug|Win32.Build.0 = Debug|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.ActiveCfg = Release|Win32
{93D51450-73EC-48FA-9CFB-2095757678B1}.Release|Win32.Build.0 = Release|Win32
{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Debug|Win32.ActiveCfg = Debug|Win32 {33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Debug|Win32.ActiveCfg = Debug|Win32
{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Debug|Win32.Build.0 = Debug|Win32 {33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Debug|Win32.Build.0 = Debug|Win32
{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Release|Win32.ActiveCfg = Release|Win32 {33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Release|Win32.ActiveCfg = Release|Win32
{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Release|Win32.Build.0 = Release|Win32 {33819ACD-9774-4E68-AFBE-7A88BBA7B19D}.Release|Win32.Build.0 = Release|Win32
{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Debug|Win32.ActiveCfg = Debug|Win32
{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Debug|Win32.Build.0 = Debug|Win32
{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Release|Win32.ActiveCfg = Release|Win32
{79EF9F30-3468-4A0E-A285-16E195DCA0C8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

12
cocos2d-x.win32.sln
View File

@ -17,8 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "box2d", "Box2D\proj.win32\B
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "chipmunk\proj.win32\chipmunk.win32.vcproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chipmunk", "chipmunk\proj.win32\chipmunk.win32.vcproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2d-x", "cocos2d-x\proj.win32\cocos2dx.win32.vcproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocosdenshion", "CocosDenshion\proj.win32\CocosDenshion.win32.vcproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocosdenshion", "CocosDenshion\proj.win32\CocosDenshion.win32.vcproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld.win32\HelloWorld.win32.vcproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld.win32\HelloWorld.win32.vcproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
@ -26,6 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld.wi
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocos2d", "cocos2dx\proj.win32\cocos2dx.win32.vcproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -48,10 +48,6 @@ Global
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32
@ -60,6 +56,10 @@ Global
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

1
cocos2dx/include/CCLayer.h
View File

@ -43,7 +43,6 @@ All features from CCNode are valid, plus the following new features:
- It can receive iPhone Touches - It can receive iPhone Touches
- It can receive Accelerometer input - It can receive Accelerometer input
*/ */
// @todo public UIAccelerometerDelegate
class CCX_DLL CCLayer : public CCNode, public CCTouchDelegate, public UIAccelerometerDelegate class CCX_DLL CCLayer : public CCNode, public CCTouchDelegate, public UIAccelerometerDelegate
{ {
public: public:

33
cocos2dx/include/CCUIAccelerometerDelegate.h
View File

@ -25,6 +25,37 @@ THE SOFTWARE.
#ifndef __UIACCELEROMETER_DELEGATE_H__ #ifndef __UIACCELEROMETER_DELEGATE_H__
#define __UIACCELEROMETER_DELEGATE_H__ #define __UIACCELEROMETER_DELEGATE_H__
#include "../platform/CCXUIAccelerometer_platform.h" #include "ccxCommon.h"
namespace cocos2d {
/**
@brief The device accelerometer reports values for each axis in units of g-force
*/
typedef struct
{
double x;
double y;
double z;
double timestamp;
} UIAcceleration;
/**
@brief
The UIAccelerometerDelegate defines a single method for
receiving acceleration-related data from the system.
*/
class CCX_DLL UIAccelerometerDelegate
{
public:
virtual void didAccelerate(UIAcceleration* pAccelerationValue) {}
//! call the release() in child layer
virtual void AccelerometerDestroy(void) {}
//! call the retain() in child layer
virtual void AccelerometerKeep(void) {}
};
} //namespace cocos2d
#endif #endif

1011
cocos2dx/proj.uphone/cocos2d-uphone.vcproj Normal file
View File

File diff suppressed because it is too large Load Diff

1011
cocos2dx/proj.uphone/cocos2d-x.uphone.vcproj
View File

File diff suppressed because it is too large Load Diff

2
cocos2dx/proj.win32/cocos2dx.win32.vcproj
View File

@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="cocos2d-x" Name="cocos2d-win32"
ProjectGUID="{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" ProjectGUID="{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
RootNamespace="cocos2d-x.win32" RootNamespace="cocos2d-x.win32"
Keyword="Win32Proj" Keyword="Win32Proj"

4
tests/proj.uphone/test.uphone.vcproj
View File

@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="test_uphone" Name="tests"
ProjectGUID="{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}" ProjectGUID="{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}"
RootNamespace="test_uphone" RootNamespace="test_uphone"
TargetFrameworkVersion="131072" TargetFrameworkVersion="131072"
@ -67,7 +67,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libcocos2d.lib libEGL.lib libgles_cm.lib libBox2d.lib" AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libcocos2d.lib libEGL.lib libgles_cm.lib libBox2d.lib"
OutputFile="$(OutDir)/test_uphone.dll" OutputFile="$(OutDir)/libCocos2dTests.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="../../../PRJ_TG3/Common/ICU/lib;../../../PRJ_TG3/Mtapi/Win32/lib;../../../PRJ_TG3/LIB/Win32Lib;../../../PRJ_TG3/Common/SoftSupport;&quot;$(OutDir)&quot;" AdditionalLibraryDirectories="../../../PRJ_TG3/Common/ICU/lib;../../../PRJ_TG3/Mtapi/Win32/lib;../../../PRJ_TG3/LIB/Win32Lib;../../../PRJ_TG3/Common/SoftSupport;&quot;$(OutDir)&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"

4
tests/proj.win32/test.win32.vcproj
View File

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;..\..\cocos2d-x&quot;;&quot;..\..\cocos2d-x\include&quot;;..\..\;..\..\chipmunk\include\chipmunk;...\tests;&quot;..\..\cocos2d-x\platform\win32\third_party\OGLES\&quot;" AdditionalIncludeDirectories="..\..\cocos2dx;..\..\cocos2dx\include;..\..\;..\..\chipmunk\include\chipmunk;..\tests;..\..\cocos2dx\platform\win32\third_party\OGLES\"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -120,7 +120,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;..\..\cocos2d-x&quot;;&quot;..\..\cocos2d-x\include&quot;;..\..\;..\..\chipmunk\include\chipmunk;...\tests;&quot;..\..\cocos2d-x\platform\win32\third_party\OGLES\&quot;" AdditionalIncludeDirectories="..\..\cocos2dx;..\..\cocos2dx\include;..\..\;..\..\chipmunk\include\chipmunk;..\tests;..\..\cocos2dx\platform\win32\third_party\OGLES\"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"