From 7fdcb2e5d983f5932812d2a3d02d2efca3327023 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 22 Aug 2010 00:52:26 +0000 Subject: [PATCH] [CMAKE] - Add avicap32, batt and beepmidi to build. - Fix a typo. svn path=/branches/cmake-bringup/; revision=48588 --- dll/win32/CMakeLists.txt | 3 +++ dll/win32/activeds/CMakeLists.txt | 2 +- dll/win32/advpack/CMakeLists.txt | 2 +- dll/win32/avicap32/CMakeLists.txt | 22 ++++++++++++++++++++++ dll/win32/batt/CMakeLists.txt | 18 ++++++++++++++++++ dll/win32/beepmidi/CMakeLists.txt | 18 ++++++++++++++++++ 6 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 dll/win32/avicap32/CMakeLists.txt create mode 100644 dll/win32/batt/CMakeLists.txt create mode 100644 dll/win32/beepmidi/CMakeLists.txt diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index ac88d49cbfe..6b2e9fe08d1 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -5,6 +5,9 @@ add_subdirectory(activeds) add_subdirectory(advapi32) add_subdirectory(advpack) add_subdirectory(authz) +add_subdirectory(avicap32) +add_subdirectory(batt) +add_subdirectory(beepmidi) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt index ae85b61e9be..183251c5b7d 100644 --- a/dll/win32/activeds/CMakeLists.txt +++ b/dll/win32/activeds/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(avicap32 ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.spec ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) + +add_library(avicap32 SHARED + ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.c + ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.rc) + +set_target_properties(avicap32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(avicap32 + ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + wine + mingw_common + -lversion) + +add_dependencies(avicap32 avicap32_def psdk) diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt new file mode 100644 index 00000000000..b627a4b72f4 --- /dev/null +++ b/dll/win32/batt/CMakeLists.txt @@ -0,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(batt ${CMAKE_CURRENT_SOURCE_DIR}/batt.spec ${CMAKE_CURRENT_BINARY_DIR}/batt.def) + +add_library(batt SHARED + ${CMAKE_CURRENT_SOURCE_DIR}/batt.c + ${CMAKE_CURRENT_SOURCE_DIR}/batt.rc) + +set_target_properties(batt PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(batt + ${CMAKE_CURRENT_BINARY_DIR}/batt.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + +add_dependencies(batt batt_def psdk) diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt new file mode 100644 index 00000000000..fbf4ee2e515 --- /dev/null +++ b/dll/win32/beepmidi/CMakeLists.txt @@ -0,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(beepmidi ${CMAKE_CURRENT_SOURCE_DIR}/beepmidi.spec ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) + +add_library(beepmidi SHARED beepmidi.c) + +set_target_properties(beepmidi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(beepmidi + ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(beepmidi beepmidi_def psdk)