ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2015-04-01 09:44:23 +11:00
commit 09a70b8aac
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -19,7 +19,7 @@ option(USE_WIIUSE "Support for wiimote input devices" ON)
option(USE_FRIBIDI "Support for right-to-left languages" ON) option(USE_FRIBIDI "Support for right-to-left languages" ON)
option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON) option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
if(MSVC OR MINGW) if(MSVC)
# Normally hide the option to build wiiuse on VS, since it depends # Normally hide the option to build wiiuse on VS, since it depends
# on the installation of the Windows DDK (Driver Developer Kit), # on the installation of the Windows DDK (Driver Developer Kit),
# which also needs an absolute path :( # which also needs an absolute path :(

5
lib/wiiuse/CMakeLists.txt
View File

@ -38,7 +38,7 @@ if(APPLE)
) )
endif() endif()
if(MSVC) if(WIN32)
add_definitions("/DWIIUSE_STATIC") add_definitions("/DWIIUSE_STATIC")
add_library(wiiuse STATIC ${WIIUSE_SOURCES}) add_library(wiiuse STATIC ${WIIUSE_SOURCES})
else() else()
@ -81,5 +81,6 @@ if(MSVC)
else() else()
set_target_properties(wiiuse PROPERTIES STATIC_LIBRARY_FLAGS "setupapi.lib hid.lib") set_target_properties(wiiuse PROPERTIES STATIC_LIBRARY_FLAGS "setupapi.lib hid.lib")
endif() endif()
elseif(MINGW)
target_link_libraries(wiiuse hid setupapi)
endif() endif()

2
lib/wiiuse/os_win.c
View File

@ -48,7 +48,7 @@
# ifdef __cplusplus # ifdef __cplusplus
extern "C" { extern "C" {
# endif # endif
WINHIDSDI BOOL WINAPI HidD_SetOutputReport(HANDLE, PVOID, ULONG); HIDAPI BOOL NTAPI HidD_SetOutputReport(HANDLE, PVOID, ULONG);
# ifdef __cplusplus # ifdef __cplusplus
} }
# endif # endif