Fix compiler warnings in MinGW

This commit is contained in:
Benau 2022-04-09 12:53:20 +08:00
parent 8bbb142394
commit d6a3e48d03
5 changed files with 7 additions and 4 deletions

View File

@ -375,7 +375,7 @@ if(USE_WIIUSE)
if(WIIUSE_BUILD) if(WIIUSE_BUILD)
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse") add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
endif() endif()
include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/wiiuse/src") include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/wiiuse/src/include")
set(WIIUSE_LIBRARIES "wiiuse" "bluetooth") set(WIIUSE_LIBRARIES "wiiuse" "bluetooth")
endif() endif()
endif() endif()

View File

@ -1,4 +1,4 @@
set(_version_file "${CMAKE_CURRENT_SOURCE_DIR}/src/wiiuse.h") set(_version_file "${CMAKE_CURRENT_SOURCE_DIR}/src/include/wiiuse.h")
if(EXISTS "${_version_file}") if(EXISTS "${_version_file}")
file(READ "${_version_file}" _version_contents) file(READ "${_version_file}" _version_contents)
endif() endif()

View File

@ -2,6 +2,9 @@ if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
endif() endif()
# Modified for STK to avoid compiler warnings with MinGW
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
set(SOURCES set(SOURCES
classic.c classic.c
dynamics.c dynamics.c
@ -28,7 +31,7 @@ set(SOURCES
wiiuse_internal.h wiiuse_internal.h
wiiboard.h) wiiboard.h)
set(API set(API
wiiuse.h) include/wiiuse.h)
if(WIN32) if(WIN32)
list(APPEND SOURCES os_win.c) list(APPEND SOURCES os_win.c)
@ -51,7 +54,7 @@ else()
endif() endif()
if(MSVC) if(MSVC)
list(APPEND API wiiuse_msvcstdint.h) list(APPEND API include/wiiuse_msvcstdint.h)
endif() endif()
add_definitions(-DWIIUSE_COMPILE_LIB) add_definitions(-DWIIUSE_COMPILE_LIB)