diff --git a/CMakeLists.txt b/CMakeLists.txt index 7add2e3647..134bea9d72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,10 +383,6 @@ endif(BUILD_LUA_LIBS) ## JS if(BUILD_JS_LIBS) - link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/external/spidermonkey/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR} - ) - add_subdirectory(cocos/scripting/js-bindings) # build js tests diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 0fb83be6c1..7b6792f705 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -843,6 +843,21 @@ 3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; }; 3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */; }; + 4B5C5BA81CA1147300D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; }; + 4B5C5BA91CA1147F00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; }; + 4B5C5BAB1CA1149900D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BAC1CA114A300D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BAD1CA114AC00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BAE1CA114B500D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BAF1CA114BB00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BB01CA114C100D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BB11CA114C700D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BB21CA114CC00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BB31CA114D400D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; }; + 4B5C5BB51CA114DB00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BB41CA114DB00D55A14 /* Security.framework */; }; + 4B5C5BB61CA114E100D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BB41CA114DB00D55A14 /* Security.framework */; }; + 4B5C5BB71CA114E700D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BB41CA114DB00D55A14 /* Security.framework */; }; + 4B5C5BB81CA114EE00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BB41CA114DB00D55A14 /* Security.framework */; }; 5046AB4A1AF2A8D80060550B /* MaterialSystemTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5046AB481AF2A8D80060550B /* MaterialSystemTest.cpp */; }; 5046AB4B1AF2A8D80060550B /* MaterialSystemTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5046AB481AF2A8D80060550B /* MaterialSystemTest.cpp */; }; 5046AB5B1AF2C4180060550B /* Materials in Resources */ = {isa = PBXBuildFile; fileRef = 5046AB5A1AF2C4180060550B /* Materials */; }; @@ -2605,6 +2620,8 @@ 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoPlayerTest.cpp; sourceTree = ""; }; 3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayerTest.h; sourceTree = ""; }; 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = ""; }; + 4B5C5BAA1CA1149900D55A14 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; + 4B5C5BB41CA114DB00D55A14 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 5046AB481AF2A8D80060550B /* MaterialSystemTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MaterialSystemTest.cpp; sourceTree = ""; }; 5046AB491AF2A8D80060550B /* MaterialSystemTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaterialSystemTest.h; sourceTree = ""; }; 5046AB5A1AF2C4180060550B /* Materials */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Materials; path = "../tests/cpp-tests/Resources/Materials"; sourceTree = ""; }; @@ -2798,6 +2815,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB01CA114C100D55A14 /* Security.framework in Frameworks */, 15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */, 15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */, 15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */, @@ -2820,12 +2838,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 185663581B4155D3009EF2AE /* Security.framework in Frameworks */, 185664951B4246C9009EF2AE /* libsqlite3.dylib in Frameworks */, 185664941B4246BA009EF2AE /* AppKit.framework in Frameworks */, 185664931B424694009EF2AE /* Cocoa.framework in Frameworks */, 185663F31B415706009EF2AE /* libcurl.dylib in Frameworks */, 185663EF1B415681009EF2AE /* libjscocos2d Mac.a in Frameworks */, - 185663581B4155D3009EF2AE /* Security.framework in Frameworks */, ED545A711B68A19000C3958E /* libiconv.dylib in Frameworks */, 1856635A1B4155D3009EF2AE /* libcocos2d Mac.a in Frameworks */, 1856635B1B4155D3009EF2AE /* libz.dylib in Frameworks */, @@ -2843,6 +2861,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB11CA114C700D55A14 /* Security.framework in Frameworks */, 18FC4D5F1B4257CD00B76F95 /* libsqlite3.dylib in Frameworks */, 185663F01B41569E009EF2AE /* libjscocos2d iOS.a in Frameworks */, 185663A51B4155DD009EF2AE /* Security.framework in Frameworks */, @@ -2866,6 +2885,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BA81CA1147300D55A14 /* Security.framework in Frameworks */, 1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */, 1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */, ED545A6E1B68A18B00C3958E /* libiconv.dylib in Frameworks */, @@ -2884,6 +2904,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BA91CA1147F00D55A14 /* Security.framework in Frameworks */, 15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */, 15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */, 1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */, @@ -2903,6 +2924,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BAC1CA114A300D55A14 /* Security.framework in Frameworks */, 1A0EE40318CDF775004CD58F /* libcocos2d iOS.a in Frameworks */, 1A0EE40618CDF775004CD58F /* CoreMotion.framework in Frameworks */, 1A0EE40718CDF775004CD58F /* libz.dylib in Frameworks */, @@ -2922,6 +2944,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BAE1CA114B500D55A14 /* Security.framework in Frameworks */, ED545A761B68A1B600C3958E /* libiconv.dylib in Frameworks */, 15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */, 15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */, @@ -2963,6 +2986,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BAD1CA114AC00D55A14 /* Security.framework in Frameworks */, 52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */, 15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */, 15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */, @@ -3004,6 +3028,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BAF1CA114BB00D55A14 /* Security.framework in Frameworks */, 3E61773D1960FBD200DE83F5 /* GameController.framework in Frameworks */, 3E6177221960FAED00DE83F5 /* libcocos2d iOS.a in Frameworks */, 3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */, @@ -3024,6 +3049,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB51CA114DB00D55A14 /* Security.framework in Frameworks */, 507B42121C31C1710067B53E /* libcocos2d tvOS.a in Frameworks */, 507B41FC1C31BEA60067B53E /* libiconv.dylib in Frameworks */, 507B41FD1C31BEA60067B53E /* Security.framework in Frameworks */, @@ -3045,6 +3071,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB61CA114E100D55A14 /* Security.framework in Frameworks */, 507B42B91C31EC6A0067B53E /* libcocos2d tvOS.a in Frameworks */, 507B42BA1C31EC6A0067B53E /* libjscocos2d tvOS.a in Frameworks */, 507B428D1C31E6070067B53E /* libsqlite3.dylib in Frameworks */, @@ -3068,6 +3095,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB71CA114E700D55A14 /* Security.framework in Frameworks */, 507B43BF1C31FB920067B53E /* libcocos2d tvOS.a in Frameworks */, 507B43C01C31FB920067B53E /* libluacocos2d tvOS.a in Frameworks */, 507B43701C31FB670067B53E /* Security.framework in Frameworks */, @@ -3090,6 +3118,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB81CA114EE00D55A14 /* Security.framework in Frameworks */, 507B43F61C3201780067B53E /* libcocos2d tvOS.a in Frameworks */, 507B43E21C3201360067B53E /* GameController.framework in Frameworks */, 507B43E41C3201360067B53E /* CoreMotion.framework in Frameworks */, @@ -3133,6 +3162,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB21CA114CC00D55A14 /* Security.framework in Frameworks */, 50FC18C31C33725200DD15A3 /* libsqlite3.dylib in Frameworks */, 50FC18C41C33725200DD15A3 /* libjscocos2d iOS.a in Frameworks */, 50FC18C51C33725200DD15A3 /* Security.framework in Frameworks */, @@ -3156,6 +3186,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BAB1CA1149900D55A14 /* Security.framework in Frameworks */, ED545A731B68A1AC00C3958E /* libiconv.dylib in Frameworks */, 52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */, 3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */, @@ -3177,6 +3208,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4B5C5BB31CA114D400D55A14 /* Security.framework in Frameworks */, FA94B0A31B8EF69A0074B261 /* libiconv.dylib in Frameworks */, FA94B0A41B8EF69A0074B261 /* Security.framework in Frameworks */, FA94B0A51B8EF69A0074B261 /* MediaPlayer.framework in Frameworks */, @@ -5048,6 +5080,8 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 4B5C5BB41CA114DB00D55A14 /* Security.framework */, + 4B5C5BAA1CA1149900D55A14 /* Security.framework */, ED545A721B68A1AC00C3958E /* libiconv.dylib */, ED545A6C1B68A18300C3958E /* libiconv.dylib */, 18FC4D5E1B4257CD00B76F95 /* libsqlite3.dylib */, @@ -8160,7 +8194,7 @@ PRODUCT_NAME = "lua-game-controller-test iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../cocos/base"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -8193,7 +8227,7 @@ PRODUCT_NAME = "lua-game-controller-test iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../cocos/base"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -8227,7 +8261,7 @@ ); PRODUCT_NAME = "js-tests Mac"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external"; }; name = Debug; }; @@ -8259,7 +8293,7 @@ ); PRODUCT_NAME = "js-tests Mac"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8290,7 +8324,7 @@ SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external $(inherited) $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -8322,7 +8356,7 @@ SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external $(inherited) $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -8338,7 +8372,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -8352,7 +8386,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8372,7 +8406,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; }; name = Debug; }; @@ -8391,7 +8425,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8409,7 +8443,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -8427,7 +8461,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -8456,7 +8490,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -8484,7 +8518,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -8505,7 +8539,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; }; name = Debug; }; @@ -8524,7 +8558,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8552,7 +8586,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -8580,7 +8614,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -8598,7 +8632,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -8614,7 +8648,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8634,7 +8668,7 @@ PRODUCT_NAME = "game-controller-test IOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -8654,7 +8688,7 @@ PRODUCT_NAME = "game-controller-test IOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -8678,7 +8712,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 9.1; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -8700,7 +8734,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 9.1; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8724,7 +8758,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = appletvos; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external $(inherited) $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -8748,7 +8782,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = appletvos; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external $(inherited) $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8783,7 +8817,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -8803,7 +8837,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8819,7 +8853,7 @@ INFOPLIST_FILE = "$(SRCROOT)/../tests/game-controller-test/proj.ios/Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -8834,7 +8868,7 @@ INFOPLIST_FILE = "$(SRCROOT)/../tests/game-controller-test/proj.ios/Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8867,7 +8901,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external"; }; name = Debug; }; @@ -8899,7 +8933,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -8930,7 +8964,7 @@ SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external $(inherited) $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -8962,7 +8996,7 @@ SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../extensions $(SRCROOT)/../external $(inherited) $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -9022,7 +9056,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -9047,7 +9081,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -9133,7 +9167,7 @@ PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -9160,7 +9194,7 @@ PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7"; }; @@ -9178,7 +9212,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INFOPLIST_FILE = "$(SRCROOT)/../tests/performance-tests/proj.mac/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -9194,7 +9228,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INFOPLIST_FILE = "$(SRCROOT)/../tests/performance-tests/proj.mac/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/cocos/2d/cocos2d_headers.props b/cocos/2d/cocos2d_headers.props index 7a40862144..b1eb4ded46 100644 --- a/cocos/2d/cocos2d_headers.props +++ b/cocos/2d/cocos2d_headers.props @@ -7,7 +7,7 @@ - $(EngineRoot)cocos\editor-support;$(EngineRoot)cocos;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES;$(EngineRoot)external\freetype2\include\win32\freetype2;$(EngineRoot)external\freetype2\include\win32\;$(EngineRoot)external + $(EngineRoot)cocos;$(EngineRoot)cocos/editor-support;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES;$(EngineRoot)external\freetype2\include\win32\freetype2;$(EngineRoot)external\freetype2\include\win32\;$(EngineRoot)external _VARIADIC_MAX=10;%(PreprocessorDefinitions) @@ -20,4 +20,4 @@ true - \ No newline at end of file + diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index 5a7e296aee..328e5224f8 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -75,7 +75,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;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(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;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(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 @@ -130,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\debug-lib\*.*" - $(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;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(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;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(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;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -1394,4 +1394,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - \ No newline at end of file + diff --git a/cocos/2d/win10_props/cocos2d_win10.props b/cocos/2d/win10_props/cocos2d_win10.props index 4cf6dd1cf5..149180ee95 100644 --- a/cocos/2d/win10_props/cocos2d_win10.props +++ b/cocos/2d/win10_props/cocos2d_win10.props @@ -7,7 +7,7 @@ - $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM)\freetype2;$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;$(EngineRoot)external\poly2tri;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;%(AdditionalIncludeDirectories) + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM)\freetype2;$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;$(EngineRoot)external\poly2tri;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;%(AdditionalIncludeDirectories) WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN;%(PreprocessorDefinitions) @@ -29,4 +29,4 @@ true - \ No newline at end of file + diff --git a/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props index 5773230f7f..cd9c3008a1 100644 --- a/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props +++ b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props @@ -7,7 +7,7 @@ - $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM)\freetype2;$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;$(EngineRoot)external\poly2tri;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;%(AdditionalIncludeDirectories) + $(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM)\freetype2;$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;$(EngineRoot)external\poly2tri;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;%(AdditionalIncludeDirectories) WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN;%(PreprocessorDefinitions) @@ -29,4 +29,4 @@ true - \ No newline at end of file + diff --git a/cocos/3d/CCTerrain.cpp b/cocos/3d/CCTerrain.cpp index a473ca6c87..03a5959c48 100644 --- a/cocos/3d/CCTerrain.cpp +++ b/cocos/3d/CCTerrain.cpp @@ -26,7 +26,6 @@ THE SOFTWARE. USING_NS_CC; #include -#include #include #include #include "renderer/CCGLProgram.h" @@ -39,16 +38,17 @@ USING_NS_CC; #include "base/CCDirector.h" #include "base/CCEventType.h" #include "2d/CCCamera.h" +#include "platform/CCImage.h" NS_CC_BEGIN // check a number is power of two. static bool isPOT(int number) { - bool flag = false; - if((number>0)&&(number&(number-1))==0) - flag = true; - return flag; + bool flag = false; + if((number>0)&&(number&(number-1))==0) + flag = true; + return flag; } Terrain * Terrain::create(TerrainData ¶meter, CrackFixedType fixedType) @@ -77,7 +77,7 @@ bool Terrain::initWithTerrainData(TerrainData ¶meter, CrackFixedType fixedTy //init textures alpha map,detail Maps initResult &= this->initTextures(); initResult &= this->initProperties(); - + return initResult; } @@ -134,7 +134,7 @@ void Terrain::onDraw(const Mat4 &transform, uint32_t flags) _terrainModelMatrix = modelMatrix; _quadRoot->preCalculateAABB(_terrainModelMatrix); } - + auto glProgram = getGLProgram(); glProgram->use(); #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) @@ -170,7 +170,7 @@ void Terrain::onDraw(const Mat4 &transform, uint32_t flags) } glUniform1i(_alphaIsHasAlphaMapLocation,1); - + GL::bindTexture2DN(4, _alphaMap->getName()); glUniform1i(_alphaMapLocation,4); } @@ -201,7 +201,7 @@ void Terrain::onDraw(const Mat4 &transform, uint32_t flags) if(_isCameraViewChanged ) { - _quadRoot->resetNeedDraw(true);//reset it + _quadRoot->resetNeedDraw(true);//reset it //camera frustum culling if (_isEnableFrustumCull) { @@ -424,7 +424,7 @@ void Terrain::calculateNormal() for(int i =0;i<_imageHeight-1;i+=1) { for(int j = 0;j<_imageWidth-1;j+=1) - { + { int nLocIndex = i * _imageWidth + j; _indices.push_back (nLocIndex); @@ -805,7 +805,7 @@ void Terrain::onEnter() return; } #endif - + Node::onEnter(); _terrainModelMatrix = getNodeToWorldTransform(); _quadRoot->preCalculateAABB(_terrainModelMatrix); @@ -872,7 +872,7 @@ bool Terrain::initTextures() }else { //alpha map - auto image = new (std::nothrow)Image(); + auto image = new (std::nothrow)Image(); image->initWithImageFile(_terrainData._alphaMapSrc); _alphaMap = new (std::nothrow)Texture2D(); _alphaMap->initWithImage(image); @@ -925,7 +925,7 @@ void Terrain::reload() void Terrain::Chunk::finish() { //generate two VBO ,the first for vertices, we just setup datas once ,won't changed at all - //the second vbo for the indices, because we use level of detail technique to each chunk, so we will modified frequently + //the second vbo for the indices, because we use level of detail technique to each chunk, so we will modified frequently glGenBuffers(1,&_vbo); //only set for vertices vbo @@ -939,7 +939,7 @@ void Terrain::Chunk::finish() for(int i =0;i<4;i++) { int step = 1<<_currentLod; - //reserve the indices size, the first part is the core part of the chunk, the second part & third part is for fix crack + //reserve the indices size, the first part is the core part of the chunk, the second part & third part is for fix crack int indicesAmount =(_terrain->_chunkSize.width/step+1)*(_terrain->_chunkSize.height/step+1)*6+(_terrain->_chunkSize.height/step)*6 +(_terrain->_chunkSize.width/step)*6; _lod[i]._indices.reserve(indicesAmount); @@ -999,7 +999,7 @@ void Terrain::Chunk::generate(int imgWidth, int imageHei, int m, int n, const un } } // add four skirts - + float skirtHeight = _terrain->_skirtRatio *_terrain->_terrainData._mapScale*8; //#1 _terrain->_skirtVerticesOffset[0] = (int)_originalVertices.size(); @@ -1116,7 +1116,7 @@ void Terrain::Chunk::updateIndicesLOD() { return; } - memcpy(_neighborOldLOD,currentNeighborLOD,sizeof(currentNeighborLOD)); + memcpy(_neighborOldLOD,currentNeighborLOD,sizeof(currentNeighborLOD)); _oldLod = _currentLod; int gridY = _size.height; int gridX = _size.width; @@ -1126,12 +1126,12 @@ void Terrain::Chunk::updateIndicesLOD() ||(_back&&_back->_currentLod > _currentLod) || (_front && _front->_currentLod > _currentLod)) //need update indices. { - //t-junction inner + //t-junction inner _lod[_currentLod]._indices.clear(); for(int i =step;i_skirtVerticesOffset[3]+j); + _lod[_currentLod]._indices.push_back (_terrain->_skirtVerticesOffset[3]+j); _lod[_currentLod]._indices.push_back (nLocIndex); @@ -1582,13 +1582,13 @@ Terrain::QuadTree::~QuadTree() } Terrain::TerrainData::TerrainData(const std::string& heightMapsrc , const std::string& textureSrc, const Size & chunksize, float height, float scale) -{ +{ this->_heightMapSrc = heightMapsrc; this->_detailMaps[0]._detailMapSrc = textureSrc; this->_alphaMapSrc = ""; this->_chunkSize = chunksize; this->_mapHeight = height; - this->_mapScale = scale; + this->_mapScale = scale; _skirtHeightRatio = 1; } @@ -1634,7 +1634,7 @@ Terrain::DetailMap::DetailMap(const std::string& detailMapPath, float size /*= 3 Terrain::DetailMap::DetailMap() { - _detailMapSrc = ""; + _detailMapSrc = ""; _detailMapSize = 35; } @@ -1692,7 +1692,7 @@ bool Terrain::Triangle::getInsterctPoint(const Ray &ray, Vec3& interScetPoint)co return false; // Q - Vec3 Q; + Vec3 Q; Vec3::cross(T,E1,&Q); // Calculate v and make sure u + v <= 1 diff --git a/cocos/Android.mk b/cocos/Android.mk index 70afa67aa7..6a1714a3b5 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -233,8 +233,6 @@ navmesh/CCNavMeshUtils.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/. \ $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/platform \ - $(LOCAL_PATH)/base \ $(LOCAL_PATH)/../external \ $(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/unzip \ @@ -247,7 +245,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/../external/clipper LOCAL_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/platform \ $(LOCAL_PATH)/../external \ $(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/unzip \ diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt index fba53e2694..b86c67a547 100644 --- a/cocos/CMakeLists.txt +++ b/cocos/CMakeLists.txt @@ -45,7 +45,6 @@ include(deprecated/CMakeLists.txt) include(ui/CMakeLists.txt) include(network/CMakeLists.txt) include(audio/CMakeLists.txt) -include_directories(audio/include) include(storage/CMakeLists.txt) if(BUILD_EDITOR_COCOSBUILDER) diff --git a/cocos/editor-support/cocosbuilder/CMakeLists.txt b/cocos/editor-support/cocosbuilder/CMakeLists.txt index e30e68500b..55a98c370b 100644 --- a/cocos/editor-support/cocosbuilder/CMakeLists.txt +++ b/cocos/editor-support/cocosbuilder/CMakeLists.txt @@ -25,5 +25,3 @@ set(COCOS_CCB_SRC editor-support/cocosbuilder/CCSpriteLoader.cpp ) - -include_directories( editor-support ) diff --git a/cocos/editor-support/cocostudio/CMakeLists.txt b/cocos/editor-support/cocostudio/CMakeLists.txt index 418144e198..992fb07bfe 100644 --- a/cocos/editor-support/cocostudio/CMakeLists.txt +++ b/cocos/editor-support/cocostudio/CMakeLists.txt @@ -48,11 +48,11 @@ set(COCOS_CS_SRC editor-support/cocostudio/CocoStudio.cpp editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp - editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp - editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp - editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp - editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp - editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp + editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp + editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp + editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp + editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp + editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp editor-support/cocostudio/WidgetReader/WidgetReader.cpp editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp @@ -64,7 +64,7 @@ set(COCOS_CS_SRC editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp - editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp + editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp @@ -87,7 +87,5 @@ set(COCOS_CS_SRC editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp editor-support/cocostudio/FlatBuffersSerialize.cpp editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp - editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp + editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp ) - -include_directories( editor-support ) diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj index 3efce3e924..d4886073f5 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj @@ -125,7 +125,7 @@ Disabled - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true 4267;4251;4244;%(DisableSpecificWarnings) @@ -144,7 +144,7 @@ WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) None false diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems index 88cb6a4ae6..d443476e8a 100644 --- a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems @@ -10,7 +10,7 @@ - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + $(EngineRoot)cocos\editor-support;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/cocos/platform/CMakeLists.txt b/cocos/platform/CMakeLists.txt index 9ed0eb8e87..f7dcaac174 100644 --- a/cocos/platform/CMakeLists.txt +++ b/cocos/platform/CMakeLists.txt @@ -65,10 +65,6 @@ set(COCOS_PLATFORM_SPECIFIC_SRC elseif(ANDROID) - include_directories( - platform/android - ) - set(COCOS_PLATFORM_SPECIFIC_SRC platform/android/CCApplication-android.cpp platform/android/CCCommon-android.cpp @@ -86,7 +82,7 @@ set(COCOS2DX_ANDROID_STATIC platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp - + ) add_library(cocos2dxandroid_static STATIC ${COCOS2DX_ANDROID_STATIC}) @@ -97,8 +93,6 @@ endif() #leave andatory external stuff here also include_directories( - platform/desktop - platform ../external/ConvertUTF ../external/edtaa3func ../external/poly2tri diff --git a/cocos/scripting/js-bindings/CMakeLists.txt b/cocos/scripting/js-bindings/CMakeLists.txt index f9da284ddf..8d8c556709 100644 --- a/cocos/scripting/js-bindings/CMakeLists.txt +++ b/cocos/scripting/js-bindings/CMakeLists.txt @@ -1,6 +1,6 @@ #/**************************************************************************** # Copyright (c) 2014 Chukong Technologies Inc. -# +# # http://www.cocos2d-x.org # # Permission is hereby granted, free of charge, to any person obtaining a copy @@ -80,29 +80,11 @@ set(JSBINDING_SRC ) include_directories( - auto - manual - manual/cocostudio - manual/spine - manual/navmesh ${cocos_root}/external/spidermonkey/include/${PLATFORM_FOLDER} ${cocos_root}/cocos - ${cocos_root}/cocos/base - ${cocos_root}/cocos/2d - ${cocos_root}/cocos/3d - ${cocos_root}/cocos/ui - ${cocos_root}/cocos/audio/include - ${cocos_root}/cocos/storage - ${cocos_root}/cocos/network - ${cocos_root}/cocos/platform - ${cocos_root}/cocos/physics3d - ${cocos_root}/cocos/navmesh + ${cocos_root}/cocos/editor-support ${cocos_root}/extensions ${cocos_root}/external - ${cocos_root}/cocos/editor-support - ${cocos_root}/cocos/editor-support/spine - ${cocos_root}/cocos/editor-support/cocosbuilder - ${cocos_root}/cocos/editor-support/cocostudio ${CHIPMUNK_INCLUDE_DIRS} ) @@ -110,9 +92,16 @@ add_library(jscocos2d STATIC ${JSBINDING_SRC} ) +find_library(SPIDERMONKEY_LIBRARY NAMES js_static mozjs HINTS + ${cocos_root}/external/spidermonkey/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR} + ${cocos_root}/external/spidermonkey/prebuilt/${PLATFORM_FOLDER} +) + +message("SPIDERMONKEY_LIBRARY: ${SPIDERMONKEY_LIBRARY}") + target_link_libraries(jscocos2d sqlite3 - js_static + ${SPIDERMONKEY_LIBRARY} xxhash ) @@ -121,4 +110,3 @@ set_target_properties(jscocos2d ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ) - diff --git a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj index f7bf022ccf..181189610b 100644 --- a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj +++ b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj @@ -164,7 +164,7 @@ 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;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include;%(AdditionalIncludeDirectories) 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) true false @@ -190,7 +190,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" 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;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include;%(AdditionalIncludeDirectories) 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) true None diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj index df4c4ab6dc..b82ea08f17 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj @@ -126,7 +126,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -147,7 +147,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;%(PreprocessorDefinitions) @@ -169,7 +169,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -190,7 +190,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;%(PreprocessorDefinitions) @@ -212,7 +212,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -233,7 +233,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj index 9449b37008..1408b35d2b 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj @@ -91,7 +91,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\spine;$(ProjectDir)..\..\..\manual\navmesh;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\spine;$(ProjectDir)..\..\..\manual\navmesh;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -112,7 +112,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;%(PreprocessorDefinitions) @@ -134,7 +134,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\spine;$(ProjectDir)..\..\..\manual\navmesh;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\spine;$(ProjectDir)..\..\..\manual\navmesh;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -155,7 +155,7 @@ NotUsing true false - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_USRJSSTATIC;%(PreprocessorDefinitions) diff --git a/cocos/scripting/lua-bindings/CMakeLists.txt b/cocos/scripting/lua-bindings/CMakeLists.txt index 9e8cc4ac7a..16eac6eb67 100644 --- a/cocos/scripting/lua-bindings/CMakeLists.txt +++ b/cocos/scripting/lua-bindings/CMakeLists.txt @@ -7,26 +7,7 @@ include_directories( ${cocos_root}/external/xxtea ${cocos_root}/external ${cocos_root}/cocos - ${cocos_root}/cocos/ui - ${cocos_root}/cocos/2d - ${cocos_root}/cocos/3d - ${cocos_root}/cocos/base - ${cocos_root}/cocos/editor-support/spine - ${cocos_root}/cocos/editor-support/cocostudio - ${cocos_root}/cocos/editor-support/cocostudio/ActionTimeline - ${cocos_root}/cocos/editor-support/cocosbuilder ${cocos_root}/cocos/editor-support - ${cocos_root}/cocos/platform - ${cocos_root}/cocos/audio/include - ${cocos_root}/cocos/physics3d - ${cocos_root}/cocos/navmesh - manual - manual/extension - manual/cocostudio - manual/ui - manual/cocos2d - manual/navmesh - auto ) file(GLOB lua_cocos2d_source_files @@ -138,7 +119,7 @@ set(lua_bindings_auto_files ) if(MACOSX) - set(lua_bindings_manual_files + set(lua_bindings_manual_files ${lua_bindings_manual_files} manual/platform/ios/CCLuaObjcBridge.mm ) diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj index 8860c1f41d..e5ebda5d75 100644 --- a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj @@ -284,7 +284,7 @@ Disabled - $(EngineRoot);$(EngineRoot)cocos\2d;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\navmesh;$(EngineRoot)external;$(EngineRoot)external\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\navmesh;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)external;$(EngineRoot)external\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_USRLUASTATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -316,7 +316,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ MinSpace true - $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\navmesh;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)external;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)extensions;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;_USRLUASTATIC;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/cocos/ui/proj.win32/libui.vcxproj b/cocos/ui/proj.win32/libui.vcxproj index 05acb83b13..53260d3297 100644 --- a/cocos/ui/proj.win32/libui.vcxproj +++ b/cocos/ui/proj.win32/libui.vcxproj @@ -127,7 +127,7 @@ Disabled - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) true 4267;4251;4244;%(DisableSpecificWarnings) @@ -149,7 +149,7 @@ WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) None false diff --git a/extensions/Particle3D/PU/CCPUMaterialManager.cpp b/extensions/Particle3D/PU/CCPUMaterialManager.cpp index 82c841434a..8f0adeb92c 100644 --- a/extensions/Particle3D/PU/CCPUMaterialManager.cpp +++ b/extensions/Particle3D/PU/CCPUMaterialManager.cpp @@ -1,19 +1,19 @@ /**************************************************************************** Copyright (C) 2013 Henry van Merode. All rights reserved. Copyright (c) 2015 Chukong Technologies Inc. - + http://www.cocos2d-x.org - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -32,7 +32,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #include #elif (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "android/CCFileUtils-android.h" +#include "platform/android/CCFileUtils-android.h" #include #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #include @@ -194,4 +194,4 @@ bool PUMaterialCache::loadMaterialsFromSearchPaths( const std::string &fileFolde return state; } -NS_CC_END \ No newline at end of file +NS_CC_END diff --git a/external/config.json b/external/config.json index 09267c873d..7d069e5475 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,6 @@ { - "version":"v3-deps-84", - "zip_file_size":"127264546", + "version":"v3-deps-86", + "zip_file_size":"127264549", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", "move_dirs":{ diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index dcf8b5a303..2caf2f3c9c 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -5272,6 +5272,7 @@ "plugin/tools/toolsForPublish/checkEnvironment.sh", "plugin/tools/toolsForPublish/genPrebuildMK.sh", "plugin/tools/toolsForPublish/publishPlugin.sh", + "tools/coding-style/include-linter.py", "tools/fbx-conv/README.md", "tools/fbx-conv/mac/fbx-conv", "tools/fbx-conv/mac/libfbxsdk.dylib", diff --git a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 62261ef3ca..1cabfa556c 100644 --- a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -547,8 +547,6 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/platform/ios", - "$(SRCROOT)/../cocos2d/cocos/platform/ios/Simulation", ); INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 6.0; @@ -581,8 +579,6 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/platform/ios", - "$(SRCROOT)/../cocos2d/cocos/platform/ios/Simulation", ); INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 6.0; @@ -617,7 +613,6 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/platform/mac", "$(SRCROOT)/../cocos2d/external/glfw3/include/mac", ); INFOPLIST_FILE = mac/Info.plist; @@ -647,7 +642,6 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/platform/mac", "$(SRCROOT)/../cocos2d/external/glfw3/include/mac", ); INFOPLIST_FILE = mac/Info.plist; @@ -672,14 +666,6 @@ HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../cocos2d", "$(SRCROOT)/../cocos2d/cocos", - "$(SRCROOT)/../cocos2d/cocos/base", - "$(SRCROOT)/../cocos2d/cocos/physics", - "$(SRCROOT)/../cocos2d/cocos/math", - "$(SRCROOT)/../cocos2d/cocos/2d", - "$(SRCROOT)/../cocos2d/cocos/ui", - "$(SRCROOT)/../cocos2d/cocos/network", - "$(SRCROOT)/../cocos2d/cocos/audio/include", - "$(SRCROOT)/../cocos2d/cocos/editor-support", "$(SRCROOT)/../cocos2d/extensions", "$(SRCROOT)/../cocos2d/external", "$(SRCROOT)/../cocos2d/external/chipmunk/include/chipmunk", @@ -702,14 +688,6 @@ HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../cocos2d", "$(SRCROOT)/../cocos2d/cocos", - "$(SRCROOT)/../cocos2d/cocos/base", - "$(SRCROOT)/../cocos2d/cocos/physics", - "$(SRCROOT)/../cocos2d/cocos/math", - "$(SRCROOT)/../cocos2d/cocos/2d", - "$(SRCROOT)/../cocos2d/cocos/ui", - "$(SRCROOT)/../cocos2d/cocos/network", - "$(SRCROOT)/../cocos2d/cocos/audio/include", - "$(SRCROOT)/../cocos2d/cocos/editor-support", "$(SRCROOT)/../cocos2d/extensions", "$(SRCROOT)/../cocos2d/external", "$(SRCROOT)/../cocos2d/external/chipmunk/include/chipmunk", diff --git a/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/Cocos2dRenderer.cpp b/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/Cocos2dRenderer.cpp index 5b62283690..7e329b4855 100644 --- a/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/Cocos2dRenderer.cpp +++ b/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/Cocos2dRenderer.cpp @@ -18,8 +18,8 @@ #include "Cocos2dRenderer.h" #include "AppDelegate.h" -#include "CCGLViewImpl-winrt.h" -#include "CCApplication.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" +#include "platform/CCApplication.h" #include "cocos2d.h" #include "renderer/CCTextureCache.h" @@ -56,7 +56,7 @@ void Cocos2dRenderer::Resume() auto director = cocos2d::Director::getInstance(); auto glview = director->getOpenGLView(); - if (!glview) + if (!glview) { GLViewImpl* glview = GLViewImpl::create("Test Cpp"); glview->setDispatcher(m_dispatcher.Get()); @@ -151,6 +151,3 @@ void Cocos2dRenderer::QueueKeyboardEvent(WinRTKeyboardEventType type, Windows::U { GLViewImpl::sharedOpenGLView()->QueueWinRTKeyboardEvent(type, args); } - - - diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj index 7da7bc3c0c..013bcd9ba5 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj @@ -71,7 +71,7 @@ Disabled - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) + $(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -113,7 +113,7 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y MaxSpeed true - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) + $(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/templates/cpp-template-default/proj.win32/main.h b/templates/cpp-template-default/proj.win32/main.h index e74708bdf2..095e22791f 100644 --- a/templates/cpp-template-default/proj.win32/main.h +++ b/templates/cpp-template-default/proj.win32/main.h @@ -8,6 +8,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "platform/CCStdC.h" #endif // __MAIN_H__ diff --git a/templates/cpp-template-default/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp b/templates/cpp-template-default/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp index 5b62283690..7e329b4855 100644 --- a/templates/cpp-template-default/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp +++ b/templates/cpp-template-default/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp @@ -18,8 +18,8 @@ #include "Cocos2dRenderer.h" #include "AppDelegate.h" -#include "CCGLViewImpl-winrt.h" -#include "CCApplication.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" +#include "platform/CCApplication.h" #include "cocos2d.h" #include "renderer/CCTextureCache.h" @@ -56,7 +56,7 @@ void Cocos2dRenderer::Resume() auto director = cocos2d::Director::getInstance(); auto glview = director->getOpenGLView(); - if (!glview) + if (!glview) { GLViewImpl* glview = GLViewImpl::create("Test Cpp"); glview->setDispatcher(m_dispatcher.Get()); @@ -151,6 +151,3 @@ void Cocos2dRenderer::QueueKeyboardEvent(WinRTKeyboardEventType type, Windows::U { GLViewImpl::sharedOpenGLView()->QueueWinRTKeyboardEvent(type, args); } - - - diff --git a/templates/js-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/js-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp index 3a8bdd4fb2..adb4aa091a 100644 --- a/templates/js-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/js-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -1,40 +1,40 @@ #include "AppDelegate.h" -#include "SimpleAudioEngine.h" -#include "jsb_cocos2dx_auto.hpp" -#include "jsb_cocos2dx_ui_auto.hpp" -#include "jsb_cocos2dx_studio_auto.hpp" -#include "jsb_cocos2dx_builder_auto.hpp" -#include "jsb_cocos2dx_spine_auto.hpp" -#include "jsb_cocos2dx_extension_auto.hpp" -#include "jsb_cocos2dx_3d_auto.hpp" -#include "jsb_cocos2dx_3d_extension_auto.hpp" -#include "3d/jsb_cocos2dx_3d_manual.h" -#include "ui/jsb_cocos2dx_ui_manual.h" -#include "cocostudio/jsb_cocos2dx_studio_manual.h" -#include "cocosbuilder/js_bindings_ccbreader.h" -#include "spine/jsb_cocos2dx_spine_manual.h" -#include "extension/jsb_cocos2dx_extension_manual.h" -#include "localstorage/js_bindings_system_registration.h" -#include "chipmunk/js_bindings_chipmunk_registration.h" -#include "jsb_opengl_registration.h" -#include "network/XMLHTTPRequest.h" -#include "network/jsb_websocket.h" -#include "network/jsb_socketio.h" -#include "jsb_cocos2dx_physics3d_auto.hpp" -#include "physics3d/jsb_cocos2dx_physics3d_manual.h" -#include "jsb_cocos2dx_navmesh_auto.hpp" -#include "navmesh/jsb_cocos2dx_navmesh_manual.h" +#include "audio/include/SimpleAudioEngine.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp" +#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.h" +#include "scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h" +#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.h" +#include "scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h" +#include "scripting/js-bindings/manual/jsb_opengl_registration.h" +#include "scripting/js-bindings/manual/localstorage/js_bindings_system_registration.h" +#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.h" +#include "scripting/js-bindings/manual/network/XMLHTTPRequest.h" +#include "scripting/js-bindings/manual/network/jsb_socketio.h" +#include "scripting/js-bindings/manual/network/jsb_websocket.h" +#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h" +#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h" +#include "scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "jsb_cocos2dx_experimental_video_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_video_manual.h" -#include "jsb_cocos2dx_experimental_webView_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_webView_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.h" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "jsb_cocos2dx_audioengine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) @@ -58,7 +58,7 @@ AppDelegate::~AppDelegate() void AppDelegate::initGLContextAttrs() { GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8}; - + GLView::setGLContextAttrs(glContextAttrs); } @@ -78,7 +78,7 @@ bool AppDelegate::applicationDidFinishLaunching() // set FPS. the default value is 1.0/60 if you don't call this director->setAnimationInterval(1.0 / 60); - + ScriptingCore* sc = ScriptingCore::getInstance(); sc->addRegisterCallback(register_all_cocos2dx); sc->addRegisterCallback(register_cocos2dx_js_core); @@ -92,23 +92,23 @@ bool AppDelegate::applicationDidFinishLaunching() sc->addRegisterCallback(jsb_register_chipmunk); // opengl can be commented out to reduce the package sc->addRegisterCallback(JSB_register_opengl); - + // builder can be commented out to reduce the package sc->addRegisterCallback(register_all_cocos2dx_builder); sc->addRegisterCallback(register_CCBuilderReader); - + // ui can be commented out to reduce the package, attension studio need ui module sc->addRegisterCallback(register_all_cocos2dx_ui); sc->addRegisterCallback(register_all_cocos2dx_ui_manual); - // studio can be commented out to reduce the package, + // studio can be commented out to reduce the package, sc->addRegisterCallback(register_all_cocos2dx_studio); sc->addRegisterCallback(register_all_cocos2dx_studio_manual); - + // spine can be commented out to reduce the package sc->addRegisterCallback(register_all_cocos2dx_spine); sc->addRegisterCallback(register_all_cocos2dx_spine_manual); - + // XmlHttpRequest can be commented out to reduce the package sc->addRegisterCallback(MinXmlHttpRequest::_js_register); // websocket can be commented out to reduce the package @@ -119,10 +119,10 @@ bool AppDelegate::applicationDidFinishLaunching() // 3d can be commented out to reduce the package sc->addRegisterCallback(register_all_cocos2dx_3d); sc->addRegisterCallback(register_all_cocos2dx_3d_manual); - + // 3d extension can be commented out to reduce the package sc->addRegisterCallback(register_all_cocos2dx_3d_extension); - + #if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION // Physics 3d can be commented out to reduce the package sc->addRegisterCallback(register_all_cocos2dx_physics3d); @@ -150,7 +150,7 @@ bool AppDelegate::applicationDidFinishLaunching() #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) sc->addRegisterCallback(JavaScriptObjCBridge::_js_register); #endif - sc->start(); + sc->start(); sc->runScript("script/jsb_boot.js"); #if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0) sc->enableDebugger(); @@ -169,7 +169,7 @@ void AppDelegate::applicationDidEnterBackground() director->stopAnimation(); director->getEventDispatcher()->dispatchCustomEvent("game_on_hide"); SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); + SimpleAudioEngine::getInstance()->pauseAllEffects(); } // this function will be called when the app is active again diff --git a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index c348a818ca..f7ce5062f7 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -805,7 +805,7 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; }; name = Debug; }; @@ -828,7 +828,7 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; }; name = Release; }; @@ -854,7 +854,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/auto $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk"; }; name = Debug; }; @@ -877,7 +877,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/auto $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -904,7 +904,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -930,7 +930,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual"; VALID_ARCHS = "arm64 armv7"; }; name = Release; diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj index d9e94c184e..3d25d42bae 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj @@ -81,7 +81,7 @@ Disabled - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -140,7 +140,7 @@ copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y game_p.c - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions) diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win32/main.h b/templates/js-template-default/frameworks/runtime-src/proj.win32/main.h index e29aeedb3a..a17450f556 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win32/main.h +++ b/templates/js-template-default/frameworks/runtime-src/proj.win32/main.h @@ -7,6 +7,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "platform/CCStdC.h" #endif // __WINMAIN_H__ diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp index 5b62283690..7e329b4855 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/Cocos2dRenderer.cpp @@ -18,8 +18,8 @@ #include "Cocos2dRenderer.h" #include "AppDelegate.h" -#include "CCGLViewImpl-winrt.h" -#include "CCApplication.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" +#include "platform/CCApplication.h" #include "cocos2d.h" #include "renderer/CCTextureCache.h" @@ -56,7 +56,7 @@ void Cocos2dRenderer::Resume() auto director = cocos2d::Director::getInstance(); auto glview = director->getOpenGLView(); - if (!glview) + if (!glview) { GLViewImpl* glview = GLViewImpl::create("Test Cpp"); glview->setDispatcher(m_dispatcher.Get()); @@ -151,6 +151,3 @@ void Cocos2dRenderer::QueueKeyboardEvent(WinRTKeyboardEventType type, Windows::U { GLViewImpl::sharedOpenGLView()->QueueWinRTKeyboardEvent(type, args); } - - - diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/resources.props b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/resources.props index adce6f5869..2535e8a025 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/resources.props +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/resources.props @@ -4,7 +4,7 @@ - $(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)external\spidermonkey\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\base;%(AdditionalIncludeDirectories); + $(EngineRoot)external\spidermonkey\include\$(COCOS2D_PLATFORM);%(AdditionalIncludeDirectories); mozjs-33.lib;%(AdditionalDependencies) diff --git a/templates/js-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/js-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp index bf11d78bb0..824955e7ca 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/js-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -1,5 +1,5 @@ #include "AppDelegate.h" -#include "SimpleAudioEngine.h" +#include "audio/include/SimpleAudioEngine.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_LINUX) #include "ide-support/CodeIDESupport.h" @@ -9,7 +9,7 @@ #include "runtime/Runtime.h" #include "ide-support/RuntimeJsImpl.h" #else -#include "js_module_register.h" +#include "scripting/js-bindings/manual/js_module_register.h" #endif USING_NS_CC; @@ -23,7 +23,7 @@ AppDelegate::~AppDelegate() { SimpleAudioEngine::end(); ScriptEngineManager::destroyInstance(); - + #if (COCOS2D_DEBUG > 0) && (CC_CODE_IDE_DEBUG_SUPPORT > 0) // NOTE:Please don't remove this call if you want to debug with Cocos Code IDE RuntimeEngine::getInstance()->end(); @@ -61,7 +61,7 @@ bool AppDelegate::applicationDidFinishLaunching() auto jsRuntime = RuntimeJsImpl::create(); runtimeEngine->addRuntime(jsRuntime, kRuntimeEngineJs); runtimeEngine->start(); - + // js need special debug port if (runtimeEngine->getProjectConfig().getDebuggerType() != kCCRuntimeDebuggerNone) { @@ -90,7 +90,7 @@ void AppDelegate::applicationDidEnterBackground() director->stopAnimation(); director->getEventDispatcher()->dispatchCustomEvent("game_on_hide"); SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); + SimpleAudioEngine::getInstance()->pauseAllEffects(); } // this function will be called when the app is active again @@ -102,4 +102,3 @@ void AppDelegate::applicationWillEnterForeground() SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); SimpleAudioEngine::getInstance()->resumeAllEffects(); } - diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index d3011d00d3..2222f5ef39 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -1036,7 +1036,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; }; name = Debug; }; @@ -1065,7 +1065,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/mac"; }; name = Release; }; @@ -1091,7 +1091,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/auto $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk"; }; name = Debug; }; @@ -1114,7 +1114,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/auto $(SRCROOT)/../../cocos2d-x/cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -1144,7 +1144,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/platform/ios $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual $(SRCROOT)/../../cocos2d-x/external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual $(SRCROOT)/../../cocos2d-x/external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -1174,7 +1174,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/platform/ios $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual $(SRCROOT)/../../cocos2d-x/external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/external/spidermonkey/include/ios $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/auto $(SRCROOT)/../../cocos2d-x/plugin/jsbindings/manual $(SRCROOT)/../../cocos2d-x/external/curl/include/ios"; VALID_ARCHS = "arm64 armv7"; }; name = Release; diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj index 279b9cdc1b..f5c395dd58 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj @@ -87,7 +87,7 @@ Disabled - $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(EngineRoot)tools\simulator\libsimulator\lib\runtime;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)tools\simulator\libsimulator\proj.win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)external;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(EngineRoot)tools\simulator\libsimulator\lib\runtime;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)tools\simulator\libsimulator\proj.win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -159,7 +159,7 @@ xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(LocalDebuggerWorkingDi game_p.c - $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(EngineRoot)tools\simulator\libsimulator\lib\runtime;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)tools\simulator\libsimulator\proj.win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)external;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(EngineRoot)tools\simulator\libsimulator\lib\runtime;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)tools\simulator\libsimulator\proj.win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions) diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp index c9d5aad81a..f4714c0558 100644 --- a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -1,8 +1,8 @@ #include "AppDelegate.h" -#include "CCLuaEngine.h" -#include "SimpleAudioEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "audio/include/SimpleAudioEngine.h" #include "cocos2d.h" -#include "lua_module_register.h" +#include "scripting/lua-bindings/manual/lua_module_register.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_LINUX) #include "ide-support/CodeIDESupport.h" diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 3b7eeb9bdb..4ec6b78263 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -781,7 +781,7 @@ "$(_COCOS_LIB_MAC_END)", ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(_COCOS_HEADER_MAC_BEGIN) $(_COCOS_HEADER_MAC_END)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(_COCOS_HEADER_MAC_BEGIN) $(_COCOS_HEADER_MAC_END)"; }; name = Debug; }; @@ -815,7 +815,7 @@ "$(_COCOS_LIB_MAC_END)", ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(_COCOS_HEADER_MAC_BEGIN) $(_COCOS_HEADER_MAC_END)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac $(_COCOS_HEADER_MAC_BEGIN) $(_COCOS_HEADER_MAC_END)"; }; name = Release; }; @@ -842,7 +842,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/ui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib/protobuf-lite"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib/protobuf-lite"; }; name = Debug; }; @@ -864,7 +864,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/ui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib/protobuf-lite"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib $(SRCROOT)/../../cocos2d-x/tools/simulator/libsimulator/lib/protobuf-lite"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -904,7 +904,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios $(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)"; VALID_ARCHS = "arm64 armv7"; }; name = Debug; @@ -943,7 +943,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios $(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)"; VALID_ARCHS = "arm64 armv7"; }; name = Release; diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm index 9660ee4c10..d3a04a5969 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm @@ -37,7 +37,7 @@ #include "runtime/ConfigParser.h" #include "cocos2d.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "CodeIDESupport.h" #include "platform/mac/PlayerMac.h" diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index d9031b6832..5307dc094b 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -68,7 +68,7 @@ - $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\runtime;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)extensions;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot);%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) + $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\runtime;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)extensions;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot);%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) Level3 @@ -137,7 +137,7 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E / - $(ProjectDir)..\Classes;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\curl\include\win32;$(EngineRoot);$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) + $(ProjectDir)..\Classes;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\curl\include\win32;$(EngineRoot);$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) Level3 diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWin.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWin.cpp index c8c66dad11..de51cb1c00 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWin.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWin.cpp @@ -22,7 +22,7 @@ #include "glfw3.h" #include "glfw3native.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "AppEvent.h" #include "AppLang.h" #include "runtime/ConfigParser.h" @@ -827,4 +827,3 @@ LRESULT CALLBACK SimulatorWin::windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L } return g_oldWindowProc(hWnd, uMsg, wParam, lParam); } - diff --git a/tests/cpp-empty-test/proj.win10/App.xaml.cpp b/tests/cpp-empty-test/proj.win10/App.xaml.cpp index 6d946b834a..a50611deee 100644 --- a/tests/cpp-empty-test/proj.win10/App.xaml.cpp +++ b/tests/cpp-empty-test/proj.win10/App.xaml.cpp @@ -1,5 +1,5 @@ #include "App.xaml.h" -#include "OpenGLESPage.xaml.h" +#include "platform/win8.1-universal/OpenGLESPage.xaml.h" using namespace Platform; using namespace Windows::ApplicationModel; diff --git a/tests/cpp-empty-test/proj.win10/App.xaml.h b/tests/cpp-empty-test/proj.win10/App.xaml.h index a5bc0e7f64..ad7c58a00a 100644 --- a/tests/cpp-empty-test/proj.win10/App.xaml.h +++ b/tests/cpp-empty-test/proj.win10/App.xaml.h @@ -1,7 +1,7 @@ #pragma once #include "app.g.h" -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" #include "openglespage.xaml.h" namespace CocosAppWinRT diff --git a/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj b/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj index 4dfda0bd28..3dd1ea2179 100644 --- a/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj @@ -150,7 +150,7 @@ 4453;28204;4251;4244;4056; pch.h false - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) ProgramDatabase @@ -178,7 +178,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat 4453;28204;4251;4244;4056; pch.h false - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) ProgramDatabase @@ -203,7 +203,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat 4453;28204;4251;4244;4056; pch.h false - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) ProgramDatabase @@ -231,7 +231,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat 4453;28204;4251;4244;4056; pch.h false - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) ProgramDatabase @@ -256,7 +256,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat 4453;28204;4251;4244;4056; pch.h false - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) ProgramDatabase @@ -284,7 +284,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat 4453;28204;4251;4244;4056; pch.h false - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) ProgramDatabase diff --git a/tests/cpp-empty-test/proj.win32/main.h b/tests/cpp-empty-test/proj.win32/main.h index e74708bdf2..095e22791f 100644 --- a/tests/cpp-empty-test/proj.win32/main.h +++ b/tests/cpp-empty-test/proj.win32/main.h @@ -8,6 +8,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "platform/CCStdC.h" #endif // __MAIN_H__ diff --git a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.cpp b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.cpp index da7d11b251..330a14550d 100644 --- a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.cpp +++ b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.cpp @@ -1,5 +1,5 @@ #include "App.xaml.h" -#include "OpenGLESPage.xaml.h" +#include "platform/win8.1-universal/OpenGLESPage.xaml.h" using namespace Platform; using namespace Windows::ApplicationModel; diff --git a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.h b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.h index c177eab651..a78928eae7 100644 --- a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.h +++ b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Shared/App.xaml.h @@ -1,7 +1,7 @@ #pragma once #include "app.g.h" -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" #include "openglespage.xaml.h" namespace CocosAppWinRT diff --git a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj index 0efaadb987..657be50320 100644 --- a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj +++ b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj @@ -121,7 +121,7 @@ /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false ProgramDatabase @@ -150,7 +150,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false ProgramDatabase @@ -176,7 +176,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false ProgramDatabase @@ -205,7 +205,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false ProgramDatabase @@ -231,7 +231,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false ProgramDatabase @@ -260,7 +260,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false ProgramDatabase diff --git a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj index 1adb645e97..7e9c775534 100644 --- a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj +++ b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj @@ -87,7 +87,7 @@ /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -101,7 +101,7 @@ /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) ProgramDatabase @@ -112,7 +112,7 @@ /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -126,7 +126,7 @@ /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) ProgramDatabase diff --git a/tests/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp index f7336977e9..75c0ae1450 100644 --- a/tests/cpp-tests/Classes/AppDelegate.cpp +++ b/tests/cpp-tests/Classes/AppDelegate.cpp @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "controller.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "extensions/cocos-ext.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-PageViewLayout.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-PageViewLayout.cpp index 3572c5f41b..07eee210d0 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-PageViewLayout.cpp +++ b/tests/cpp-tests/Classes/BugsTest/Bug-PageViewLayout.cpp @@ -7,7 +7,7 @@ // #include "Bug-PageViewLayout.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "ui/CocosGUI.h" #include "platform/CCFileUtils.h" diff --git a/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.cpp b/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.cpp index 79f2414784..085fafcd07 100644 --- a/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.cpp +++ b/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "CocosStudio3DTest.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/DownloaderTest/DownloaderTest.cpp b/tests/cpp-tests/Classes/DownloaderTest/DownloaderTest.cpp index 6229c6536e..e804077771 100644 --- a/tests/cpp-tests/Classes/DownloaderTest/DownloaderTest.cpp +++ b/tests/cpp-tests/Classes/DownloaderTest/DownloaderTest.cpp @@ -27,7 +27,7 @@ #include "../testResource.h" -#include "cocos/ui/UILoadingBar.h" +#include "ui/UILoadingBar.h" #include "network/CCDownloader.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h index 0a8b8a2cbf..432531efaf 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "../../BaseTest.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" class CocoStudioActionTimelineTests : public TestSuite { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp index 1bd5418de1..ce16caa1d8 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp @@ -1,6 +1,6 @@ #include "ArmatureScene.h" #include "../../testResource.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" using namespace cocos2d; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h index c9ed316f1c..cb8d86d78f 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h @@ -4,7 +4,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" #include "../../BaseTest.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #if ENABLE_PHYSICS_BOX2D_DETECT #include "../../Box2DTestBed/GLES-Render.h" diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h index 542d673cf0..f23e04fa67 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" class EnemyController : public cocostudio::ComController diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h index c24e388b7a..c42c30fa06 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" class PlayerController : public cocostudio::ComController diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h index 3d3b76db73..0db7626be8 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" class ProjectileController : public cocostudio::ComController { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h index 770f73ee27..cafef5a93f 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" class SceneController : public cocostudio::ComController { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp index 816eeb4ab0..88dfb0bfe6 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp @@ -1,7 +1,7 @@ #include "extensions/cocos-ext.h" #include "../ExtensionsTest.h" #include "SceneEditorTest.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "ui/CocosGUI.h" #include "TriggerCode/EventDef.h" #include "../../testResource.h" diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h index 8fecd7bad6..f59f8e2703 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "BaseTest.h" DEFINE_TEST_SUITE(CocoStudioSceneEditTests); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h index 124eea3c6d..dba60cf679 100755 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h @@ -2,7 +2,7 @@ #define __ACTIONS_H__ #include "cocos2d.h" -#include "cocostudio/TriggerBase.h" +#include "editor-support/cocostudio/TriggerBase.h" class PlayMusic: public cocostudio::BaseTriggerAction diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h index 068f955f87..a2893526ea 100755 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h @@ -2,7 +2,7 @@ #define __CONS_H__ #include "cocos2d.h" -#include "cocostudio/TriggerBase.h" +#include "editor-support/cocostudio/TriggerBase.h" class TimeElapsed : public cocostudio::BaseTriggerCondition diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h index 48ee23e1b5..b167ec1139 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocosbuilder/CocosBuilder.h" +#include "editor-support/cocosbuilder/CocosBuilder.h" class AnimationsTestLayer : public cocos2d::Layer diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h index ac1ca59dd9..bbd4b57931 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocosbuilder/CocosBuilder.h" +#include "editor-support/cocosbuilder/CocosBuilder.h" class ButtonTestLayer : public cocos2d::Layer diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h index e12c6f8649..73349a8af3 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocosbuilder/CocosBuilder.h" +#include "editor-support/cocosbuilder/CocosBuilder.h" /* * Note: for some pretty hard fucked up reason, the order of inheritance is important! diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h index b542adc67d..51639b70f2 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocosbuilder/CocosBuilder.h" +#include "editor-support/cocosbuilder/CocosBuilder.h" class MenuTestLayer : public cocos2d::Layer diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h index 8e0985f092..dbe3557d04 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "cocosbuilder/CocosBuilder.h" +#include "editor-support/cocosbuilder/CocosBuilder.h" class TestHeaderLayer : public cocos2d::Layer diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h index 7a59e24e38..5a49914b54 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h @@ -4,7 +4,7 @@ #include "cocos2d.h" #include "audio/include/SimpleAudioEngine.h" #include "extensions/cocos-ext.h" -#include "cocosbuilder/CocosBuilder.h" +#include "editor-support/cocosbuilder/CocosBuilder.h" class TimelineCallbackTestLayer : public cocos2d::Layer diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp index 33ca899466..e8436cc6dc 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "CocostudioParserJsonTest.h" -#include "cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/CCSGUIReader.h" #include "ui/CocosGUI.h" #include "../CocostudioParserTest.h" #include "../CustomWidget/CustomImageView.h" diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp index 0bffd2009d..5f94e6eb1b 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp @@ -3,7 +3,7 @@ #include "../../CustomWidget/CustomImageView.h" #include "../../CustomWidget/CustomImageViewReader.h" #include "../../CustomWidget/CustomReader.h" -#include "cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/CCSGUIReader.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp index b5733c09eb..716b127adc 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp @@ -2,7 +2,7 @@ #include "../../CustomGUIScene.h" #include "../../CustomWidget/CustomParticleWidget.h" #include "../../CustomWidget/CustomParticleWidgetReader.h" -#include "cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/CCSGUIReader.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNode.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNode.h index 96e7216121..217ef48495 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNode.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNode.h @@ -2,7 +2,7 @@ #define __TestCpp__CustomRootNode__ #include "cocos2d.h" -#include "cocostudio/WidgetCallBackHandlerProtocol.h" +#include "editor-support/cocostudio/WidgetCallBackHandlerProtocol.h" class CustomRootNode : public cocos2d::Node, public cocostudio::WidgetCallBackHandlerProtocol { diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNodeReader.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNodeReader.h index 9e7fe1bce6..d84627a9b2 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNodeReader.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomRootNodeReader.h @@ -2,8 +2,8 @@ #define __cocos2d_libs__CustomRootNodeReader__ #include "cocos2d.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" class CustomRootNodeReader : public cocostudio::NodeReader diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.cpp index 92dc7cd447..2048c12d09 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.cpp @@ -1,8 +1,8 @@ #include "CustomWidgetCallbackBindTest.h" #include "../../CustomGUIScene.h" -#include "cocostudio/ActionTimeline/CSLoader.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "base/ObjectFactory.h" #include "CustomRootNode.h" #include "CustomRootNodeReader.h" diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h index b11c7ab39f..9f182237f8 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h @@ -4,7 +4,7 @@ #define __TestCpp__CustomImageViewReader__ #include "extensions/cocos-ext.h" -#include "cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/DictionaryHelper.h" #include "ui/CocosGUI.h" class CustomImageViewReader : public cocos2d::Ref diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp index c47c969c37..b0c6f997d7 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp @@ -8,7 +8,7 @@ #include "CustomParticleWidgetReader.h" #include "CustomParticleWidget.h" -#include "cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/CCSGUIReader.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h index 8685271969..b05ddd6235 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h @@ -10,7 +10,7 @@ #define __CustomUI__CustomParticleWidgetReader__ #include "extensions/cocos-ext.h" -#include "cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/DictionaryHelper.h" #include "ui/CocosGUI.h" class CustomParticleWidgetReader : public cocos2d::Ref diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomReader.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomReader.h index 0313256254..17d72afdf5 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomReader.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomReader.h @@ -4,7 +4,7 @@ #define __TestCpp__CustomReader__ #include "extensions/cocos-ext.h" -#include "cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/DictionaryHelper.h" #include "ui/CocosGUI.h" diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp index 2f1b38b23d..d2bc2fa894 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp @@ -1,6 +1,6 @@ #include "GUIEditorTest.h" -#include "cocostudio/ActionTimeline/CSLoader.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" #include "CocoStudioGUITest.h" #include "UIButtonTest/UIButtonTest_Editor.h" diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp index 04075fa575..0fdbbe07a9 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp @@ -1,6 +1,6 @@ #include "UIRichTextTest.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCArmature.h" USING_NS_CC; using namespace cocos2d::ui; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene_Editor.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene_Editor.h index c3afd85cf9..d2f9205d3d 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene_Editor.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene_Editor.h @@ -28,7 +28,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" #include "ui/CocosGUI.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "BaseTest.h" diff --git a/tests/cpp-tests/Classes/UITest/UITest.cpp b/tests/cpp-tests/Classes/UITest/UITest.cpp index 0f9a959587..d975801df9 100644 --- a/tests/cpp-tests/Classes/UITest/UITest.cpp +++ b/tests/cpp-tests/Classes/UITest/UITest.cpp @@ -1,5 +1,5 @@ #include "UITest.h" -#include "cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" #include "CocoStudioGUITest/CocosGUIScene.h" #include "CocoStudioGUITest/GUIEditorTest.h" #include "CocoStudioGUITest/CustomGUIScene.h" diff --git a/tests/cpp-tests/proj.win10/App.xaml.cpp b/tests/cpp-tests/proj.win10/App.xaml.cpp index 6d946b834a..a50611deee 100644 --- a/tests/cpp-tests/proj.win10/App.xaml.cpp +++ b/tests/cpp-tests/proj.win10/App.xaml.cpp @@ -1,5 +1,5 @@ #include "App.xaml.h" -#include "OpenGLESPage.xaml.h" +#include "platform/win8.1-universal/OpenGLESPage.xaml.h" using namespace Platform; using namespace Windows::ApplicationModel; diff --git a/tests/cpp-tests/proj.win10/App.xaml.h b/tests/cpp-tests/proj.win10/App.xaml.h index a5bc0e7f64..ad7c58a00a 100644 --- a/tests/cpp-tests/proj.win10/App.xaml.h +++ b/tests/cpp-tests/proj.win10/App.xaml.h @@ -1,7 +1,7 @@ #pragma once #include "app.g.h" -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" #include "openglespage.xaml.h" namespace CocosAppWinRT diff --git a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj index 3c1f943889..0e746cc958 100644 --- a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj @@ -149,7 +149,7 @@ /Zm384 /bigobj %(AdditionalOptions) 4453;28204;4251;4244;4056;4800; pch.h - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) false ProgramDatabase CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -163,7 +163,7 @@ /Zm384 /bigobj %(AdditionalOptions) 4453;28204;4251;4244;4056; pch.h - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) false false ProgramDatabase @@ -178,7 +178,7 @@ /Zm384 /bigobj %(AdditionalOptions) 4453;28204;4251;4244;4056;4800; pch.h - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) false ProgramDatabase CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -192,7 +192,7 @@ /Zm384 /bigobj %(AdditionalOptions) 4453;28204;4251;4244;4056; pch.h - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) false false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -207,7 +207,7 @@ /Zm384 /bigobj %(AdditionalOptions) 4453;28204;4251;4244;4056;4800; pch.h - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) false ProgramDatabase CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -221,7 +221,7 @@ /Zm384 /bigobj %(AdditionalOptions) 4453;28204;4251;4244;4056; pch.h - ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ..\Classes;%(AdditionalIncludeDirectories) false false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index a18f01c3ea..991c31ec9f 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -71,7 +71,7 @@ Disabled - ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -110,7 +110,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y MaxSpeed true - ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -602,4 +602,4 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - \ No newline at end of file + diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.cpp b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.cpp index 20f89f17de..89dc1dfeb3 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.cpp +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.cpp @@ -1,5 +1,5 @@ #include "App.xaml.h" -#include "OpenGLESPage.xaml.h" +#include "platform/win8.1-universal/OpenGLESPage.xaml.h" using namespace Platform; using namespace Windows::ApplicationModel; diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.h b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.h index c177eab651..a78928eae7 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.h +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/App.xaml.h @@ -1,7 +1,7 @@ #pragma once #include "app.g.h" -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" #include "openglespage.xaml.h" namespace CocosAppWinRT diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj index 41aae4c3d9..f74a0f6ea2 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj @@ -109,7 +109,7 @@ pch.h $(IntDir)pch.pch - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h @@ -131,7 +131,7 @@ pch.h $(IntDir)pch.pch - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h @@ -153,7 +153,7 @@ pch.h $(IntDir)pch.pch - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) /bigobj /Zm200 %(AdditionalOptions) %(DisableSpecificWarnings) pch.h diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj index e04b850c8e..d1644248e6 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj @@ -77,7 +77,7 @@ MSVCRT;%(IgnoreSpecificDefaultLibraries) - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) /bigobj /Zm200 %(AdditionalOptions) /bigobj /Zm200 %(AdditionalOptions) pch.h @@ -102,7 +102,7 @@ MSVCRT;%(IgnoreSpecificDefaultLibraries) - ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ../../Classes;%(AdditionalIncludeDirectories) /bigobj /Zm200 %(AdditionalOptions) /bigobj /Zm200 %(AdditionalOptions) pch.h diff --git a/tests/game-controller-test/proj.ios/AppController.mm b/tests/game-controller-test/proj.ios/AppController.mm index ebbf644bb3..d55cb6fc7f 100644 --- a/tests/game-controller-test/proj.ios/AppController.mm +++ b/tests/game-controller-test/proj.ios/AppController.mm @@ -25,7 +25,7 @@ #import "AppController.h" #import "cocos2d.h" #import "AppDelegate.h" -#import "CCEAGLView-ios.h" +#import "platform/ios/CCEAGLView-ios.h" #import "RootViewController.h" @implementation AppController diff --git a/tests/js-memory-gc-tests/project/Classes/AppDelegate.cpp b/tests/js-memory-gc-tests/project/Classes/AppDelegate.cpp index e35b31fc04..b9d0fec7e9 100644 --- a/tests/js-memory-gc-tests/project/Classes/AppDelegate.cpp +++ b/tests/js-memory-gc-tests/project/Classes/AppDelegate.cpp @@ -1,55 +1,55 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "SimpleAudioEngine.h" -#include "ScriptingCore.h" -#include "jsb_cocos2dx_auto.hpp" -#include "jsb_cocos2dx_extension_auto.hpp" -#include "jsb_cocos2dx_builder_auto.hpp" -#include "jsb_cocos2dx_spine_auto.hpp" -#include "jsb_cocos2dx_3d_auto.hpp" -#include "jsb_cocos2dx_3d_extension_auto.hpp" -#include "jsb_cocos2dx_physics3d_auto.hpp" -#include "physics3d/jsb_cocos2dx_physics3d_manual.h" -#include "jsb_cocos2dx_navmesh_auto.hpp" -#include "navmesh/jsb_cocos2dx_navmesh_manual.h" -#include "3d/jsb_cocos2dx_3d_manual.h" -#include "extension/jsb_cocos2dx_extension_manual.h" -#include "cocostudio/jsb_cocos2dx_studio_manual.h" -#include "jsb_cocos2dx_studio_auto.hpp" -#include "jsb_cocos2dx_ui_auto.hpp" -#include "ui/jsb_cocos2dx_ui_manual.h" -#include "spine/jsb_cocos2dx_spine_manual.h" -#include "cocos2d_specifics.hpp" -#include "cocosbuilder/cocosbuilder_specifics.hpp" -#include "chipmunk/js_bindings_chipmunk_registration.h" -#include "localstorage/js_bindings_system_registration.h" -#include "jsb_opengl_registration.h" -#include "network/XMLHTTPRequest.h" -#include "network/jsb_websocket.h" -#include "network/jsb_socketio.h" -#include "cocosbuilder/js_bindings_ccbreader.h" +#include "audio/include/SimpleAudioEngine.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp" +#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp" +#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.h" +#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h" +#include "scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h" +#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp" +#include "scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h" +#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.h" +#include "scripting/js-bindings/manual/localstorage/js_bindings_system_registration.h" +#include "scripting/js-bindings/manual/jsb_opengl_registration.h" +#include "scripting/js-bindings/manual/network/XMLHTTPRequest.h" +#include "scripting/js-bindings/manual/network/jsb_websocket.h" +#include "scripting/js-bindings/manual/network/jsb_socketio.h" +#include "scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCJavascriptJavaBridge.h" +#include "scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h" #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "platform/ios/JavaScriptObjCBridge.h" +#include "scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h" #endif #include "js_Effect3D_bindings.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "jsb_cocos2dx_experimental_webView_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_webView_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "jsb_cocos2dx_experimental_video_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_video_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "jsb_cocos2dx_audioengine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp" #endif USING_NS_CC; diff --git a/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj b/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj index 7fb7e1ac10..fc59eb33c7 100644 --- a/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj +++ b/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj @@ -81,7 +81,7 @@ Disabled - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -142,7 +142,7 @@ xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y js-tests_p.c - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/tests/js-memory-gc-tests/project/proj.win32/main.h b/tests/js-memory-gc-tests/project/proj.win32/main.h index e29aeedb3a..a17450f556 100644 --- a/tests/js-memory-gc-tests/project/proj.win32/main.h +++ b/tests/js-memory-gc-tests/project/proj.win32/main.h @@ -7,6 +7,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "platform/CCStdC.h" #endif // __WINMAIN_H__ diff --git a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp index 988ffe74de..ddeaa88248 100644 --- a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp +++ b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp @@ -1,5 +1,5 @@ #include "App.xaml.h" -#include "OpenGLESPage.xaml.h" +#include "platform/win8.1-universal/OpenGLESPage.xaml.h" using namespace Platform; using namespace Windows::ApplicationModel; diff --git a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h index c177eab651..a78928eae7 100644 --- a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h +++ b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h @@ -1,7 +1,7 @@ #pragma once #include "app.g.h" -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" #include "openglespage.xaml.h" namespace CocosAppWinRT diff --git a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj index 2cbd6c135d..acf3a9530b 100644 --- a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj +++ b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj @@ -121,7 +121,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -154,7 +154,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase @@ -184,7 +184,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -217,7 +217,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase @@ -247,7 +247,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -278,7 +278,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase diff --git a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj index 07385eb555..fefef7a234 100644 --- a/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj +++ b/tests/js-memory-gc-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj @@ -87,7 +87,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -101,7 +101,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase @@ -112,7 +112,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -126,7 +126,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase diff --git a/tests/js-memory-gc-tests/project/proj.win8.1-universal/resources.props b/tests/js-memory-gc-tests/project/proj.win8.1-universal/resources.props index bee92bbc47..68b78c4a0b 100644 --- a/tests/js-memory-gc-tests/project/proj.win8.1-universal/resources.props +++ b/tests/js-memory-gc-tests/project/proj.win8.1-universal/resources.props @@ -4,7 +4,7 @@ - $(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)external\spidermonkey\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\base;%(AdditionalIncludeDirectories); + $(EngineRoot)external\spidermonkey\include\$(COCOS2D_PLATFORM);%(AdditionalIncludeDirectories); mozjs-33.lib;%(AdditionalDependencies) diff --git a/tests/js-tests/project/Classes/AppDelegate.cpp b/tests/js-tests/project/Classes/AppDelegate.cpp index 83bb966f96..2d349ce7ff 100644 --- a/tests/js-tests/project/Classes/AppDelegate.cpp +++ b/tests/js-tests/project/Classes/AppDelegate.cpp @@ -1,56 +1,56 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "SimpleAudioEngine.h" -#include "ScriptingCore.h" -#include "jsb_cocos2dx_auto.hpp" -#include "jsb_cocos2dx_extension_auto.hpp" -#include "jsb_cocos2dx_builder_auto.hpp" -#include "jsb_cocos2dx_spine_auto.hpp" -#include "jsb_cocos2dx_3d_auto.hpp" -#include "jsb_cocos2dx_3d_extension_auto.hpp" -#include "jsb_cocos2dx_physics3d_auto.hpp" -#include "physics3d/jsb_cocos2dx_physics3d_manual.h" -#include "jsb_cocos2dx_navmesh_auto.hpp" -#include "navmesh/jsb_cocos2dx_navmesh_manual.h" -#include "3d/jsb_cocos2dx_3d_manual.h" -#include "extension/jsb_cocos2dx_extension_manual.h" -#include "cocostudio/jsb_cocos2dx_studio_manual.h" -#include "jsb_cocos2dx_studio_auto.hpp" -#include "jsb_cocos2dx_ui_auto.hpp" -#include "ui/jsb_cocos2dx_ui_manual.h" -#include "spine/jsb_cocos2dx_spine_manual.h" -#include "cocos2d_specifics.hpp" -#include "cocosbuilder/cocosbuilder_specifics.hpp" -#include "chipmunk/js_bindings_chipmunk_registration.h" -#include "localstorage/js_bindings_system_registration.h" -#include "jsb_opengl_registration.h" -#include "network/XMLHTTPRequest.h" -#include "network/jsb_websocket.h" -#include "network/jsb_socketio.h" -#include "cocosbuilder/js_bindings_ccbreader.h" +#include "audio/include/SimpleAudioEngine.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp" +#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp" +#include "scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h" +#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.h" +#include "scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h" +#include "scripting/js-bindings/manual/jsb_opengl_registration.h" +#include "scripting/js-bindings/manual/localstorage/js_bindings_system_registration.h" +#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.h" +#include "scripting/js-bindings/manual/network/XMLHTTPRequest.h" +#include "scripting/js-bindings/manual/network/jsb_socketio.h" +#include "scripting/js-bindings/manual/network/jsb_websocket.h" +#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h" +#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h" +#include "scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h" #include "js_DrawNode3D_bindings.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCJavascriptJavaBridge.h" +#include "scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h" #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "platform/ios/JavaScriptObjCBridge.h" +#include "scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h" #endif #include "js_Effect3D_bindings.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "jsb_cocos2dx_experimental_webView_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_webView_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "jsb_cocos2dx_experimental_video_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_video_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "jsb_cocos2dx_audioengine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp" #endif USING_NS_CC; @@ -69,7 +69,7 @@ AppDelegate::~AppDelegate() void AppDelegate::initGLContextAttrs() { GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8}; - + GLView::setGLContextAttrs(glContextAttrs); } @@ -94,13 +94,13 @@ bool AppDelegate::applicationDidFinishLaunching() sc->addRegisterCallback(register_all_cocos2dx); sc->addRegisterCallback(register_cocos2dx_js_core); sc->addRegisterCallback(jsb_register_system); - + sc->addRegisterCallback(register_all_cocos2dx_extension); sc->addRegisterCallback(register_all_cocos2dx_extension_manual); sc->addRegisterCallback(jsb_register_chipmunk); sc->addRegisterCallback(JSB_register_opengl); - + sc->addRegisterCallback(MinXmlHttpRequest::_js_register); sc->addRegisterCallback(register_jsb_websocket); sc->addRegisterCallback(register_jsb_socketio); @@ -112,20 +112,20 @@ bool AppDelegate::applicationDidFinishLaunching() sc->addRegisterCallback(register_all_cocos2dx_ui_manual); sc->addRegisterCallback(register_all_cocos2dx_studio); sc->addRegisterCallback(register_all_cocos2dx_studio_manual); - + sc->addRegisterCallback(register_all_cocos2dx_spine); sc->addRegisterCallback(register_all_cocos2dx_spine_manual); sc->addRegisterCallback(register_all_cocos2dx_3d); sc->addRegisterCallback(register_all_cocos2dx_3d_manual); - + sc->addRegisterCallback(register_all_cocos2dx_3d_extension); #if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION sc->addRegisterCallback(register_all_cocos2dx_physics3d); sc->addRegisterCallback(register_all_cocos2dx_physics3d_manual); #endif - + #if CC_USE_NAVMESH sc->addRegisterCallback(register_all_cocos2dx_navmesh); sc->addRegisterCallback(register_all_cocos2dx_navmesh_manual); @@ -146,7 +146,7 @@ bool AppDelegate::applicationDidFinishLaunching() sc->addRegisterCallback(register_all_cocos2dx_experimental_video); sc->addRegisterCallback(register_all_cocos2dx_experimental_video_manual); #endif - + #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) sc->addRegisterCallback(register_all_cocos2dx_audioengine); #endif @@ -156,12 +156,12 @@ bool AppDelegate::applicationDidFinishLaunching() #if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0) sc->enableDebugger(); #endif - + auto pEngine = ScriptingCore::getInstance(); ScriptEngineManager::getInstance()->setScriptEngine(pEngine); - + ScriptingCore::getInstance()->runScript("main.js"); - + return true; } @@ -172,7 +172,7 @@ void AppDelegate::applicationDidEnterBackground() director->stopAnimation(); director->getEventDispatcher()->dispatchCustomEvent("game_on_hide"); SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); + SimpleAudioEngine::getInstance()->pauseAllEffects(); } // this function will be called when the app is active again diff --git a/tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp b/tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp index 4046f9abb0..01aaa74dda 100644 --- a/tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp +++ b/tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ #include "cocos2d.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "js_DrawNode3D_bindings.h" NS_CC_BEGIN diff --git a/tests/js-tests/project/Classes/js_Effect3D_bindings.cpp b/tests/js-tests/project/Classes/js_Effect3D_bindings.cpp index 3934d20f19..2d66782fa5 100644 --- a/tests/js-tests/project/Classes/js_Effect3D_bindings.cpp +++ b/tests/js-tests/project/Classes/js_Effect3D_bindings.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "js_Effect3D_bindings.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" using namespace cocos2d; diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj index 7fb7e1ac10..fc59eb33c7 100644 --- a/tests/js-tests/project/proj.win32/js-tests.vcxproj +++ b/tests/js-tests/project/proj.win32/js-tests.vcxproj @@ -81,7 +81,7 @@ Disabled - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -142,7 +142,7 @@ xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y js-tests_p.c - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/tests/js-tests/project/proj.win32/main.h b/tests/js-tests/project/proj.win32/main.h index e29aeedb3a..a17450f556 100644 --- a/tests/js-tests/project/proj.win32/main.h +++ b/tests/js-tests/project/proj.win32/main.h @@ -7,6 +7,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "platform/CCStdC.h" #endif // __WINMAIN_H__ diff --git a/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp b/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp index 988ffe74de..ddeaa88248 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp +++ b/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.cpp @@ -1,5 +1,5 @@ #include "App.xaml.h" -#include "OpenGLESPage.xaml.h" +#include "platform/win8.1-universal/OpenGLESPage.xaml.h" using namespace Platform; using namespace Windows::ApplicationModel; diff --git a/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h b/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h index c177eab651..a78928eae7 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h +++ b/tests/js-tests/project/proj.win8.1-universal/App.Shared/App.xaml.h @@ -1,7 +1,7 @@ #pragma once #include "app.g.h" -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" #include "openglespage.xaml.h" namespace CocosAppWinRT diff --git a/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj b/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj index c687c9b893..c9727322e9 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj +++ b/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj @@ -121,7 +121,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -154,7 +154,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase @@ -184,7 +184,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -218,7 +218,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase @@ -251,7 +251,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -282,7 +282,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase diff --git a/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj b/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj index e8246f254e..565ed9b937 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj +++ b/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj @@ -87,7 +87,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -102,7 +102,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase @@ -116,7 +116,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) ProgramDatabase @@ -131,7 +131,7 @@ /bigobj /Zm200 %(AdditionalOptions) 4800;4101;%(DisableSpecificWarnings) pch.h - $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) ProgramDatabase diff --git a/tests/js-tests/project/proj.win8.1-universal/resources.props b/tests/js-tests/project/proj.win8.1-universal/resources.props index bee92bbc47..68b78c4a0b 100644 --- a/tests/js-tests/project/proj.win8.1-universal/resources.props +++ b/tests/js-tests/project/proj.win8.1-universal/resources.props @@ -4,7 +4,7 @@ - $(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)external\spidermonkey\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\base;%(AdditionalIncludeDirectories); + $(EngineRoot)external\spidermonkey\include\$(COCOS2D_PLATFORM);%(AdditionalIncludeDirectories); mozjs-33.lib;%(AdditionalDependencies) diff --git a/tests/lua-empty-test/project/Classes/AppDelegate.cpp b/tests/lua-empty-test/project/Classes/AppDelegate.cpp index 8d0ac6aeb4..a77f33e044 100644 --- a/tests/lua-empty-test/project/Classes/AppDelegate.cpp +++ b/tests/lua-empty-test/project/Classes/AppDelegate.cpp @@ -2,8 +2,8 @@ #include "AppDelegate.h" #include "audio/include/SimpleAudioEngine.h" #include "base/CCScriptSupport.h" -#include "CCLuaEngine.h" -#include "lua_module_register.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/lua_module_register.h" USING_NS_CC; using namespace CocosDenshion; diff --git a/tests/lua-empty-test/project/Classes/lua_module_register.h b/tests/lua-empty-test/project/Classes/lua_module_register.h index a337e44af0..984cda9c9f 100644 --- a/tests/lua-empty-test/project/Classes/lua_module_register.h +++ b/tests/lua-empty-test/project/Classes/lua_module_register.h @@ -1,7 +1,7 @@ #ifndef __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ #define __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ -#include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" +#include "scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" int lua_module_register(lua_State* L) diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index a61cda40a6..de5dc4a52d 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -81,7 +81,7 @@ Disabled - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRLUASTATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -131,7 +131,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y lua-empty-test_p.c - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRLUASTATIC;%(PreprocessorDefinitions) diff --git a/tests/lua-empty-test/project/proj.win32/main.h b/tests/lua-empty-test/project/proj.win32/main.h index e74708bdf2..095e22791f 100644 --- a/tests/lua-empty-test/project/proj.win32/main.h +++ b/tests/lua-empty-test/project/proj.win32/main.h @@ -8,6 +8,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "platform/CCStdC.h" #endif // __MAIN_H__ diff --git a/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp b/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp index c9fbd7cdfa..f89bc0fa3f 100644 --- a/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp +++ b/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp @@ -2,7 +2,7 @@ #include "AppDelegate.h" #include "audio/include/SimpleAudioEngine.h" #include "base/CCScriptSupport.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp" #include "scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp" diff --git a/tests/lua-game-controller-test/project/proj.ios/AppController.mm b/tests/lua-game-controller-test/project/proj.ios/AppController.mm index c0e2b1820e..ac31cbe827 100644 --- a/tests/lua-game-controller-test/project/proj.ios/AppController.mm +++ b/tests/lua-game-controller-test/project/proj.ios/AppController.mm @@ -24,7 +24,7 @@ #import #import "AppController.h" #import "cocos2d.h" -#import "CCEAGLView-ios.h" +#import "platform/ios/CCEAGLView-ios.h" #import "AppDelegate.h" #import "RootViewController.h" diff --git a/tests/lua-tests/project/Classes/AppDelegate.cpp b/tests/lua-tests/project/Classes/AppDelegate.cpp index 1b7c29ba64..fdbd1795df 100644 --- a/tests/lua-tests/project/Classes/AppDelegate.cpp +++ b/tests/lua-tests/project/Classes/AppDelegate.cpp @@ -1,9 +1,9 @@ #include "cocos2d.h" #include "AppDelegate.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "audio/include/SimpleAudioEngine.h" #include "lua_assetsmanager_test_sample.h" -#include "lua_module_register.h" +#include "scripting/lua-bindings/manual/lua_module_register.h" #include "lua_test_bindings.h" using namespace CocosDenshion; diff --git a/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp index 49bc96c4f5..d91fe7a8a6 100644 --- a/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp +++ b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp @@ -3,7 +3,7 @@ #ifdef __cplusplus extern "C" { #endif -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #ifdef __cplusplus } #endif diff --git a/tests/lua-tests/project/Classes/lua_test_bindings.cpp b/tests/lua-tests/project/Classes/lua_test_bindings.cpp index 413898cdce..9043337a1f 100644 --- a/tests/lua-tests/project/Classes/lua_test_bindings.cpp +++ b/tests/lua-tests/project/Classes/lua_test_bindings.cpp @@ -1,6 +1,6 @@ #include "lua_test_bindings.h" #include "cocos2d.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" NS_CC_BEGIN diff --git a/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm index c54e97ca1a..fe7a10c7f4 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm +++ b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm @@ -1,8 +1,8 @@ #import "LuaObjectCBridgeTest.h" #include "cocos2d.h" -#include "CCLuaEngine.h" -#include "CCLuaBridge.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaBridge.h" using namespace cocos2d; diff --git a/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm index c54e97ca1a..fe7a10c7f4 100644 --- a/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm +++ b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm @@ -1,8 +1,8 @@ #import "LuaObjectCBridgeTest.h" #include "cocos2d.h" -#include "CCLuaEngine.h" -#include "CCLuaBridge.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaBridge.h" using namespace cocos2d; diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 146f580800..b8bf358082 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -68,7 +68,7 @@ - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) Level3 @@ -122,7 +122,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua;$(EngineRoot)external\chipmunk\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)external;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua;$(EngineRoot)external\chipmunk\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) Level3 diff --git a/tests/performance-tests/proj.win32/main.h b/tests/performance-tests/proj.win32/main.h index e74708bdf2..095e22791f 100644 --- a/tests/performance-tests/proj.win32/main.h +++ b/tests/performance-tests/proj.win32/main.h @@ -8,6 +8,6 @@ #include // C RunTime Header Files -#include "CCStdC.h" +#include "platform/CCStdC.h" #endif // __MAIN_H__ diff --git a/tests/performance-tests/proj.win32/performance-tests.vcxproj b/tests/performance-tests/proj.win32/performance-tests.vcxproj index caa4da2400..fa9b678156 100644 --- a/tests/performance-tests/proj.win32/performance-tests.vcxproj +++ b/tests/performance-tests/proj.win32/performance-tests.vcxproj @@ -71,7 +71,7 @@ Disabled - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)extensions;$(EngineRoot);..\Classes;..\Classes\tests;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) + $(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)extensions;$(EngineRoot);..\Classes;..\Classes\tests;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -113,7 +113,7 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y MaxSpeed true - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)extensions;$(EngineRoot);..\Classes;..\Classes\tests;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) + $(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)extensions;$(EngineRoot);..\Classes;..\Classes\tests;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END) WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/tools/bindings-generator b/tools/bindings-generator index 31c68edb40..e5e8311175 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 31c68edb4049208c0770d73fdb051901ee5be496 +Subproject commit e5e8311175935bc38404196fe087bca6d647b5e7 diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index f69b555458..1f335d160d 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -24,7 +24,7 @@ extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s # what headers to parse headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/audio/include/SimpleAudioEngine.h %(cocosdir)s/cocos/2d/CCProtectedNode.h %(cocosdir)s/cocos/base/CCAsyncTaskPool.h %(cocosdir)s/cocos/scripting/js-bindings/manual/component/CCComponentJS.h -replace_headers = CCComponentJS.h::component/CCComponentJS.h +replace_headers = CCComponentJS.h::scripting/js-bindings/manual/component/CCComponentJS.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tojs/cocos2dx_3d.ini b/tools/tojs/cocos2dx_3d.ini index d178272444..1da9496f0f 100644 --- a/tools/tojs/cocos2dx_3d.ini +++ b/tools/tojs/cocos2dx_3d.ini @@ -24,7 +24,7 @@ extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s # what headers to parse headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/3d/CCBundle3D.h -cpp_headers = 3d/jsb_cocos2dx_3d_manual.h +cpp_headers = scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". @@ -70,4 +70,3 @@ abstract_classes = Sprite3DCache # Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. script_control_cpp = yes - diff --git a/tools/tojs/cocos2dx_navmesh.ini b/tools/tojs/cocos2dx_navmesh.ini index c6aeb8e94e..a766c6e85d 100644 --- a/tools/tojs/cocos2dx_navmesh.ini +++ b/tools/tojs/cocos2dx_navmesh.ini @@ -29,7 +29,7 @@ extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s # what headers to parse headers = %(cocosdir)s/cocos/navmesh/CCNavMesh.h -cpp_headers = navmesh/jsb_cocos2dx_navmesh_conversions.h +cpp_headers = scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tojs/cocos2dx_physics3d.ini b/tools/tojs/cocos2dx_physics3d.ini index 3a1ac201aa..c44a0220e6 100644 --- a/tools/tojs/cocos2dx_physics3d.ini +++ b/tools/tojs/cocos2dx_physics3d.ini @@ -29,7 +29,7 @@ extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s # what headers to parse headers = %(cocosdir)s/cocos/physics3d/CCPhysics3D.h -cpp_headers = physics3d/jsb_cocos2dx_physics3d_manual.h +cpp_headers = scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$".