reame macro X to TREMOLO_X to fix compiling error, X is not a good name (#228)

merge V3.5

android/CMakeLists.txt

@@ -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)

ios-m1-simulator/CMakeLists.txt

@@ -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)

ios/CMakeLists.txt

@@ -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)

mac/CMakeLists.txt

@@ -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)

sources/tremolo/Tremolo/os_types.h

@@ -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
 

win32/CMakeLists.txt

@@ -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)

win64/CMakeLists.txt

@@ -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)