Compile glslang with xcode 12.4 (#277 )

recompile glslang to fix memory leaks on xcode 13.4, x86_64 (#276 )
fix warn : libz.a was build for newer macOS version (12.0) than being linked(11.0) (#275 )
2022-07-29 13:45:30 +08:00 · 2022-07-27 15:46:09 +08:00 · 2022-07-20 11:21:32 +08:00 · 2022-07-13 16:41:44 +08:00 · 2022-07-13 16:39:27 +08:00 · 2022-07-06 18:01:29 +08:00
23 changed files with 14 additions and 8 deletions
@@ -164,21 +164,27 @@ if(CC_EDITOR)
 elseif(USE_SE_V8)
    add_library(v8 SHARED IMPORTED GLOBAL)
    set_target_properties(v8 PROPERTIES
-      IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8.dll
-      IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8.dll.lib
+      IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8.dll
+      IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8.dll.lib
+      IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8.dll
+      IMPORTED_IMPLIB_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8.dll.lib
      INTERFACE_COMPILE_DEFINITIONS V8_COMPRESS_POINTERS
    )

    add_library(v8_libbase SHARED IMPORTED GLOBAL)
    set_target_properties(v8_libbase PROPERTIES
-      IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8_libbase.dll
-      IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8_libbase.dll.lib
+      IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libbase.dll
+      IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libbase.dll.lib
+      IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libbase.dll
+      IMPORTED_IMPLIB_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libbase.dll.lib
    )

    add_library(v8_libplatform SHARED IMPORTED GLOBAL)
    set_target_properties(v8_libplatform PROPERTIES
-      IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8_libplatform.dll
-      IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8_libplatform.dll.lib
+      IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libplatform.dll
+      IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libplatform.dll.lib
+      IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libplatform.dll
+      IMPORTED_IMPLIB_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libplatform.dll.lib
    )

    target_link_libraries(v8 INTERFACE v8_libbase v8_libplatform)
@@ -199,7 +205,7 @@ foreach(gl IN LISTS glslang_libs_name)
  add_library(${gl} STATIC IMPORTED GLOBAL)
  set_target_properties(${gl} PROPERTIES
    IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}d.lib
-    IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
+    IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
  )
 endforeach()

@@ -220,7 +226,7 @@ if(USE_PHYSICS_PHYSX)
    add_library(${PX} STATIC IMPORTED GLOBAL)
    set_target_properties(${PX} PROPERTIES
      IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/debug/${PX}_static_64.lib
-      IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_64.lib
+      IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_64.lib
    )
  endforeach()
 else()
Author	SHA1	Message	Date
timlyeeeandGitHub	9572c7b209	Compile glslang with xcode 12.4 (#277 )	2022-07-29 13:45:30 +08:00
timlyeeeandGitHub	ec0f635f89	recompile glslang to fix memory leaks on xcode 13.4, x86_64 (#276 )	2022-07-27 15:46:09 +08:00
yangchaoandGitHub	9fdaeaa984	fix warn : libz.a was build for newer macOS version (12.0) than being linked(11.0) (#275 )	2022-07-20 11:21:32 +08:00
江战andGitHub	458a4b5473	Merge pull request #274 from cocos/3.6-reduce-warnings 3.6 reduce cmake warning	2022-07-13 16:41:44 +08:00
Patrice Jiang	807419565f	merge windows cfg	2022-07-13 16:39:27 +08:00
timlyeeeandGitHub	c4aa75e909	add v8 in debug version (#273 )	2022-07-06 18:01:29 +08:00