From ae74f81c45fb97a795019d78541aa1ba7dbd62bb Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 27 Jul 2010 17:09:59 -0500 Subject: [PATCH] Work on build --- CMakeLists.txt | 9 +++++++-- src/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4c11e6..dd306f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,14 @@ if(MSVC) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/msvc-stdint") endif() -# The app is in the "src" subdirectory +# The lib is in the "src" subdirectory add_subdirectory(src) -# Add any more subdirectories to recurse into here. + +# Example apps +add_subdirectory(example) +add_subdirectory(example-sdl) + + ### # Other things you might like to do diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7efbaab..e9e8655 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,7 +33,7 @@ endif() add_library(wiiuse SHARED ${SOURCES} ${API}) if(WIN32) - target_link_libraries(Ws2_32.lib hid.lib + target_link_libraries(Ws2_32.lib hid.lib setupapi.lib) else() target_link_libraries(wiiuse m bluetooth) endif()