Merge pull request #173 from PatriceJiang/3.3-fix-bindings

Rename vars
move tea to ccutils
2021-08-11 14:50:17 +08:00 · 2021-08-11 14:48:23 +08:00 · 2021-08-06 10:25:24 +08:00 · 2021-08-06 10:19:40 +08:00 · 2021-08-05 15:42:41 +08:00 · 2021-08-05 14:55:13 +08:00
71 changed files with 21 additions and 115 deletions
@@ -16,18 +16,17 @@ set(CC_TINYDIR_SOURCES
  ${CMAKE_CURRENT_LIST_DIR}/tinydir/tinydir.h
 )

-set(CC_FS_SOURCES
+set(CC_UTILS_SOURCES
  ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c
  ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h
  ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTFWrapper.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
 )


 set(CC_EXTERNAL_SOURCES

-  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
-  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
-
  ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.c
  ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h
 )
@@ -195,61 +195,14 @@ endif()

 ############################# glslang #############################

-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib
-)
-
-add_library(glslang SHARED IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
-)
-
-add_library(glslang-default-resource-limits SHARED IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
-)
-
-add_library(SPIRV SHARED IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.dll 
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib
-)
-
-add_library(SPVRemapper SHARED IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+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
+  )
+endforeach()

 ############################# TBB #############################

@@ -272,6 +225,8 @@ set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)

 list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)

+######################## PhysX ##############################
+
 if(USE_PHYSICS_PHYSX)
  set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
  foreach(PX IN LISTS PhysXSDK)
@@ -195,62 +195,14 @@ endif()

 ############################# glslang #############################

-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib
-)
-
-add_library(glslang SHARED IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
-)
-
-add_library(glslang-default-resource-limits SHARED IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
-)
-
-add_library(SPIRV SHARED IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.dll 
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib
-)
-
-add_library(SPVRemapper SHARED IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
-
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+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
+  )
+endforeach()
 ############################# TBB #############################

 add_library(tbb SHARED IMPORTED GLOBAL)
Author	SHA1	Message	Date
江战andGitHub	303041611f	Merge pull request #173 from PatriceJiang/3.3-fix-bindings Rename vars	2021-08-11 14:50:17 +08:00
Arnold	866613b6dd	move tea to ccutils	2021-08-11 14:48:23 +08:00
江战andGitHub	29c1e7be47	Merge pull request #171 from timlyeee/v3d-gfx-arm64 add x86_64 glslang for ios	2021-08-06 10:25:24 +08:00
LX	f1aa69a54d	add x86_64 glslang for ios	2021-08-06 10:19:40 +08:00
江战andGitHub	b0dcf214d6	Merge pull request #170 from timlyeee/v3d-gfx-arm64 add glslang arm64 libs and lipo together	2021-08-05 15:42:41 +08:00
LX	064445e8a5	add glslang arm64 libs and lipo together	2021-08-05 14:55:13 +08:00
timlyeeeandGitHub	1129f869f0	recreate glslang static libs (#169 ) * recreate glslang static libs * re-add glslang static libs * delete opt libs as it's too larg, also modified cmake list * keep unified glslang version 11.5.0 * (no branch):	2021-08-04 17:45:38 +08:00