Skip to content

Commit

Permalink
Merge pull request cocos2d#852 from dumganhar/iss1170_remove_wophone
Browse files Browse the repository at this point in the history 
fixed cocos2d#1170: Removed wophone template.
  • Loading branch information
James Chen committed Apr 18, 2012
2 parents b1a130f + 31e6572 commit ca4f629
Show file tree
Hide file tree
Showing 48 changed files with 91 additions and 3,592 deletions.
69 changes: 69 additions & 0 deletions cocos2d-win32.vc2010.sln
View file
Expand Up @@ -20,7 +20,48 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua\win32\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testt.win32", "testt\testt.win32.vcxproj", "{46196B18-D0B7-4CA2-9A90-8BAB68808CF0}"
ProjectSection(ProjectDependencies) = postProject
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luahello1.win32", "luahello1\luahello1.win32.vcxproj", "{E4E6AF1D-115A-4396-BC0A-51F68EC107AD}"
ProjectSection(ProjectDependencies) = postProject
{DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159}
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
{929480E7-23C0-4DF6-8456-096D71547116} = {929480E7-23C0-4DF6-8456-096D71547116}
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testlia.win32", "testlia\testlia.win32.vcxproj", "{7E64366A-FA6C-4302-85F0-4583FB4FC155}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsdfasdf.win32", "testsdfasdf\testsdfasdf.win32.vcxproj", "{DDF76BAF-8353-4F6C-91AB-E3524DFE8588}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "htghrthfgh.win32", "htghrthfgh\htghrthfgh.win32.vcxproj", "{2945C29B-1D0D-498E-96FD-4AE05432010E}"
ProjectSection(ProjectDependencies) = postProject
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luadfasdf.win32", "luadfasdf\luadfasdf.win32.vcxproj", "{4B173458-9FAB-4499-AC22-5C48829C9C5A}"
ProjectSection(ProjectDependencies) = postProject
{DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159}
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luatest2.win32", "luatest2\luatest2.win32.vcxproj", "{9C14FEA7-8FDF-4094-984A-96982E4DE470}"
ProjectSection(ProjectDependencies) = postProject
{DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159}
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
EndProjectSection
EndProject
Global
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Expand Down Expand Up @@ -58,6 +99,34 @@ Global
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|Win32
{46196B18-D0B7-4CA2-9A90-8BAB68808CF0}.Debug|Win32.ActiveCfg = Debug|Win32
{46196B18-D0B7-4CA2-9A90-8BAB68808CF0}.Debug|Win32.Build.0 = Debug|Win32
{46196B18-D0B7-4CA2-9A90-8BAB68808CF0}.Release|Win32.ActiveCfg = Release|Win32
{46196B18-D0B7-4CA2-9A90-8BAB68808CF0}.Release|Win32.Build.0 = Release|Win32
{E4E6AF1D-115A-4396-BC0A-51F68EC107AD}.Debug|Win32.ActiveCfg = Debug|Win32
{E4E6AF1D-115A-4396-BC0A-51F68EC107AD}.Debug|Win32.Build.0 = Debug|Win32
{E4E6AF1D-115A-4396-BC0A-51F68EC107AD}.Release|Win32.ActiveCfg = Release|Win32
{E4E6AF1D-115A-4396-BC0A-51F68EC107AD}.Release|Win32.Build.0 = Release|Win32
{7E64366A-FA6C-4302-85F0-4583FB4FC155}.Debug|Win32.ActiveCfg = Debug|Win32
{7E64366A-FA6C-4302-85F0-4583FB4FC155}.Debug|Win32.Build.0 = Debug|Win32
{7E64366A-FA6C-4302-85F0-4583FB4FC155}.Release|Win32.ActiveCfg = Release|Win32
{7E64366A-FA6C-4302-85F0-4583FB4FC155}.Release|Win32.Build.0 = Release|Win32
{DDF76BAF-8353-4F6C-91AB-E3524DFE8588}.Debug|Win32.ActiveCfg = Debug|Win32
{DDF76BAF-8353-4F6C-91AB-E3524DFE8588}.Debug|Win32.Build.0 = Debug|Win32
{DDF76BAF-8353-4F6C-91AB-E3524DFE8588}.Release|Win32.ActiveCfg = Release|Win32
{DDF76BAF-8353-4F6C-91AB-E3524DFE8588}.Release|Win32.Build.0 = Release|Win32
{2945C29B-1D0D-498E-96FD-4AE05432010E}.Debug|Win32.ActiveCfg = Debug|Win32
{2945C29B-1D0D-498E-96FD-4AE05432010E}.Debug|Win32.Build.0 = Debug|Win32
{2945C29B-1D0D-498E-96FD-4AE05432010E}.Release|Win32.ActiveCfg = Release|Win32
{2945C29B-1D0D-498E-96FD-4AE05432010E}.Release|Win32.Build.0 = Release|Win32
{4B173458-9FAB-4499-AC22-5C48829C9C5A}.Debug|Win32.ActiveCfg = Debug|Win32
{4B173458-9FAB-4499-AC22-5C48829C9C5A}.Debug|Win32.Build.0 = Debug|Win32
{4B173458-9FAB-4499-AC22-5C48829C9C5A}.Release|Win32.ActiveCfg = Release|Win32
{4B173458-9FAB-4499-AC22-5C48829C9C5A}.Release|Win32.Build.0 = Release|Win32
{9C14FEA7-8FDF-4094-984A-96982E4DE470}.Debug|Win32.ActiveCfg = Debug|Win32
{9C14FEA7-8FDF-4094-984A-96982E4DE470}.Debug|Win32.Build.0 = Debug|Win32
{9C14FEA7-8FDF-4094-984A-96982E4DE470}.Release|Win32.ActiveCfg = Release|Win32
{9C14FEA7-8FDF-4094-984A-96982E4DE470}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
View file
@@ -1 +1 @@
87bb9c595b42517f4609c09721c73a4caf404d19
81fbed6285e6de81aec4aa8947f48a86f5478979
29 changes: 8 additions & 21 deletions template/msvc/CCAppWiz.win32/Templates/1033/Classes/AppDelegate.cpp
View file
@@ -1,16 +1,16 @@
#include "AppDelegate.h"

