Merge pull request #235 from cocos/v3.5

V3.5
Fix boost link error (#230 )
2022-03-29 17:19:25 +08:00 · 2022-03-21 15:13:05 +08:00 · 2022-03-21 11:00:00 +08:00 · 2022-03-18 15:12:12 +08:00 · 2022-03-15 17:01:22 +08:00 · 2022-03-08 14:38:39 +08:00
11 changed files with 2565 additions and 2558 deletions
@@ -7,6 +7,7 @@ set_target_properties(crypto PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
  IMPORTED_LOCATION ${platform_spec_path}/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
 )

 add_library(jpeg STATIC IMPORTED GLOBAL)
@@ -7,6 +7,7 @@ set_target_properties(crypto PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )

 add_library(jpeg STATIC IMPORTED GLOBAL)
@@ -7,6 +7,7 @@ set_target_properties(crypto PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )

 add_library(jpeg STATIC IMPORTED GLOBAL)
@@ -12,6 +12,7 @@ set_target_properties(curl PROPERTIES
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )

 add_library(glfw3 STATIC IMPORTED GLOBAL)
@@ -1,5 +1,6 @@

-list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS BOOST_ALL_NO_LIB)
+#list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS BOOST_ALL_NO_LIB)
+add_definitions(-DBOOST_ALL_NO_LIB=1)

 set(BOOST_LIB_NAMES
    container
@@ -18,10 +18,10 @@
 #define _OS_TYPES_H

 #ifdef _LOW_ACCURACY_
-#  define X(n) (((((n)>>22)+1)>>1) - ((((n)>>22)+1)>>9))
+#  define TREMOLO_X(n) (((((n)>>22)+1)>>1) - ((((n)>>22)+1)>>9))
 #  define LOOKUP_T const unsigned char
 #else
-#  define X(n) (n)
+#  define TREMOLO_X(n) (n)
 #  define LOOKUP_T const ogg_int32_t
 #endif

@@ -20,6 +20,7 @@ add_library(freetype STATIC IMPORTED GLOBAL)

 set_target_properties(freetype PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/freetype.lib
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )

 add_library(glew32 SHARED IMPORTED GLOBAL)
@@ -20,6 +20,7 @@ add_library(freetype STATIC IMPORTED GLOBAL)

 set_target_properties(freetype PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/freetype.lib
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
 )

 add_library(glew32 SHARED IMPORTED GLOBAL)
Author	SHA1	Message	Date
minggoandGitHub	6a553d5814	Merge pull request #235 from cocos/v3.5 V3.5	2022-03-29 17:19:25 +08:00
minggoandGitHub	30393be332	Fix boost link error (#230 ) * fix boost link error	2022-03-21 15:13:05 +08:00
mmyduckxandGitHub	805b07df7e	recompile freetype 2.6.3 for x64/arm64 mac (#229 )	2022-03-21 11:00:00 +08:00
minggoandGitHub	660590ef8a	reame macro X to TREMOLO_X to fix compiling error, X is not a good name (#228 )	2022-03-18 15:12:12 +08:00
李吉林andGitHub	d2f3382ab5	add freetype (#227 )	2022-03-15 17:01:22 +08:00
minggoandGitHub	a1537c3512	Merge pull request #225 from cocos-creator/v3.5 merge V3.5	2022-03-08 14:38:39 +08:00