From fc7de34ab0611d27c9478f62573e345f281991a5 Mon Sep 17 00:00:00 2001 From: 2youyou2 <501251991@qq.com> Date: Tue, 14 Mar 2017 16:29:40 +0800 Subject: [PATCH] fixed windows physics compile error --- native/cocos/2d/libcocos2d.vcxproj | 1685 +++++++++-------- native/cocos/2d/libcocos2d.vcxproj.filters | 30 + .../creator/CCPhysicsAABBQueryCallback.cpp | 52 + .../creator/CCPhysicsAABBQueryCallback.h | 43 +- .../creator/CCPhysicsContactListener.cpp | 107 ++ .../creator/CCPhysicsContactListener.h | 104 +- .../creator/CCPhysicsRayCastCallback.cpp | 62 + .../creator/CCPhysicsRayCastCallback.h | 57 +- .../editor-support/creator/CCPhysicsUtils.cpp | 2 +- .../editor-support/creator/CCPhysicsUtils.h | 2 - .../proj.win32/libjscocos2d.vcxproj | 427 +++-- .../proj.win32/libjscocos2d.vcxproj.filters | 602 +++--- .../proj.win32/HelloJavascript.sln | 119 +- .../proj.win32/HelloJavascript.sln | 119 +- .../runtime-src/proj.win32/simulator.sln | 128 +- 15 files changed, 1847 insertions(+), 1692 deletions(-) create mode 100644 native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.cpp create mode 100644 native/cocos/editor-support/creator/CCPhysicsContactListener.cpp create mode 100644 native/cocos/editor-support/creator/CCPhysicsRayCastCallback.cpp diff --git a/native/cocos/2d/libcocos2d.vcxproj b/native/cocos/2d/libcocos2d.vcxproj index b0fb6eca5e..d58ac7a71b 100644 --- a/native/cocos/2d/libcocos2d.vcxproj +++ b/native/cocos/2d/libcocos2d.vcxproj @@ -1,837 +1,850 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - libcocos2d - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - cocos2d-x.win32 - Win32Proj - - - - DynamicLibrary - Unicode - v120 - v120_xp - v140 - v140_xp - - - DynamicLibrary - Unicode - v120 - v120_xp - v140 - v140_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.21005.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(EngineRoot)external\win32\libs;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - ../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - - - - - Disabled - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) - WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - OldStyle - 4267;4251;4244;%(DisableSpecificWarnings) - true - CompileAsCpp - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\Debug\*.*" "$(OutDir)" - - - $(OutDir)$(ProjectName).dll - $(OutDir);%(AdditionalLibraryDirectories) - false - libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - $(TargetDir)$(TargetName).lib - MachineX86 - cocos2d.def - sqlite3.lib;libcrypto.lib;libssl.lib;libcurl.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;version.lib;libwebp.lib;%(AdditionalDependencies) - - - - - - - - - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\win32\include\zlib;$(EngineRoot)external\win32\include\freetype2;$(EngineRoot);%(AdditionalIncludeDirectories) - WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - None - 4267;4251;4244;%(DisableSpecificWarnings) - true - CompileAsCpp - false - MinSpace - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)" - - - - sqlite3.lib;libcrypto.lib;libssl.lib;libcurl.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;version.lib;libwebp.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - $(OutDir);%(AdditionalLibraryDirectories) - LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - true - true - $(TargetDir)$(TargetName).lib - MachineX86 - cocos2d.def - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + libcocos2d + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} + cocos2d-x.win32 + Win32Proj + + + + DynamicLibrary + Unicode + v120 + v120_xp + v140 + v140_xp + + + DynamicLibrary + Unicode + v120 + v120_xp + v140 + v140_xp + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + false + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + false + AllRules.ruleset + + + AllRules.ruleset + + + + + $(EngineRoot)external\win32\libs;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + ../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + + + + + Disabled + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + OldStyle + 4267;4251;4244;%(DisableSpecificWarnings) + true + CompileAsCpp + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\Debug\*.*" "$(OutDir)" + + + $(OutDir)$(ProjectName).dll + $(OutDir);%(AdditionalLibraryDirectories) + false + libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + $(TargetDir)$(TargetName).lib + MachineX86 + cocos2d.def + sqlite3.lib;libcrypto.lib;libssl.lib;libcurl.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;version.lib;libwebp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\win32\include\zlib;$(EngineRoot)external\win32\include\freetype2;$(EngineRoot);%(AdditionalIncludeDirectories) + WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + None + 4267;4251;4244;%(DisableSpecificWarnings) + true + CompileAsCpp + false + MinSpace + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)" + + + + sqlite3.lib;libcrypto.lib;libssl.lib;libcurl.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;version.lib;libwebp.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + $(OutDir);%(AdditionalLibraryDirectories) + LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + $(TargetDir)$(TargetName).lib + MachineX86 + cocos2d.def + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b7c2a162-dec9-4418-972e-240ab3cbfcae} + + + {EB7E5610-C178-49C9-8B4C-1C283E616ED9} + + + + + \ No newline at end of file diff --git a/native/cocos/2d/libcocos2d.vcxproj.filters b/native/cocos/2d/libcocos2d.vcxproj.filters index 87dd302d13..fb15f0b88f 100644 --- a/native/cocos/2d/libcocos2d.vcxproj.filters +++ b/native/cocos/2d/libcocos2d.vcxproj.filters @@ -1160,6 +1160,21 @@ creator + + creator + + + creator + + + creator + + + creator + + + creator + @@ -2208,6 +2223,21 @@ creator + + creator + + + creator + + + creator + + + creator + + + creator + diff --git a/native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.cpp b/native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.cpp new file mode 100644 index 0000000000..2ec30ba755 --- /dev/null +++ b/native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.cpp @@ -0,0 +1,52 @@ +#include "CCPhysicsAABBQueryCallback.h" + +using namespace cocos2d; + +namespace creator { + +PhysicsAABBQueryCallback::PhysicsAABBQueryCallback() +: _isPoint(false) +{ +} + +PhysicsAABBQueryCallback::PhysicsAABBQueryCallback(const b2Vec2& p) +: _isPoint(false) +{ + _point = p; +} + +PhysicsAABBQueryCallback::~PhysicsAABBQueryCallback() +{ +} + +bool PhysicsAABBQueryCallback::ReportFixture(b2Fixture* fixture) +{ + b2Body* body = fixture->GetBody(); + if (body->GetType() == b2_dynamicBody) { + if (_isPoint) { + if (fixture->TestPoint(_point)) { + _fixtures.push_back(fixture); + // We are done, terminate the query. + return false; + } + } + else { + _fixtures.push_back(fixture); + } + } + + // Continue the query. + return true; +} + +b2Fixture* PhysicsAABBQueryCallback::getFixture() +{ + return _fixtures.size() > 0 ? _fixtures[0] : nullptr; +} + +std::vector PhysicsAABBQueryCallback::getFixtures() +{ + return _fixtures; +} + +} diff --git a/native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.h b/native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.h index 8bafa4d408..6b32035071 100644 --- a/native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.h +++ b/native/cocos/editor-support/creator/CCPhysicsAABBQueryCallback.h @@ -29,46 +29,15 @@ namespace creator { class CC_DLL PhysicsAABBQueryCallback : public b2QueryCallback { public: - PhysicsAABBQueryCallback () - { - _isPoint = false; - } + PhysicsAABBQueryCallback(); + PhysicsAABBQueryCallback(const b2Vec2& p); - PhysicsAABBQueryCallback (const b2Vec2& p) - { - _point = p; - _isPoint = true; - } + ~PhysicsAABBQueryCallback(); - ~PhysicsAABBQueryCallback() {} + virtual bool ReportFixture(b2Fixture* fixture); - virtual bool ReportFixture(b2Fixture* fixture) - { - b2Body* body = fixture->GetBody(); - if (body->GetType() == b2_dynamicBody) { - if (_isPoint) { - if (fixture->TestPoint(_point)) { - _fixtures.push_back(fixture); - // We are done, terminate the query. - return false; - } - } - else { - _fixtures.push_back(fixture); - } - } - - // Continue the query. - return true; - } - - b2Fixture* getFixture () { - return _fixtures.size() > 0 ? _fixtures[0] : nullptr; - } - - std::vector getFixtures () { - return _fixtures; - } + b2Fixture* getFixture(); + std::vector getFixtures(); protected: b2Vec2 _point; diff --git a/native/cocos/editor-support/creator/CCPhysicsContactListener.cpp b/native/cocos/editor-support/creator/CCPhysicsContactListener.cpp new file mode 100644 index 0000000000..d6d6af924c --- /dev/null +++ b/native/cocos/editor-support/creator/CCPhysicsContactListener.cpp @@ -0,0 +1,107 @@ +#include "CCPhysicsContactListener.h" +#include "cocos2d.h" + +using namespace cocos2d; + +namespace creator { + +PhysicsContactListener::PhysicsContactListener() +{ +} + +PhysicsContactListener::~PhysicsContactListener() { +} + +void PhysicsContactListener::setBeginContact(std::function callback) +{ + _beginContact = callback; +} + +void PhysicsContactListener::setEndContact(std::function callback) +{ + _endContact = callback; +} + +void PhysicsContactListener::setPreSolve(std::function callback) +{ + _preSolve = callback; +} + +void PhysicsContactListener::setPostSolve(std::function callback) +{ + _postSolve = callback; +} + + +void PhysicsContactListener::BeginContact(b2Contact* contact) +{ + if (!_beginContact) return; + + b2Fixture* fixtureA = contact->GetFixtureA(); + b2Fixture* fixtureB = contact->GetFixtureB(); + + if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || + find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) + { + _beginContact(contact); + } + +} + +void PhysicsContactListener::EndContact(b2Contact* contact) +{ + if (!_endContact) return; + + b2Fixture* fixtureA = contact->GetFixtureA(); + b2Fixture* fixtureB = contact->GetFixtureB(); + + if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || + find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) + { + _endContact(contact); + } +} + +void PhysicsContactListener::PreSolve(b2Contact* contact, const b2Manifold* oldManifold) +{ + if (!_preSolve) return; + + b2Fixture* fixtureA = contact->GetFixtureA(); + b2Fixture* fixtureB = contact->GetFixtureB(); + + if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || + find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) + { + _preSolve(contact, oldManifold); + } +} + +void PhysicsContactListener::PostSolve(b2Contact* contact, const b2ContactImpulse* impulse) +{ + if (!_postSolve) return; + + b2Fixture* fixtureA = contact->GetFixtureA(); + b2Fixture* fixtureB = contact->GetFixtureB(); + + if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || + find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) + { + _postSolve(contact, impulse); + } +} + +void PhysicsContactListener::registerContactFixture(b2Fixture* fixture) +{ + _contactFixtures.push_back(fixture); +} + +void PhysicsContactListener::unregisterContactFixture(b2Fixture* fixture) +{ + auto result = find(_contactFixtures.begin(), _contactFixtures.end(), fixture); + if (result != _contactFixtures.end()) + { + _contactFixtures.erase(result); + } +} + +} diff --git a/native/cocos/editor-support/creator/CCPhysicsContactListener.h b/native/cocos/editor-support/creator/CCPhysicsContactListener.h index 807e93eb62..a3e6515628 100644 --- a/native/cocos/editor-support/creator/CCPhysicsContactListener.h +++ b/native/cocos/editor-support/creator/CCPhysicsContactListener.h @@ -25,108 +25,28 @@ #include "cocos2d.h" #include #include -#include namespace creator { class CC_DLL PhysicsContactListener : public b2ContactListener { public: - PhysicsContactListener() {} - virtual ~PhysicsContactListener() { - } + PhysicsContactListener(); + virtual ~PhysicsContactListener(); - void setBeginContact(std::function callback) - { - _beginContact = callback; - } - - void setEndContact(std::function callback) - { - _endContact = callback; - } - - void setPreSolve(std::function callback) - { - _preSolve = callback; - } - - void setPostSolve(std::function callback) - { - _postSolve = callback; - } + void setBeginContact(std::function callback); + void setEndContact(std::function callback); + void setPreSolve(std::function callback); + void setPostSolve(std::function callback); - virtual void BeginContact(b2Contact* contact) - { - if (!_beginContact) return; - - b2Fixture* fixtureA = contact->GetFixtureA(); - b2Fixture* fixtureB = contact->GetFixtureB(); - - if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end( ) || - find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end( )) - { - _beginContact(contact); - } - - } + virtual void BeginContact(b2Contact* contact); + virtual void EndContact(b2Contact* contact); + virtual void PreSolve(b2Contact* contact, const b2Manifold* oldManifold); + virtual void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse); - virtual void EndContact(b2Contact* contact) - { - if (!_endContact) return; - - b2Fixture* fixtureA = contact->GetFixtureA(); - b2Fixture* fixtureB = contact->GetFixtureB(); - - if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end( ) || - find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end( )) - { - _endContact(contact); - } - } - - virtual void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) - { - if (!_preSolve) return; - - b2Fixture* fixtureA = contact->GetFixtureA(); - b2Fixture* fixtureB = contact->GetFixtureB(); - - if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end( ) || - find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end( )) - { - _preSolve(contact, oldManifold); - } - } - - virtual void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse) - { - if (!_postSolve) return; - - b2Fixture* fixtureA = contact->GetFixtureA(); - b2Fixture* fixtureB = contact->GetFixtureB(); - - if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end( ) || - find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end( )) - { - _postSolve(contact, impulse); - } - } - - void registerContactFixture (b2Fixture* fixture) - { - _contactFixtures.push_back(fixture); - } - - void unregisterContactFixture (b2Fixture* fixture) - { - auto result = find(_contactFixtures.begin(), _contactFixtures.end(), fixture); - if ( result != _contactFixtures.end( ) ) - { - _contactFixtures.erase(result); - } - } + void registerContactFixture(b2Fixture* fixture); + void unregisterContactFixture(b2Fixture* fixture); protected: std::function _beginContact; diff --git a/native/cocos/editor-support/creator/CCPhysicsRayCastCallback.cpp b/native/cocos/editor-support/creator/CCPhysicsRayCastCallback.cpp new file mode 100644 index 0000000000..e8ec6148e4 --- /dev/null +++ b/native/cocos/editor-support/creator/CCPhysicsRayCastCallback.cpp @@ -0,0 +1,62 @@ +#include "CCPhysicsRayCastCallback.h" + +using namespace cocos2d; + +namespace creator { + +PhysicsRayCastCallback::PhysicsRayCastCallback(int type) +{ + _rayCastType = type; +} + +PhysicsRayCastCallback::~PhysicsRayCastCallback() { +} + +float32 PhysicsRayCastCallback::ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float32 fraction) +{ + if (_rayCastType == 0) { + if (_fixtures.size() > 0) { + _fixtures[0] = fixture; + _normals[0] = normal; + _points[0] = point; + } + else { + _fixtures.push_back(fixture); + _normals.push_back(normal); + _points.push_back(point); + } + + return fraction; + } + + _fixtures.push_back(fixture); + _normals.push_back(normal); + _points.push_back(point); + + if (_rayCastType == 1) { + return 0; + } + else { + return 1; + } + + return fraction; +} + +std::vector& PhysicsRayCastCallback::getFixtures() { + return _fixtures; +} + +std::vector& PhysicsRayCastCallback::getPoints() { + return _points; +} + +std::vector& PhysicsRayCastCallback::getNormals() { + return _normals; +} + +int PhysicsRayCastCallback::getType() { + return _rayCastType; +} + +} diff --git a/native/cocos/editor-support/creator/CCPhysicsRayCastCallback.h b/native/cocos/editor-support/creator/CCPhysicsRayCastCallback.h index af1e34fa4c..8d51647284 100644 --- a/native/cocos/editor-support/creator/CCPhysicsRayCastCallback.h +++ b/native/cocos/editor-support/creator/CCPhysicsRayCastCallback.h @@ -29,59 +29,16 @@ namespace creator { class CC_DLL PhysicsRayCastCallback : public b2RayCastCallback { public: - PhysicsRayCastCallback (int type) - { - _rayCastType = type; - } + PhysicsRayCastCallback(int type); + ~PhysicsRayCastCallback(); - ~PhysicsRayCastCallback() {} + virtual float32 ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float32 fraction); - virtual float32 ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float32 fraction) - { - if (_rayCastType == 0) { - if (_fixtures.size() > 0) { - _fixtures[0] = fixture; - _normals[0] = normal; - _points[0] = point; - } - else { - _fixtures.push_back(fixture); - _normals.push_back(normal); - _points.push_back(point); - } - - return fraction; - } - - _fixtures.push_back(fixture); - _normals.push_back(normal); - _points.push_back(point); - - if (_rayCastType == 1) { - return 0; - } - else { - return 1; - } - - return fraction; - } + std::vector& getFixtures(); + std::vector& getPoints(); + std::vector& getNormals(); - std::vector& getFixtures () { - return _fixtures; - } - - std::vector& getPoints () { - return _points; - } - - std::vector& getNormals () { - return _normals; - } - - int getType () { - return _rayCastType; - } + int getType(); protected: int _rayCastType; diff --git a/native/cocos/editor-support/creator/CCPhysicsUtils.cpp b/native/cocos/editor-support/creator/CCPhysicsUtils.cpp index 0f0a507664..b9adf5bae4 100644 --- a/native/cocos/editor-support/creator/CCPhysicsUtils.cpp +++ b/native/cocos/editor-support/creator/CCPhysicsUtils.cpp @@ -12,7 +12,7 @@ using namespace cocos2d; namespace creator { -b2WorldManifold PhysicsUtils::_worldManifold; +static b2WorldManifold _worldManifold; PhysicsUtils::PhysicsUtils() : PTM_RATIO(32) diff --git a/native/cocos/editor-support/creator/CCPhysicsUtils.h b/native/cocos/editor-support/creator/CCPhysicsUtils.h index 2e21418a4f..5621f5177f 100644 --- a/native/cocos/editor-support/creator/CCPhysicsUtils.h +++ b/native/cocos/editor-support/creator/CCPhysicsUtils.h @@ -50,8 +50,6 @@ protected: std::vector _bodies; float PTM_RATIO; - - static b2WorldManifold _worldManifold; }; } diff --git a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj index e1ffc49c46..fbdc25e641 100644 --- a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj +++ b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj @@ -1,210 +1,219 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {6b494955-1e66-40da-830d-0d31b8d301ef} - false - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - - - {39379840-825A-45A0-B363-C09FFEF864BD} - Win32Proj - libjscocos2d - - - - StaticLibrary - true - Unicode - v120 - v120_xp - v140 - v140_xp - - - StaticLibrary - false - Unicode - v120 - v120_xp - v140 - v140_xp - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - - - $(Configuration).win32\$(ProjectName)\ - - - $(SolutionDir)$(Configuration).win32\ - - - $(Configuration).win32\$(ProjectName)\ - - - - - - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions) - $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;%(AdditionalIncludeDirectories) - 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) - true - false - ProgramDatabase - - - Windows - true - - - - - - - - - Level3 - - - MinSpace - true - true - WIN32;_WINDOWS;NDEBUG;_LIB;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions) - $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;%(AdditionalIncludeDirectories) - 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) - true - None - - - Windows - true - true - true - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + + {6b494955-1e66-40da-830d-0d31b8d301ef} + false + + + {b7c2a162-dec9-4418-972e-240ab3cbfcae} + + + {EB7E5610-C178-49C9-8B4C-1C283E616ED9} + + + + {39379840-825A-45A0-B363-C09FFEF864BD} + Win32Proj + libjscocos2d + + + + StaticLibrary + true + Unicode + v120 + v120_xp + v140 + v140_xp + + + StaticLibrary + false + Unicode + v120 + v120_xp + v140 + v140_xp + + + + + + + + + + + + + + + $(SolutionDir)$(Configuration).win32\ + + + $(Configuration).win32\$(ProjectName)\ + + + $(SolutionDir)$(Configuration).win32\ + + + $(Configuration).win32\$(ProjectName)\ + + + + + + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions) + $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;%(AdditionalIncludeDirectories) + 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) + true + false + ProgramDatabase + + + Windows + true + + + + + + + + + Level3 + + + MinSpace + true + true + WIN32;_WINDOWS;NDEBUG;_LIB;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions) + $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;%(AdditionalIncludeDirectories) + 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) + true + None + + + Windows + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters index 76dc53892c..0cceb198fd 100644 --- a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters +++ b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters @@ -1,293 +1,311 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {1a494d10-c2d0-498c-8b80-2f45fee36640} - - - {af265b68-4f27-4561-b7ab-299f21212e08} - - - {f4329991-ce95-4f10-9442-92d63bd6aea1} - - - {3248ad6e-d03d-4cce-8846-81aa376fc480} - - - {7b278f66-4153-44d8-ba60-d7b7feed8a17} - - - {59756149-2598-457f-ae42-ad675d5f3783} - - - {db4d6533-8c6a-4a18-bdd6-c9b98b897458} - - - {5fc8adbd-1cb4-4aed-8dbd-bbcc6d1681ab} - - - {36372247-74fd-4169-8120-06c8c0596530} - - - - - auto - - - auto - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - auto - - - auto - - - auto - - - auto - - - auto - - - manual\cocosbuilder - - - manual\cocostudio - - - manual\extension - - - manual\localstorage - - - manual\localstorage - - - manual\network - - - manual\network - - - manual\network - - - manual\spine - - - manual\ui - - - manual\cocostudio - - - manual - - - auto - - - manual - - - manual\chipmunk - - - manual\chipmunk - - - manual - - - manual - - - auto - - - manual\dragonbones - - - manual\network - - - auto - - - - - auto - - - auto - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - auto - - - auto - - - auto - - - auto - - - auto - - - manual\cocosbuilder - - - manual\cocosbuilder - - - manual\cocostudio - - - manual\extension - - - manual\localstorage - - - manual\localstorage - - - manual\localstorage - - - manual\network - - - manual\network - - - manual\network - - - manual\spine - - - manual\ui - - - manual\cocostudio - - - auto - - - auto - - - manual - - - auto - - - auto - - - auto - - - auto - - - manual\chipmunk - - - manual\chipmunk - - - auto - - - manual\dragonbones - - - manual\network - - - auto - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {1a494d10-c2d0-498c-8b80-2f45fee36640} + + + {af265b68-4f27-4561-b7ab-299f21212e08} + + + {f4329991-ce95-4f10-9442-92d63bd6aea1} + + + {3248ad6e-d03d-4cce-8846-81aa376fc480} + + + {7b278f66-4153-44d8-ba60-d7b7feed8a17} + + + {59756149-2598-457f-ae42-ad675d5f3783} + + + {db4d6533-8c6a-4a18-bdd6-c9b98b897458} + + + {5fc8adbd-1cb4-4aed-8dbd-bbcc6d1681ab} + + + {36372247-74fd-4169-8120-06c8c0596530} + + + + + auto + + + auto + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + auto + + + auto + + + auto + + + auto + + + auto + + + manual\cocosbuilder + + + manual\cocostudio + + + manual\extension + + + manual\localstorage + + + manual\localstorage + + + manual\network + + + manual\network + + + manual\network + + + manual\spine + + + manual\ui + + + manual\cocostudio + + + manual + + + auto + + + manual + + + manual\chipmunk + + + manual\chipmunk + + + manual + + + manual + + + auto + + + manual\dragonbones + + + manual\network + + + auto + + + auto + + + manual + + + manual + + + + + auto + + + auto + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + auto + + + auto + + + auto + + + auto + + + auto + + + manual\cocosbuilder + + + manual\cocosbuilder + + + manual\cocostudio + + + manual\extension + + + manual\localstorage + + + manual\localstorage + + + manual\localstorage + + + manual\network + + + manual\network + + + manual\network + + + manual\spine + + + manual\ui + + + manual\cocostudio + + + auto + + + auto + + + manual + + + auto + + + auto + + + auto + + + auto + + + manual\chipmunk + + + manual\chipmunk + + + auto + + + manual\dragonbones + + + manual\network + + + auto + + + auto + + + manual + + + manual + + \ No newline at end of file diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln index 4e7987db7a..3f311e8696 100644 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln @@ -1,56 +1,63 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloJavascript", "HelloJavascript.vcxproj", "{3B0B58B1-2734-488E-A542-ECEC11EB2455}" - ProjectSection(ProjectDependencies) = postProject - {39379840-825A-45A0-B363-C09FFEF864BD} = {39379840-825A-45A0-B363-C09FFEF864BD} - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{8C6B0381-B325-4D7F-B1BB-474ABACE46AC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\..\cocos2d-x\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDragonBones", "..\..\cocos2d-x\cocos\editor-support\dragonbones\proj.win32\libDragonBones.vcxproj", "{6B494955-1E66-40DA-830D-0D31B8D301EF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.ActiveCfg = Debug|Win32 - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.Build.0 = Debug|Win32 - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.ActiveCfg = Release|Win32 - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.Build.0 = Debug|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.ActiveCfg = Release|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} - {6B494955-1E66-40DA-830D-0D31B8D301EF} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloJavascript", "HelloJavascript.vcxproj", "{3B0B58B1-2734-488E-A542-ECEC11EB2455}" + ProjectSection(ProjectDependencies) = postProject + {39379840-825A-45A0-B363-C09FFEF864BD} = {39379840-825A-45A0-B363-C09FFEF864BD} + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{8C6B0381-B325-4D7F-B1BB-474ABACE46AC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\..\cocos2d-x\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDragonBones", "..\..\cocos2d-x\cocos\editor-support\dragonbones\proj.win32\libDragonBones.vcxproj", "{6B494955-1E66-40DA-830D-0D31B8D301EF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\..\cocos2d-x\external\sources\Box2D\proj.win32\libBox2D.vcxproj", "{EB7E5610-C178-49C9-8B4C-1C283E616ED9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.Build.0 = Debug|Win32 + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.ActiveCfg = Release|Win32 + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.Build.0 = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.Build.0 = Debug|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.ActiveCfg = Release|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.Build.0 = Release|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Debug|Win32.ActiveCfg = Debug|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Debug|Win32.Build.0 = Debug|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Release|Win32.ActiveCfg = Release|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} + {6B494955-1E66-40DA-830D-0D31B8D301EF} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} + {EB7E5610-C178-49C9-8B4C-1C283E616ED9} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} + EndGlobalSection +EndGlobal diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.win32/HelloJavascript.sln b/native/templates/js-template-link/frameworks/runtime-src/proj.win32/HelloJavascript.sln index 8d0d0d189c..81ec29ff77 100644 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.win32/HelloJavascript.sln +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.win32/HelloJavascript.sln @@ -1,56 +1,63 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloJavascript", "HelloJavascript.vcxproj", "{3B0B58B1-2734-488E-A542-ECEC11EB2455}" - ProjectSection(ProjectDependencies) = postProject - {39379840-825A-45A0-B363-C09FFEF864BD} = {39379840-825A-45A0-B363-C09FFEF864BD} - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{8C6B0381-B325-4D7F-B1BB-474ABACE46AC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "$(COCOS_X_ROOT)\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "$(COCOS_X_ROOT)\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "$(COCOS_X_ROOT)\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDragonBones", "$(COCOS_X_ROOT)\cocos\editor-support\dragonbones\proj.win32\libDragonBones.vcxproj", "{6B494955-1E66-40DA-830D-0D31B8D301EF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.ActiveCfg = Debug|Win32 - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.Build.0 = Debug|Win32 - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.ActiveCfg = Release|Win32 - {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.Build.0 = Debug|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.ActiveCfg = Release|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} - {6B494955-1E66-40DA-830D-0D31B8D301EF} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloJavascript", "HelloJavascript.vcxproj", "{3B0B58B1-2734-488E-A542-ECEC11EB2455}" + ProjectSection(ProjectDependencies) = postProject + {39379840-825A-45A0-B363-C09FFEF864BD} = {39379840-825A-45A0-B363-C09FFEF864BD} + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{8C6B0381-B325-4D7F-B1BB-474ABACE46AC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "$(COCOS_X_ROOT)\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "$(COCOS_X_ROOT)\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "$(COCOS_X_ROOT)\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDragonBones", "$(COCOS_X_ROOT)\cocos\editor-support\dragonbones\proj.win32\libDragonBones.vcxproj", "{6B494955-1E66-40DA-830D-0D31B8D301EF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "$(COCOS_X_ROOT)\external\sources\Box2D\proj.win32\libBox2D.vcxproj", "{EB7E5610-C178-49C9-8B4C-1C283E616ED9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Debug|Win32.Build.0 = Debug|Win32 + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.ActiveCfg = Release|Win32 + {3B0B58B1-2734-488E-A542-ECEC11EB2455}.Release|Win32.Build.0 = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.Build.0 = Debug|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.ActiveCfg = Release|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.Build.0 = Release|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Debug|Win32.ActiveCfg = Debug|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Debug|Win32.Build.0 = Debug|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Release|Win32.ActiveCfg = Release|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} + {6B494955-1E66-40DA-830D-0D31B8D301EF} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} + {EB7E5610-C178-49C9-8B4C-1C283E616ED9} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} + EndGlobalSection +EndGlobal diff --git a/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.sln b/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.sln index b86921e12b..28dc5eab64 100755 --- a/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.sln +++ b/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.sln @@ -1,61 +1,67 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simulator", "simulator.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" - ProjectSection(ProjectDependencies) = postProject - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\..\..\..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" - ProjectSection(ProjectDependencies) = postProject - {6B494955-1E66-40DA-830D-0D31B8D301EF} = {6B494955-1E66-40DA-830D-0D31B8D301EF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsimulator", "..\..\..\libsimulator\proj.win32\libsimulator.vcxproj", "{001B324A-BB91-4E83-875C-C92F75C40857}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\..\..\..\..\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" - ProjectSection(ProjectDependencies) = postProject - {6B494955-1E66-40DA-830D-0D31B8D301EF} = {6B494955-1E66-40DA-830D-0D31B8D301EF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDragonBones", "..\..\..\..\..\cocos\editor-support\dragonbones\proj.win32\libDragonBones.vcxproj", "{6B494955-1E66-40DA-830D-0D31B8D301EF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {001B324A-BB91-4E83-875C-C92F75C40857}.Debug|Win32.ActiveCfg = Debug|Win32 - {001B324A-BB91-4E83-875C-C92F75C40857}.Debug|Win32.Build.0 = Debug|Win32 - {001B324A-BB91-4E83-875C-C92F75C40857}.Release|Win32.ActiveCfg = Release|Win32 - {001B324A-BB91-4E83-875C-C92F75C40857}.Release|Win32.Build.0 = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.Build.0 = Debug|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.ActiveCfg = Release|Win32 - {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simulator", "simulator.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" + ProjectSection(ProjectDependencies) = postProject + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\..\..\..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" + ProjectSection(ProjectDependencies) = postProject + {6B494955-1E66-40DA-830D-0D31B8D301EF} = {6B494955-1E66-40DA-830D-0D31B8D301EF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsimulator", "..\..\..\libsimulator\proj.win32\libsimulator.vcxproj", "{001B324A-BB91-4E83-875C-C92F75C40857}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\..\..\..\..\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" + ProjectSection(ProjectDependencies) = postProject + {6B494955-1E66-40DA-830D-0D31B8D301EF} = {6B494955-1E66-40DA-830D-0D31B8D301EF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDragonBones", "..\..\..\..\..\cocos\editor-support\dragonbones\proj.win32\libDragonBones.vcxproj", "{6B494955-1E66-40DA-830D-0D31B8D301EF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\..\..\..\..\external\sources\Box2D\proj.win32\libBox2D.vcxproj", "{EB7E5610-C178-49C9-8B4C-1C283E616ED9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 + {001B324A-BB91-4E83-875C-C92F75C40857}.Debug|Win32.ActiveCfg = Debug|Win32 + {001B324A-BB91-4E83-875C-C92F75C40857}.Debug|Win32.Build.0 = Debug|Win32 + {001B324A-BB91-4E83-875C-C92F75C40857}.Release|Win32.ActiveCfg = Release|Win32 + {001B324A-BB91-4E83-875C-C92F75C40857}.Release|Win32.Build.0 = Release|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 + {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Debug|Win32.Build.0 = Debug|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.ActiveCfg = Release|Win32 + {6B494955-1E66-40DA-830D-0D31B8D301EF}.Release|Win32.Build.0 = Release|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Debug|Win32.ActiveCfg = Debug|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Debug|Win32.Build.0 = Debug|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Release|Win32.ActiveCfg = Release|Win32 + {EB7E5610-C178-49C9-8B4C-1C283E616ED9}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal