From a9f8a122dfb6eef50e2562bda997af0d7e3cde74 Mon Sep 17 00:00:00 2001 From: microcai Date: Fri, 7 Dec 2012 22:48:20 +0800 Subject: [PATCH] add cmake for win32 --- CMakeLists.txt | 4 ++-- linux/CMakeLists.txt | 1 - win32/CMakeLists.txt | 13 +++++++++++++ win32/avcore/CMakeLists.txt | 1 - 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 win32/avcore/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 22d12e8..235efd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,11 +8,11 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) + find_package( Boost 1.51 REQUIRED COMPONENTS thread filesystem) #dont't define this, libbt need depreated api -#add_definitions(-DBOOST_SYSTEM_NO_DEPRECATED) - +include_directories(${Boost_INCLUDE_DIRS}) include_directories(${PROJECT_SOURCE_DIR}) include_directories(libav/) include_directories(source/) diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index c3cef75..1e7f927 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -2,7 +2,6 @@ find_package(SDL REQUIRED) find_package(X11) find_package( Boost 1.51 COMPONENTS filesystem) -include_directories(${Boost_INCLUDE_DIRS}) include_directories(${SDL_INCLUDE_DIR}) add_executable(avplayer player.cpp main.cpp) diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index 8b13789..3477708 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -1 +1,14 @@ +add_executable(avplayer + avplayer/avplayer.rc + avplayer/main.cpp + avcore/avplayer.cpp + avcore/player_impl.cpp + avcore/stdafx.cpp +) + +target_link_libraries(avplayer av avsource avaudio avaudio avvideo) + +if(bt) + target_link_libraries(avplayer torrent-rasterbar) +endif() \ No newline at end of file diff --git a/win32/avcore/CMakeLists.txt b/win32/avcore/CMakeLists.txt deleted file mode 100644 index 8b13789..0000000 --- a/win32/avcore/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -