Merge branch 'master' of https://github.com/yangws/cocos2d-x into yan…

…gws-master
yoyeung · Mar 17, 2011 · 781d2a3 · 781d2a3
2 parents 68cf738 + 0384515
commit 781d2a3
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 4 deletions.
diff --git a/HelloWorld/AppDelegate.cpp b/HelloWorld/AppDelegate.cpp
@@ -30,9 +30,17 @@ bool AppDelegate::initInstance()
 #endif  // CC_PLATFORM_WIN32
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+
         // OpenGLView initialized in testsAppDelegate.mm on ios platform, nothing need to do here.
+
 #endif  // CC_PLATFORM_IOS
 
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
+        // Android doesn't need to do anything.
+
+#endif  // CC_PLATFORM_ANDROID
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)
 
         // Initialize OpenGLView instance, that release by CCDirector when application terminate.

diff --git a/cocos2dx/platform/ios/CCEGLView_ios.mm b/cocos2dx/platform/ios/CCEGLView_ios.mm
@@ -54,7 +54,8 @@ of this software and associated documentation files (the "Software"), to deal
 
     bool CCEGLView::canSetContentScaleFactor()
     {
-       return [[EAGLView sharedEGLView] respondsToSelector:@selector(setContentScaleFactor:)];
+       return [[EAGLView sharedEGLView] respondsToSelector:@selector(setContentScaleFactor:)]
+               && [[UIScreen mainScreen] scale] != 1.0;
     }
 
     void CCEGLView::setContentScaleFactor(float contentScaleFactor)

diff --git a/template/msvc/CCAppWiz.win32/Scripts/1033/default.js b/template/msvc/CCAppWiz.win32/Scripts/1033/default.js
@@ -173,8 +173,14 @@ function AddConfigurations(proj, strProjectName) {
             //             else
             //                config.CharacterSet = charSetMBCS;
 
-            config.OutputDirectory = '$(SolutionDir)$(ConfigurationName).win32'
-            config.IntermediateDirectory = '$(ConfigurationName).win32';
+            var WizardVersion = wizard.FindSymbol('WIZARD_VERSION'); 
+            if(WizardVersion >= 10.0) {
+                config.OutputDirectory = '$(SolutionDir)$(Configuration).win32'
+                config.IntermediateDirectory = '$(Configuration).win32';
+            } else {
+                config.OutputDirectory = '$(SolutionDir)$(ConfigurationName).win32'
+                config.IntermediateDirectory = '$(ConfigurationName).win32';
+            }
 
             // Compiler settings
             var CLTool = config.Tools('VCCLCompilerTool');

diff --git a/template/msvc/CCAppWiz.win32/Templates/1033/Classes/AppDelegate.cpp b/template/msvc/CCAppWiz.win32/Templates/1033/Classes/AppDelegate.cpp
@@ -27,11 +27,41 @@ bool AppDelegate::initInstance()
     bool bRet = false;
     do 
     {
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
         // Initialize OpenGLView instance, that release by CCDirector when application terminate.
         // The HelloWorld is designed as HVGA.
         CCEGLView * pMainWnd = new CCEGLView();
         CC_BREAK_IF(! pMainWnd
             || ! pMainWnd->Create(TEXT("[!output PROJECT_NAME]"), 320, 480));
+#endif  // CC_PLATFORM_WIN32
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+
+        // OpenGLView initialized in testsAppDelegate.mm on ios platform, nothing need to do here.
+
+#endif  // CC_PLATFORM_IOS
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
+        // Android doesn't need to do anything.
+
+#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.
+        // Use GetScreenWidth() and GetScreenHeight() get screen width and height.
+        CCEGLView * pMainWnd = new CCEGLView(this);
+        CC_BREAK_IF(! pMainWnd
+            || ! pMainWnd->Create(320, 480));
+
+#if !defined(_TRANZDA_VM_)
+        // set the resource zip file
+        // on wophone emulator, we copy resources files to Work7/TG3/APP/ folder instead of zip file
+        CCFileUtils::setResource("[!output PROJECT_NAME].zip");
+#endif
+
+#endif  // CC_PLATFORM_WOPHONE
 
         bRet = true;
     } while (0);

diff --git a/template/msvc/CCAppWiz.wophone/Templates/1033/Classes/AppDelegate.cpp b/template/msvc/CCAppWiz.wophone/Templates/1033/Classes/AppDelegate.cpp
@@ -27,6 +27,27 @@ bool AppDelegate::initInstance()
     bool bRet = false;
     do 
     {
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+        // Initialize OpenGLView instance, that release by CCDirector when application terminate.
+        // The HelloWorld is designed as HVGA.
+        CCEGLView * pMainWnd = new CCEGLView();
+        CC_BREAK_IF(! pMainWnd
+            || ! pMainWnd->Create(TEXT("[!output PROJECT_NAME]"), 320, 480));
+#endif  // CC_PLATFORM_WIN32
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+
+        // OpenGLView initialized in testsAppDelegate.mm on ios platform, nothing need to do here.
+
+#endif  // CC_PLATFORM_IOS
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
+        // Android doesn't need to do anything.
+
+#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.
         // Use GetScreenWidth() and GetScreenHeight() get screen width and height.
@@ -40,6 +61,8 @@ bool AppDelegate::initInstance()
         CCFileUtils::setResource("[!output PROJECT_NAME].zip");
 #endif
 
+#endif  // CC_PLATFORM_WOPHONE
+
         bRet = true;
     } while (0);
     return bRet;

diff --git a/tests/AppDelegate.cpp b/tests/AppDelegate.cpp
@@ -30,9 +30,17 @@ bool AppDelegate::initInstance()
 #endif  // CC_PLATFORM_WIN32
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+
         // OpenGLView initialized in testsAppDelegate.mm on ios platform, nothing need to do here.
+
 #endif  // CC_PLATFORM_IOS
-
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
+        // Android doesn't need to do anything.
+
+#endif  // CC_PLATFORM_ANDROID
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)
 
         // Initialize OpenGLView instance, that release by CCDirector when application terminate.