[Draft] Tidy windows prebuilt folder for win64 support

cmake/Modules/CocosBuildHelpers.cmake

@@ -218,13 +218,15 @@ function(cocos_copy_target_dll cocos_target)
          $<TARGET_FILE_DIR:${cocos_target}>)
 
     # Copy win32 angle binaries
-    add_custom_command(TARGET ${cocos_target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        ${ADXE_ROOT_PATH}/${ADXE_THIRDPARTY_NAME}/angle/prebuilt/win32/libGLESv2.dll
-        ${ADXE_ROOT_PATH}/${ADXE_THIRDPARTY_NAME}/angle/prebuilt/win32/libEGL.dll
-        ${ADXE_ROOT_PATH}/${ADXE_THIRDPARTY_NAME}/angle/prebuilt/win32/d3dcompiler_47.dll
-        $<TARGET_FILE_DIR:${cocos_target}>
-    )
+    if(NOT WIN64)
+        add_custom_command(TARGET ${cocos_target} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            ${ADXE_ROOT_PATH}/${ADXE_THIRDPARTY_NAME}/angle/prebuilt/x86/libGLESv2.dll
+            ${ADXE_ROOT_PATH}/${ADXE_THIRDPARTY_NAME}/angle/prebuilt/x86/libEGL.dll
+            ${ADXE_ROOT_PATH}/${ADXE_THIRDPARTY_NAME}/angle/prebuilt/x86/d3dcompiler_47.dll
+            $<TARGET_FILE_DIR:${cocos_target}>
+        )
+    endif()
 endfunction()
 
 # mark `FILES` as resources, files will be put into sub-dir tree depend on its absolute path

cmake/Modules/CocosConfigDefine.cmake

@@ -12,6 +12,11 @@ endif()
  #LINUX      =   Linux
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set(WINDOWS TRUE)
+    if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win64")
+        set(WIN64 TRUE)
+     else()
+        set(WIN32 TRUE)
+     endif()
     set(PLATFORM_FOLDER win32)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
     set(PLATFORM_FOLDER android)

extensions/x-studio.cmake

@@ -0,0 +1,35 @@
+# x-studio spec extensions
+if(BUILD_EXTENSION_XS_IDE)
+    ## libeditor
+    add_subdirectory(libeditor)
+    if(BUILD_EXTENSION_SPINE)
+        target_compile_definitions(libeditor PUBLIC CC_BUILD_WITH_SPINE=1)
+        if(BUILD_SHARED_LIBS)
+          target_link_libraries(libeditor spine particle3d)
+        else()
+          target_include_directories(libeditor PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/runtime/include)
+        endif()
+    endif()
+
+    ## libccs30
+    add_subdirectory(libccs30)
+    if(BUILD_EXTENSION_DRAGONBONES)
+        target_compile_definitions(libccs30 PRIVATE CC_BUILD_WITH_DRANGBONES=1)
+        if(BUILD_SHARED_LIBS)
+          target_link_libraries(libccs30 DragonBones)
+        endif()
+    endif()
+    target_link_libraries(libccs30 libeditor)
+
+    ## libccs19
+    add_subdirectory(libccs19)
+    target_link_libraries(libccs19 libeditor)
+
+    ## libccs20
+    add_subdirectory(libccs20)
+    target_link_libraries(libccs20 libeditor)
+
+    ## libccs21
+    add_subdirectory(libccs21)
+    target_link_libraries(libccs21 libeditor)
+endif()

thirdparty/cmake/CocosExternalConfig.cmake

@@ -3,6 +3,11 @@
  if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
      set(WINDOWS TRUE)
      set(SYSTEM_STRING "Windows Desktop")
+     if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win64")
+        set(WIN64 TRUE)
+     else()
+        set(WIN32 TRUE)
+     endif()
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
      set(SYSTEM_STRING "Android")
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -32,8 +37,12 @@ elseif(ANDROID)
     set(platform_name android)
     set(platform_spec_path android/${ANDROID_ABI})
 elseif(WINDOWS)
-    set(platform_name win32)
-    set(platform_spec_path win32)
+    set(platform_name windows)
+    if(WIN64)
+        set(platform_spec_path windows/x64)
+    else()
+        set(platform_spec_path windows/x86)
+    endif()
 elseif(MACOSX)
     set(platform_name mac)
     set(platform_spec_path mac)