[ros-diffs] [akhaldi] 48588: [CMAKE] - Add avicap32, batt and beepmidi to build. - Fix a typo.

Author: akhaldi
Date: Sun Aug 22 00:52:26 2010
New Revision: 48588

URL: http://svn.reactos.org/svn/reactos?rev=48588&view=rev
Log:
[CMAKE]
- Add avicap32, batt and beepmidi to build.
- Fix a typo.

Added:
    branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt   (with props)
    branches/cmake-bringup/dll/win32/batt/CMakeLists.txt   (with props)
    branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt   (with props)
Modified:
    branches/cmake-bringup/dll/win32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt
    branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi…
==============================================================================
--- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010
@@ -5,6 +5,9 @@
 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)

Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived…
==============================================================================
--- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Sun Aug 22
00:52:26 2010
@@ -3,7 +3,7 @@
 
 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)
 

Modified: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack…
==============================================================================
--- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sun Aug 22
00:52:26 2010
@@ -3,7 +3,7 @@
 
 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)
 

Added: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3…
==============================================================================
--- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Sun Aug 22
00:52:26 2010
@@ -1,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)

Propchange: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM…
==============================================================================
--- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26
2010
@@ -1,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)

Propchange: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid…
==============================================================================
--- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Sun Aug 22
00:52:26 2010
@@ -1,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)

Propchange: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native