issue #176 add test code in test_win32, which same with test_uphone .

yangws · yangws · commit 040f68160acd · 2010-10-12T09:15:44.000Z
diff --git a/Box2D/Box2D-win32.vcproj b/Box2D/Box2D-win32.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="Box2D-win32"
 	ProjectGUID="{929480E7-23C0-4DF6-8456-096D71547116}"
+	RootNamespace="Box2D-win32"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="0"
 	>
@@ -61,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libBox2D.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -121,6 +123,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libBox2D.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/Helloworld-win32/Helloworld-win32.cpp b/Helloworld-win32/Helloworld-win32.cpp
@@ -4,7 +4,6 @@
 #include "stdafx.h"
 #include "Helloworld-win32.h"
 
-#include "cocos2d.h"
 using namespace cocos2d;
 
 #define IMG_PATH        "HelloWorld.png"
diff --git a/Helloworld-win32/Helloworld-win32.h b/Helloworld-win32/Helloworld-win32.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "CCXApplication.h"
-#include "CCXEGLView.h"
+#include "cocos2d.h"
 
 class HelloWorldApplication : public cocos2d::CCXApplication
 {
diff --git a/Helloworld-win32/Helloworld-win32.vcproj b/Helloworld-win32/Helloworld-win32.vcproj
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\HelloWorld.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -136,6 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\HelloWorld.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
diff --git a/chipmunk/chipmunk-win32.vcproj b/chipmunk/chipmunk-win32.vcproj
@@ -64,6 +64,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libchipmunk.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -127,6 +128,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libchipmunk.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/cocos2dx-win32.sln b/cocos2dx-win32.sln
@@ -13,6 +13,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D-win32", "Box2D\Box2D-win32.vcproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-win32", "test_win32\test-win32.vcproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+		{929480E7-23C0-4DF6-8456-096D71547116} = {929480E7-23C0-4DF6-8456-096D71547116}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cocos2dx/CCConfiguration.cpp b/cocos2dx/CCConfiguration.cpp
@@ -30,7 +30,8 @@ using namespace std;
 namespace   cocos2d {
 
 // singleton stuff
-static CCConfiguration *g_pSharedConfiguration;
+static bool g_bInited;
+static CCConfiguration g_SharedConfiguration;
 static char *g_pGlExtensions;
 
 CCConfiguration::CCConfiguration(void)
@@ -79,13 +80,12 @@ bool CCConfiguration::init(void)
 
 CCConfiguration* CCConfiguration::sharedConfiguration(void)
 {
-	if (! g_pSharedConfiguration)
+	if (! g_bInited)
 	{
-		g_pSharedConfiguration = new CCConfiguration();
-		g_pSharedConfiguration->init();
+		g_SharedConfiguration.init();
 	}
 
-	return g_pSharedConfiguration;
+	return &g_SharedConfiguration;
 }
 
 bool CCConfiguration::checkForGLExtension(const string &searchName)
diff --git a/cocos2dx/CCDirector.cpp b/cocos2dx/CCDirector.cpp
@@ -159,10 +159,6 @@ CCDirector::~CCDirector(void)
 	CCX_SAFE_RELEASE(m_pRunningScene);
 	CCX_SAFE_RELEASE(m_pobScenesStack);
 
-    // delete configuration pointer
-    CCConfiguration *conf = CCConfiguration::sharedConfiguration();
-    CCX_SAFE_RELEASE(conf);
-
 	// pop the autorelease pool
 	NSPoolManager::getInstance()->pop();
 
diff --git a/cocos2dx/cocos2dx-win32.vcproj b/cocos2dx/cocos2dx-win32.vcproj
@@ -64,12 +64,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libEGL.lib libgles_cm.lib libxml2.lib zlib.lib libpng14-imp.lib libjpeg.lib"
+				OutputFile="$(OutDir)\libcocos2d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=".\platform\win32\third_party\OGLES\WindowsPC\Lib;d:/Work7/PRJ_TG3/LIB/Win32Lib;D:\Work7\PRJ_TG3\Common\SoftSupport"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="MSVCRT.lib;LIBCMTD.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				ImportLibrary="$(TargetDir)libcocos2d.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -140,12 +142,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libEGL.lib libgles_cm.lib libxml2.lib zlib.lib libpng14-imp.lib libjpeg.lib"
+				OutputFile="$(OutDir)\libcocos2d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=".\platform\win32\third_party\OGLES\WindowsPC\Lib;d:/Work7/PRJ_TG3/LIB/Win32Lib;D:\Work7\PRJ_TG3\Common\SoftSupport"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)libcocos2d.lib"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/output.bat b/output.bat
@@ -0,0 +1,13 @@
+@echo off
+
+REM export source code from dir %1 to dir %2
+
+IF NOT DEFINED OUTPUT_BY_SVN GOTO AFTER_OUTPUT_BY_SVN
+    svn export -r BASE --force %1 %2
+    GOTO FILE_RETURN
+:AFTER_OUTPUT_BY_SVN
+
+IF NOT EXIST %2 MD %2
+COPY /Y %1\*.* %2
+
+:FILE_RETURN
diff --git a/test_win32/TestApplication.cpp b/test_win32/TestApplication.cpp
@@ -0,0 +1,42 @@
+#include "TestApplication.h"
+#include "winmain.h"
+#include "tests/controller.h"
+
+using namespace cocos2d;
+
+//////////////////////////////////////////////////////////////////////////
+// implement TestApplication
+//////////////////////////////////////////////////////////////////////////
+
+bool TestApplication::InitInstance()
+{
+	return m_MainForm.Create(L"Cocos2dx-Win32", 480, 320);
+}
+
+bool TestApplication::initCocos2d()
+{
+	// init director
+	CCDirector * pDirector = CCDirector::getSharedDirector();
+	pDirector->setOpenGLView(&m_MainForm);
+
+	pDirector->setDisplayFPS(true);
+
+	CCScene * pScene = CCScene::node();
+	CCLayer * pLayer = new TestController();
+	pLayer->autorelease();
+
+	pScene->addChild(pLayer);
+	pDirector->replaceScene(pScene);
+
+	return true;
+}
+
+void TestApplication::applicationDidEnterBackground()
+{
+	CCDirector::getSharedDirector()->stopAnimation();
+}
+
+void TestApplication::applicationWillEnterForeground()
+{
+	CCDirector::getSharedDirector()->startAnimation();
+}
diff --git a/test_win32/TestApplication.h b/test_win32/TestApplication.h
@@ -0,0 +1,19 @@
+#ifndef __TEST_APPLICATION_H__
+#define __TEST_APPLICATION_H__
+
+#include "cocos2d.h"
+
+class TestApplication : public cocos2d::CCXApplication
+{
+public:
+	virtual bool initCocos2d();
+	virtual bool InitInstance();
+
+	virtual void applicationDidEnterBackground();
+	virtual void applicationWillEnterForeground();
+
+protected:
+	cocos2d::CCXEGLView m_MainForm;
+};
+
+#endif	// __TEST_APPLICATION_H__
diff --git a/test_win32/application.cpp b/test_win32/application.cpp
diff --git a/test_win32/application.h b/test_win32/application.h
diff --git a/test_win32/copy_res.bat b/test_win32/copy_res.bat
@@ -0,0 +1,4 @@
+echo off
+set OUTPUT_BY_SVN=1
+set TOOLSDIR=..
+call %TOOLSDIR%\output.bat %CD%\Res %1
diff --git a/test_win32/test-win32.vcproj b/test_win32/test-win32.vcproj
diff --git a/test_win32/winmain.cpp b/test_win32/winmain.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include "CCXApplication.h"`
`4`		`-#include "CCXEGLView.h"`
	`3`	`+#include "cocos2d.h"`
`5`	`4`
`6`	`5`	`class HelloWorldApplication : public cocos2d::CCXApplication`
`7`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ using namespace std;`
`30`	`30`	`namespace cocos2d {`
`31`	`31`
`32`	`32`	`// singleton stuff`
`33`		`-static CCConfiguration *g_pSharedConfiguration;`
	`33`	`+static bool g_bInited;`
	`34`	`+static CCConfiguration g_SharedConfiguration;`
`34`	`35`	`static char *g_pGlExtensions;`
`35`	`36`
`36`	`37`	`CCConfiguration::CCConfiguration(void)`
`@@ -79,13 +80,12 @@ bool CCConfiguration::init(void)`
`79`	`80`
`80`	`81`	`CCConfiguration* CCConfiguration::sharedConfiguration(void)`
`81`	`82`	`{`
`82`		`- if (! g_pSharedConfiguration)`
	`83`	`+ if (! g_bInited)`
`83`	`84`	`{`
`84`		`- g_pSharedConfiguration = new CCConfiguration();`
`85`		`- g_pSharedConfiguration->init();`
	`85`	`+ g_SharedConfiguration.init();`
`86`	`86`	`}`
`87`	`87`
`88`		`- return g_pSharedConfiguration;`
	`88`	`+ return &g_SharedConfiguration;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`bool CCConfiguration::checkForGLExtension(const string &searchName)`