#include "cocos2d.h"
[! if CC_USE_COCOS_DENSHION_SIMPLE_AUDIO_ENGINE]
#include "SimpleAudioEngine.h"
using namespace CocosDenshion;

[! endif]
#include "CCEGLView.h"
#include "AppDelegate.h"
[! if CC_USE_LUA]
#include "CCLuaEngine.h"
[! else]
#include "HelloWorldScene.h"
[! endif]
[! if CC_USE_COCOS_DENSHION_SIMPLE_AUDIO_ENGINE]
#include "SimpleAudioEngine.h"

#include "CCEGLView.h"
using namespace CocosDenshion;
[! endif]

USING_NS_CC;

Expand Down Expand Up @@ -57,19 +57,6 @@ bool AppDelegate::initInstance()

#endif // CC_PLATFORM_ANDROID

#if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)

// Initialize OpenGLView instance, that release by CCDirector when application terminate.
// The HelloWorld is designed as HVGA.
CCEGLView* pMainWnd = new CCEGLView(this);
CC_BREAK_IF(! pMainWnd || ! pMainWnd->Create(320,480, WM_WINDOW_ROTATE_MODE_CW));

#ifndef _TRANZDA_VM_
// on wophone emulator, we copy resources files to Work7/NEWPLUS/TDA_DATA/Data/ folder instead of zip file
cocos2d::CCFileUtils::setResource("HelloWorld.zip");
#endif

#endif // CC_PLATFORM_WOPHONE
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE)
// MaxAksenov said it's NOT a very elegant solution. I agree, haha
CCDirector::sharedDirector()->setDeviceOrientation(kCCDeviceOrientationLandscapeLeft);
Expand Down
Binary file removed template/msvc/CCAppWiz.wophone/1033/Images/DottedHori.gif
View file
Binary file not shown.
Binary file removed template/msvc/CCAppWiz.wophone/1033/Images/DottedVert.gif
View file
Binary file not shown.
Binary file removed template/msvc/CCAppWiz.wophone/1033/Images/spacer.gif
View file
Binary file not shown.

0 comments on commit ca4f629

Please sign in to comment.