diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index 1c7755fba5..45430b7966 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -1,4 +1,4 @@ - + @@ -77,7 +77,7 @@ Disabled - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\box2d;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);$(EngineRoot)external\protocolBuf\include\win32;$(EngineRoot)external\protocolBuf\include;%(AdditionalIncludeDirectories) + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\box2d;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\protocolBuf\win32;$(EngineRoot)external\protocolBuf\src;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\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;%(PreprocessorDefinitions) false EnableFastChecks @@ -91,7 +91,8 @@ CompileAsCpp - if not exist "$(OutDir)" mkdir "$(OutDir)"xcopy /Y /Q "$(ProjectDir)..\..\external\freetype2\prebuilt\win32\*.*" "$(OutDir)" + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\freetype2\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\glfw3\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\curl\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\jpeg\prebuilt\win32\*.*" "$(OutDir)" @@ -106,10 +107,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OpenalSoft\prebuilt\*.*" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\MP3Decoder\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OggDecoder\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\debug-lib\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\debug\*.*" "$(OutDir)" - - +xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\debug-lib\*.*" "$(OutDir)" $(OutDir)$(ProjectName).dll @@ -121,7 +119,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\debug\*.*" " $(TargetDir)$(TargetName).lib MachineX86 cocos2d.def - sqlite3.lib;libcurl_imp.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;protocolbuffer.lib;%(AdditionalDependencies) + sqlite3.lib;libcurl_imp.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;%(AdditionalDependencies) @@ -134,7 +132,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\debug\*.*" " - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);$(EngineRoot)external\protocolBuf\include\win32;$(EngineRoot)external\protocolBuf\include;%(AdditionalIncludeDirectories) + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\protocolBuf\win32;$(EngineRoot)external\protocolBuf\src;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(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;%(PreprocessorDefinitions) MultiThreadedDLL @@ -164,12 +162,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OpenalSoft\prebuilt\*.*" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\MP3Decoder\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OggDecoder\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*" "$(OutDir)" - -xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\release\*.*" "$(OutDir)" - sqlite3.lib;libcurl_imp.lib;websockets.lib;protocolbuffer.lib;%(AdditionalDependencies) + sqlite3.lib;libcurl_imp.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).dll $(OutDir);%(AdditionalLibraryDirectories) LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries) @@ -207,6 +203,20 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\release\*.*" + + + + + + + + + + + + + + @@ -312,6 +322,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\release\*.*" + @@ -550,6 +561,37 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\release\*.*" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -682,6 +724,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\release\*.*" + @@ -916,6 +959,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\protocolBuf\prebuilt\win32\release\*.*" + + {929480e7-23c0-4df6-8456-096d71547116} + {b7c2a162-dec9-4418-972e-240ab3cbfcae} diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters index e98095fec0..61a544a9f3 100644 --- a/cocos/2d/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -214,6 +214,24 @@ {e916e2b4-0a6e-4d25-8b36-66fa03719f48} + + {cca5b284-43d5-4f19-8a3f-41011ca8fb78} + + + {26f61f04-86c1-42d5-b14b-d5e1ae3c5f4d} + + + {4055fd20-df3e-469e-8e5f-e49635ecaa6d} + + + {82563e1e-6992-468c-a38a-e53081557cda} + + + {95d0a465-a443-4974-ac90-ca1a46cd3066} + + + {65b452e4-00df-4ab1-803a-af3fb369edc4} + @@ -1189,12 +1207,55 @@ audioengine - - cocostudio\TimelineAction + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf cocostudio\json + + cocostudio\TimelineAction + ui\Layouts @@ -2347,12 +2408,106 @@ audioengine - - cocostudio\TimelineAction + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\io + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf\stubs + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\google\protobuf + + + external\protocolBuf\win32 cocostudio\json + + cocostudio\TimelineAction + ui\Layouts