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

issue #1191: Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.

This commit is contained in:
James Chen 2012-05-04 11:16:57 +08:00
parent 47b8148064
commit bf0da624b4
15 changed files with 152 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Box2D/proj.win32/Box2D.win32.vcxproj
View File

@ -114,11 +114,11 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

4
HelloLua/proj.win32/HelloLua.win32.vcxproj
View File

@ -18,11 +18,11 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

4
HelloWorld/proj.win32/HelloWorld.win32.vcxproj
View File

@ -19,12 +19,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

4
chipmunk/proj.win32/chipmunk.win32.vcxproj
View File

@ -18,11 +18,11 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

6
cocos2d-win32.vc2010.sln
View File

@ -18,9 +18,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\proj.win32\HelloWorld.win32.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
EndProject
Global
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
@ -62,4 +59,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
EndGlobalSection
EndGlobal

11
cocos2dx/proj.win32/cocos2d-win32.vcxproj
View File

@ -19,11 +19,11 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -172,7 +172,10 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClCompile Include="..\extensions\CCControlExtension\CCMenuPassive.cpp" />
<ClCompile Include="..\extensions\CCControlExtension\CCScale9Sprite.cpp" />
<ClCompile Include="..\extensions\CCControlExtension\CCSpacer.cpp" />
<ClCompile Include="..\extensions\CCListView\CCListView.cpp" />
<ClCompile Include="..\extensions\CCListView\CCListViewCell.cpp" />
<ClCompile Include="..\extensions\CCNotificationCenter\CCNotificationCenter.cpp" />
<ClCompile Include="..\extensions\CCTextureWatcher\CCTextureWatcher.cpp" />
<ClCompile Include="..\kazmath\src\aabb.c" />
<ClCompile Include="..\kazmath\src\GL\mat4stack.c" />
<ClCompile Include="..\kazmath\src\GL\matrix.c" />
@ -300,7 +303,11 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClInclude Include="..\extensions\CCControlExtension\CCMenuPassive.h" />
<ClInclude Include="..\extensions\CCControlExtension\CCScale9Sprite.h" />
<ClInclude Include="..\extensions\CCControlExtension\CCSpacer.h" />
<ClInclude Include="..\extensions\CCListView\CCControlDefine.h" />
<ClInclude Include="..\extensions\CCListView\CCListView.h" />
<ClInclude Include="..\extensions\CCListView\CCListViewCell.h" />
<ClInclude Include="..\extensions\CCNotificationCenter\CCNotificationCenter.h" />
<ClInclude Include="..\extensions\CCTextureWatcher\CCTextureWatcher.h" />
<ClInclude Include="..\include\ccConfig.h" />
<ClInclude Include="..\include\CCEventType.h" />
<ClInclude Include="..\include\ccMacros.h" />

27
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
View File

@ -100,6 +100,12 @@
<Filter Include="kazmath\src\GL">
<UniqueIdentifier>{9e406a70-172f-4a39-95f8-e6d6cfe5ed1f}</UniqueIdentifier>
</Filter>
<Filter Include="extensions\CCListView">
<UniqueIdentifier>{4868137d-c099-49c7-a018-d6bcf9f9205c}</UniqueIdentifier>
</Filter>
<Filter Include="extensions\CCTextureWatcher">
<UniqueIdentifier>{772b5d31-38b2-4f19-80da-4da6c37b58c2}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\effects\CCGrabber.cpp">
@ -465,6 +471,15 @@
<ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\CCCamera.cpp" />
<ClCompile Include="..\CCConfiguration.cpp" />
<ClCompile Include="..\extensions\CCTextureWatcher\CCTextureWatcher.cpp">
<Filter>extensions\CCTextureWatcher</Filter>
</ClCompile>
<ClCompile Include="..\extensions\CCListView\CCListView.cpp">
<Filter>extensions\CCListView</Filter>
</ClCompile>
<ClCompile Include="..\extensions\CCListView\CCListViewCell.cpp">
<Filter>extensions\CCListView</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\effects\CCGrabber.h">
@ -943,5 +958,17 @@
<ClInclude Include="..\CCDrawingPrimitives.h" />
<ClInclude Include="..\CCScheduler.h" />
<ClInclude Include="..\CCCamera.h" />
<ClInclude Include="..\extensions\CCTextureWatcher\CCTextureWatcher.h">
<Filter>extensions\CCTextureWatcher</Filter>
</ClInclude>
<ClInclude Include="..\extensions\CCListView\CCControlDefine.h">
<Filter>extensions\CCListView</Filter>
</ClInclude>
<ClInclude Include="..\extensions\CCListView\CCListView.h">
<Filter>extensions\CCListView</Filter>
</ClInclude>
<ClInclude Include="..\extensions\CCListView\CCListViewCell.h">
<Filter>extensions\CCListView</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
lua/proj.win32/liblua.vcxproj
View File

