[CMAKE]

- Add avicap32, batt and beepmidi to build.
- Fix a typo.

svn path=/branches/cmake-bringup/; revision=48588

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index ac88d49..6b2e9fe 100644 (file)
--- 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 ae85b61..183251c 100644 (file)
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FL
 
 add_definitions(-D__WINESRC__)
 
-include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(activeds ${CMAKE_CURRENT_SOURCE_DIR}/activeds.spec ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
 

diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt
index b6b80dc..84e08cf 100644 (file)
--- a/dll/win32/advpack/CMakeLists.txt
+++ b/dll/win32/advpack/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FL
 
 add_definitions(-D__WINESRC__)
 
-include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 file(GLOB_RECURSE SOURCE *.c)
 

diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..11a056d
--- /dev/null
+++ b/dll/win32/avicap32/CMakeLists.txt
@@ -0,0 +1,22 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -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 (file)
index 0000000..b627a4b
--- /dev/null
+++ b/dll/win32/batt/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+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 (file)
index 0000000..fbf4ee2
--- /dev/null
+++ b/dll/win32/beepmidi/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+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)