Fix Android compile error.

This commit is contained in:
Miku AuahDark
2022-03-05 13:25:03 +08:00
parent 7e97e2f28f
commit 4f30818c90
3 changed files with 37 additions and 0 deletions
+6
View File
@@ -75,9 +75,15 @@ endif()
if(MODPLUG_BUILD_STATIC) if(MODPLUG_BUILD_STATIC)
add_library(modplug-static STATIC ${MODPLUG_SRC}) add_library(modplug-static STATIC ${MODPLUG_SRC})
target_include_directories(modplug-static PUBLIC src src/libmodplug ${CMAKE_CURRENT_BINARY_DIR}) 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() endif()
if(MODPLUG_BUILD_SHARED) if(MODPLUG_BUILD_SHARED)
add_library(modplug SHARED ${MODPLUG_SRC}) add_library(modplug SHARED ${MODPLUG_SRC})
target_include_directories(modplug PUBLIC src src/libmodplug ${CMAKE_CURRENT_BINARY_DIR}) 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() endif()
+6
View File
@@ -13,9 +13,15 @@ set(OGG_SRC
if(OGG_BUILD_STATIC) if(OGG_BUILD_STATIC)
add_library(ogg-static STATIC ${OGG_SRC}) add_library(ogg-static STATIC ${OGG_SRC})
target_include_directories(ogg-static PUBLIC include) target_include_directories(ogg-static PUBLIC include)
if(ANDROID)
target_include_directories(ogg-static PUBLIC android)
endif()
endif() endif()
if(OGG_BUILD_SHARED) if(OGG_BUILD_SHARED)
add_library(ogg SHARED ${OGG_SRC} win32/ogg.def) add_library(ogg SHARED ${OGG_SRC} win32/ogg.def)
target_include_directories(ogg PUBLIC include) target_include_directories(ogg PUBLIC include)
if(ANDROID)
target_include_directories(ogg PUBLIC android)
endif()
endif() endif()
@@ -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