windows, pt2

This commit is contained in:
Hoernchen
2013-05-26 22:15:26 +02:00
parent dea06b2732
commit 2200e4c109
3 changed files with 9 additions and 4 deletions

View File

@ -31,12 +31,18 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
cmake_minimum_required(VERSION 2.8)
if(MSVC)
set(THREADS_USE_PTHREADS_WIN32 true)
find_package(Threads REQUIRED)
else()
add_definitions(-Wall)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
endif()
find_package(USB1 REQUIRED)
include_directories(${LIBUSB_INCLUDE_DIR})
include_directories(${LIBUSB_INCLUDE_DIR} ${THREADS_PTHREADS_INCLUDE_DIR})
add_subdirectory(src)

View File

@ -41,7 +41,7 @@ set_target_properties(hackrf PROPERTIES CLEAN_DIRECT_OUTPUT 1)
set_target_properties(hackrf-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
# Dependencies
target_link_libraries(hackrf ${LIBUSB_LIBRARIES} pthread)
target_link_libraries(hackrf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
# For cygwin just force UNIX OFF and WIN32 ON
if( ${CYGWIN} )

View File

@ -25,7 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
#define __HACKRF_H__
#include <stdint.h>
#include <stdbool.h>
#ifdef _WIN32
#define ADD_EXPORTS