rename winmain to main

test_uphone/tests/Box2DTest/Box2dTest.cpp

@@ -1,8 +1,5 @@
 #include "Box2dTest.h"
 #include "../testResource.h"
-// 
-// #pragma comment(lib, "libgles_cm.lib")
-// //#pragma comment(lib, "libEGL.lib")
 
 #define PTM_RATIO 32
 enum 

test_uphone/tests/Box2DTestBed/Box2dView.cpp

@@ -2,9 +2,6 @@
 #include "GLES-Render.h"
 #include "Test.h"
 
-//#pragma comment(lib, "libgles_cm.lib")
-//#pragma comment(lib, "libEGL.lib")
-
 #define kAccelerometerFrequency 30
 #define FRAMES_BETWEEN_PRESSES_FOR_DOUBLE_CLICK 10
 

test_win32/TestApplication.cpp

@@ -1,5 +1,5 @@
 #include "TestApplication.h"
-#include "winmain.h"
+#include "main.h"
 #include "tests/controller.h"
 
 using namespace cocos2d;

test_win32/main.cpp

@@ -1,4 +1,4 @@
-#include "winmain.h"
+#include "main.h"
 #include "TestApplication.h"
 
 HINSTANCE g_hInstance;

test_win32/main.h

@@ -1,5 +1,5 @@
-#ifndef __WINMAIN_H__
+#ifndef __MAIN_H__
-#define __WINMAIN_H__
+#define __MAIN_H__
 
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
 // Windows Header Files:

test_win32/test-win32.vcproj

@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libEGL.lib libgles_cm.lib libBox2d.lib"
+				AdditionalDependencies="libcocos2d.lib libgles_cm.lib libBox2d.lib"
 				OutputFile="$(OutDir)\test.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -140,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libEGL.lib libgles_cm.lib libBox2d.lib"
+				AdditionalDependencies="libcocos2d.lib libgles_cm.lib libBox2d.lib"
 				OutputFile="$(OutDir)\test.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -181,23 +181,23 @@
 			Name="include"
 			>
 			<File
-				RelativePath=".\TestApplication.h"
+				RelativePath=".\main.h"
 				>
 			</File>
 			<File
-				RelativePath=".\winmain.h"
+				RelativePath=".\TestApplication.h"
 				>
 			</File>
 		</Filter>
 		<Filter
-			Name="src"
+			Name="source"
 			>
 			<File
-				RelativePath=".\TestApplication.cpp"
+				RelativePath=".\main.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\winmain.cpp"
+				RelativePath=".\TestApplication.cpp"
 				>
 			</File>
 		</Filter>