浏览代码

Fix Android compile error.

Miku AuahDark 3 年之前
父节点
当前提交
4f30818c90

+ 6 - 0
libs/libmodplug-0.8.8.4/CMakeLists.txt

@@ -75,9 +75,15 @@ endif()
 if(MODPLUG_BUILD_STATIC)
 	add_library(modplug-static STATIC ${MODPLUG_SRC})
 	target_include_directories(modplug-static PUBLIC src src/libmodplug ${CMAKE_CURRENT_BINARY_DIR})
+	if(ANDROID)
+		target_compile_definitions(modplug-static PUBLIC HAVE_SETENV HAVE_SINF)
+	endif()
 endif()
 
 if(MODPLUG_BUILD_SHARED)
 	add_library(modplug SHARED ${MODPLUG_SRC})
 	target_include_directories(modplug PUBLIC src src/libmodplug ${CMAKE_CURRENT_BINARY_DIR})
+	if(ANDROID)
+		target_compile_definitions(modplug PUBLIC HAVE_SETENV HAVE_SINF)
+	endif()
 endif()

+ 6 - 0
libs/libogg-1.3.2/CMakeLists.txt

@@ -13,9 +13,15 @@ set(OGG_SRC
 if(OGG_BUILD_STATIC)
 	add_library(ogg-static STATIC ${OGG_SRC})
 	target_include_directories(ogg-static PUBLIC include)
+	if(ANDROID)
+		target_include_directories(ogg-static PUBLIC android)
+	endif()
 endif()
 
 if(OGG_BUILD_SHARED)
 	add_library(ogg SHARED ${OGG_SRC} win32/ogg.def)
 	target_include_directories(ogg PUBLIC include)
+	if(ANDROID)
+		target_include_directories(ogg PUBLIC android)
+	endif()
 endif()

+ 25 - 0
libs/libogg-1.3.2/android/ogg/config_types.h

@@ -0,0 +1,25 @@
+#ifndef __CONFIG_TYPES_H__
+#define __CONFIG_TYPES_H__
+
+/* these are filled in by configure */
+#define INCLUDE_INTTYPES_H 1
+#define INCLUDE_STDINT_H 1
+#define INCLUDE_SYS_TYPES_H 1
+
+#if INCLUDE_INTTYPES_H
+#  include <inttypes.h>
+#endif
+#if INCLUDE_STDINT_H
+#  include <stdint.h>
+#endif
+#if INCLUDE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+typedef int16_t ogg_int16_t;
+typedef uint16_t ogg_uint16_t;
+typedef int32_t ogg_int32_t;
+typedef uint32_t ogg_uint32_t;
+typedef int64_t ogg_int64_t;
+
+#endif