@ -18,12 +18,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

70
template/msvc/CCAppWiz.win32/Templates/1033/Classes/AppDelegate.cpp
View File

@ -25,76 +25,6 @@ AppDelegate::~AppDelegate()
[! endif]
}
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("cocos2d: Hello World"), 480, 320));
// set the design resolution screen size, if you want to use Design Resoulution scaled to current screen, please uncomment next line.
//pMainWnd->setDesignResolutionSize(480, 320);
#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)
// OpenGLView initialized in HelloWorld/android/jni/helloworld/main.cpp
// the default setting is to create a fullscreen view
// if you want to use auto-scale, please enable view->create(320,480) in main.cpp
// if the resources under '/sdcard" or other writeable path, set it.
// warning: the audio source should in assets/
// cocos2d::CCFileUtils::setResourcePath("/sdcard");
#endif // CC_PLATFORM_ANDROID
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE)
// MaxAksenov said it's NOT a very elegant solution. I agree, haha
CCDirector::sharedDirector()->setDeviceOrientation(kCCDeviceOrientationLandscapeLeft);
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
// 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("cocos2d: Hello World", 800, 480,480, 320));
CCFileUtils::setResourcePath("../Resource/");
#endif // CC_PLATFORM_LINUX
#if (CC_TARGET_PLATFORM == CC_PLATFORM_BADA)
CCEGLView * pMainWnd = new CCEGLView();
CC_BREAK_IF(! pMainWnd|| ! pMainWnd->Create(this, 480, 320));
pMainWnd->setDeviceOrientation(Osp::Ui::ORIENTATION_LANDSCAPE);
CCFileUtils::setResourcePath("/Res/");
#endif // CC_PLATFORM_BADA
#if (CC_TARGET_PLATFORM == CC_PLATFORM_QNX)
CCEGLView * pMainWnd = new CCEGLView();
CC_BREAK_IF(! pMainWnd|| ! pMainWnd->Create(480, 320));
CCFileUtils::setResourcePath("./app/native/Resource");
#endif // CC_PLATFORM_QNX
bRet = true;
} while (0);
return bRet;
}
bool AppDelegate::applicationDidFinishLaunching()
{
// initialize director

5
template/msvc/CCAppWiz.win32/Templates/1033/Classes/AppDelegate.h
View File

@ -14,11 +14,6 @@ public:
AppDelegate();
virtual ~AppDelegate();
/**
@brief Implement for initialize OpenGL instance, set source path, etc...
*/
virtual bool initInstance();
/**
@brief Implement CCDirector and CCScene init code here.
@return true Initialize success, app continue.

1
template/msvc/CCAppWiz.win32/Templates/1033/Resources/background.mp3.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
aec1c0a8c8068377fddca5ddd32084d8c3c3c419

2
template/msvc/CCAppWiz.win32/Templates/1033/Templates.inf
View File

@ -33,6 +33,8 @@ Resources/dog.png
Resources/hello.lua
Resources/hello2.lua
Resources/menu1.png
Resources/background.mp3
Resources/effect1.wav
[! else]
Resources/CloseSelected.png
Resources/CloseNormal.png

15
template/msvc/CCAppWiz.win32/Templates/1033/proj.win32/main.cpp
View File

@ -1,6 +1,8 @@
#include "main.h"
#include "AppDelegate.h"
#include "CCEGLView.h"
USING_NS_CC;
// uncomment below line, open debug console
// #define USE_WIN32_CONSOLE
@ -20,10 +22,15 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
freopen("CONOUT$", "w", stderr);
#endif
// create the application instance
AppDelegate app;
// create the application instance
AppDelegate app;
CCEGLView& eglView = CCEGLView::sharedOpenGLView();
eglView.setViewName("Hello World");
eglView.setFrameSize(480, 320);
// set the design resolution screen size, if you want to use Design Resoulution scaled to current screen, please uncomment next line.
// eglView.setDesignResolutionSize(480, 320);
int ret = cocos2d::CCApplication::sharedApplication().run();
int ret = CCApplication::sharedApplication().run();
#ifdef USE_WIN32_CONSOLE
FreeConsole();

26
tests/proj.win32/test.win32.vcxproj
View File

@ -19,12 +19,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -55,7 +55,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir);$(SolutionDir)chipmunk\include\chipmunk;$(SolutionDir)CocosDenshion\include;..\tests;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;$(SolutionDir)cocos2dx\kazmath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;..\tests;..\..;..\..\chipmunk\include\chipmunk;..\..\cocos2dx;..\..\cocos2dx\actions;..\..\cocos2dx\base_nodes;..\..\cocos2dx\cocoa;..\..\cocos2dx\effects;..\..\cocos2dx\include;..\..\cocos2dx\kazmath\include;..\..\cocos2dx\keypad_dispatcher;..\..\cocos2dx\label_nodes;..\..\cocos2dx\layers_scenes_transitions_nodes;..\..\cocos2dx\menu_nodes;..\..\cocos2dx\misc_nodes;..\..\cocos2dx\particle_nodes;..\..\cocos2dx\script_support;..\..\cocos2dx\shaders;..\..\cocos2dx\sprite_nodes;..\..\cocos2dx\support;..\..\cocos2dx\text_input_node;..\..\cocos2dx\textures;..\..\cocos2dx\tileMap_parallax_nodes;..\..\cocos2dx\touch_dispatcher;..\..\cocos2dx\platform;..\..\cocos2dx\platform\win32;..\..\cocos2dx\platform\third_party\win32;..\..\cocos2dx\platform\third_party\win32\OGLES;..\..\CocosDenshion\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -83,7 +83,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir);$(SolutionDir)chipmunk\include\chipmunk;$(SolutionDir)CocosDenshion\include;..\tests;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..;..\tests;..\..;..\..\chipmunk\include\chipmunk;..\..\cocos2dx;..\..\cocos2dx\actions;..\..\cocos2dx\base_nodes;..\..\cocos2dx\cocoa;..\..\cocos2dx\effects;..\..\cocos2dx\include;..\..\cocos2dx\kazmath\include;..\..\cocos2dx\keypad_dispatcher;..\..\cocos2dx\label_nodes;..\..\cocos2dx\layers_scenes_transitions_nodes;..\..\cocos2dx\menu_nodes;..\..\cocos2dx\misc_nodes;..\..\cocos2dx\particle_nodes;..\..\cocos2dx\script_support;..\..\cocos2dx\shaders;..\..\cocos2dx\sprite_nodes;..\..\cocos2dx\support;..\..\cocos2dx\text_input_node;..\..\cocos2dx\textures;..\..\cocos2dx\tileMap_parallax_nodes;..\..\cocos2dx\touch_dispatcher;..\..\cocos2dx\platform;..\..\cocos2dx\platform\win32;..\..\cocos2dx\platform\third_party\win32;..\..\cocos2dx\platform\third_party\win32\OGLES;..\..\CocosDenshion\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -126,9 +126,16 @@
<ClCompile Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.cpp" />
<ClCompile Include="..\tests\CurrentLanguageTest\CurrentLanguageTest.cpp" />
<ClCompile Include="..\tests\DirectorTest\DirectorTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest\CCControlButtonTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlColourPicker\CCControlColourPickerTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlScene.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSliderTest\CCControlSliderTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest\CCControlSwitchTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ExtensionsTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\NotificationCenterTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\NotificationCenterTest\NotificationCenterTest.cpp" />
<ClCompile Include="..\tests\FontTest\FontTest.cpp" />
<ClCompile Include="..\tests\MutiTouchTest\MutiTouchTest.cpp" />
<ClCompile Include="..\tests\NodeTest\NodeTest.cpp" />
<ClCompile Include="..\tests\ShaderTest\ShaderTest.cpp" />
<ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp" />
@ -197,9 +204,16 @@
<ClInclude Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.h" />
<ClInclude Include="..\tests\CurrentLanguageTest\CurrentLanguageTest.h" />
<ClInclude Include="..\tests\DirectorTest\DirectorTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest\CCControlButtonTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlColourPicker\CCControlColourPickerTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlScene.h" />
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.h" />
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSliderTest\CCControlSliderTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest\CCControlSwitchTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\ExtensionsTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\NotificationCenterTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\NotificationCenterTest\NotificationCenterTest.h" />
<ClInclude Include="..\tests\FontTest\FontTest.h" />
<ClInclude Include="..\tests\MutiTouchTest\MutiTouchTest.h" />
<ClInclude Include="..\tests\NodeTest\NodeTest.h" />
<ClInclude Include="..\tests\ShaderTest\ShaderTest.h" />
<ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h" />

75
tests/proj.win32/test.win32.vcxproj.filters
View File

@ -148,6 +148,27 @@
<Filter Include="classes\tests\ShaderTest">
<UniqueIdentifier>{7c1797b3-c350-4e3c-a8ff-ec9352af2008}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ExtensionsTest\ControlExtensionTest">
<UniqueIdentifier>{4e012c1e-19a4-4518-b2bd-0672243e0d1f}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ExtensionsTest\NotificationCenterTest">
<UniqueIdentifier>{b52aa727-6c0a-4b44-9302-c3fe0ecc195f}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest">
<UniqueIdentifier>{d6da1b44-b0a4-4e6b-9edb-a281f888a6f4}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ExtensionsTest\ControlExtensionTest\CCControlColourPicker">
<UniqueIdentifier>{d37f9662-a57d-4893-8d51-5013328c41dd}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ExtensionsTest\ControlExtensionTest\CCControlSliderTest">
<UniqueIdentifier>{973e1104-799d-4287-92cc-3c728f4203d0}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest">
<UniqueIdentifier>{77f02d4b-1a54-48ec-bd7a-eb2a2710f1d0}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\MutiTouchTest">
<UniqueIdentifier>{5ea85c7b-9c54-4125-8b75-cf540df9cb0e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
@ -339,9 +360,6 @@
<ClCompile Include="..\tests\ExtensionsTest\ExtensionsTest.cpp">
<Filter>classes\tests\ExtensionsTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\NotificationCenterTest.cpp">
<Filter>classes\tests\ExtensionsTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.cpp">
<Filter>classes\tests\ChipmunkAccelTouchTest</Filter>
</ClCompile>
@ -357,6 +375,30 @@
<ClCompile Include="..\tests\ShaderTest\ShaderTest.cpp">
<Filter>classes\tests\ShaderTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest\CCControlButtonTest.cpp">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlColourPicker\CCControlColourPickerTest.cpp">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlColourPicker</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSliderTest\CCControlSliderTest.cpp">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlSliderTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest\CCControlSwitchTest.cpp">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlScene.cpp">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.cpp">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ExtensionsTest\NotificationCenterTest\NotificationCenterTest.cpp">
<Filter>classes\tests\ExtensionsTest\NotificationCenterTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\MutiTouchTest\MutiTouchTest.cpp">
<Filter>classes\tests\MutiTouchTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="main.h">
@ -662,9 +704,6 @@
<ClInclude Include="..\tests\ExtensionsTest\ExtensionsTest.h">
<Filter>classes\tests\ExtensionsTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\NotificationCenterTest.h">
<Filter>classes\tests\ExtensionsTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.h">
<Filter>classes\tests\ChipmunkAccelTouchTest</Filter>
</ClInclude>
@ -680,5 +719,29 @@
<ClInclude Include="..\tests\ShaderTest\ShaderTest.h">
<Filter>classes\tests\ShaderTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest\CCControlButtonTest.h">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlButtonTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlColourPicker\CCControlColourPickerTest.h">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlColourPicker</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSliderTest\CCControlSliderTest.h">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlSliderTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest\CCControlSwitchTest.h">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.h">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\ControlExtensionTest\CCControlScene.h">
<Filter>classes\tests\ExtensionsTest\ControlExtensionTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ExtensionsTest\NotificationCenterTest\NotificationCenterTest.h">
<Filter>classes\tests\ExtensionsTest\NotificationCenterTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\MutiTouchTest\MutiTouchTest.h">
<Filter>classes\tests\MutiTouchTest</Filter>
</ClInclude>
</ItemGroup>
</Project>