[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 1 Oct 2010 21:52:15 +0000 (21:52 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 1 Oct 2010 21:52:15 +0000 (21:52 +0000)
- Add wlanapi, wldap32, ws2_32(_new) and drmk to build. By Alexey Komarov.

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

dll/win32/CMakeLists.txt
dll/win32/wlanapi/CMakeLists.txt [new file with mode: 0644]
dll/win32/wldap32/CMakeLists.txt [new file with mode: 0644]
dll/win32/ws2_32/CMakeLists.txt [new file with mode: 0644]
dll/win32/ws2_32_new/CMakeLists.txt [new file with mode: 0644]
drivers/wdm/audio/CMakeLists.txt
drivers/wdm/audio/drm/CMakeLists.txt [new file with mode: 0644]
drivers/wdm/audio/drm/drmk/CMakeLists.txt [new file with mode: 0644]
importlibs/libws2help.a [new file with mode: 0644]

index 405f80c..6d0e94d 100644 (file)
@@ -209,11 +209,11 @@ add_subdirectory(uxtheme)
 #add_subdirectory(winspool)
 #add_subdirectory(winsta)
 #add_subdirectory(wintrust)
-#add_subdirectory(wlanapi)
-#add_subdirectory(wldap32)
+add_subdirectory(wlanapi)
+add_subdirectory(wldap32)
 #add_subdirectory(wmi)
-#add_subdirectory(ws2_32)
-#add_subdirectory(ws2_32_new)
+add_subdirectory(ws2_32)
+add_subdirectory(ws2_32_new)
 add_subdirectory(ws2help)
 add_subdirectory(wshirda)
 add_subdirectory(wshtcpip)
diff --git a/dll/win32/wlanapi/CMakeLists.txt b/dll/win32/wlanapi/CMakeLists.txt
new file mode 100644 (file)
index 0000000..345dd2c
--- /dev/null
@@ -0,0 +1,17 @@
+
+include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
+
+spec2def(wlanapi ${CMAKE_CURRENT_SOURCE_DIR}/wlanapi.spec ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def)
+
+add_library(wlanapi SHARED main.c)
+
+set_target_properties(wlanapi PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(wlanapi
+    ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def
+    wlansvc_client
+    wine
+    pseh)
+
+add_importlibs(wlanapi kernel32 rpcrt4 ntdll)
+add_dependencies(wlanapi wlanapi_def psdk)
diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ad71bc5
--- /dev/null
@@ -0,0 +1,37 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(wldap32 ${CMAKE_CURRENT_SOURCE_DIR}/wldap32.spec ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def)
+
+add_library(wldap32 SHARED
+    add.c
+    ber.c
+    bind.c
+    compare.c
+    control.c
+    delete.c
+    dn.c
+    error.c
+    extended.c
+    init.c
+    main.c
+    misc.c
+    modify.c
+    modrdn.c
+    option.c
+    page.c
+    parse.c
+    rename.c
+    search.c
+    value.c
+    wldap32.rc)
+
+set_module_type(wldap32 win32dll)
+
+target_link_libraries(wldap32
+     ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def
+     wine)
+
+add_importlibs(wldap32 ntdll user32)
+add_dependencies(wldap32 wldap32_def psdk)
diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3798b30
--- /dev/null
@@ -0,0 +1,35 @@
+
+add_definitions(-DUNICODE -D_UNICODE)
+add_definitions(-DLE)
+add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT)
+
+include_directories(BEFORE include)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
+
+list(APPEND SOURCE
+    ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_ws2_32.h.gch
+    misc/bsd.c
+    misc/catalog.c
+    misc/dllmain.c
+    misc/event.c
+    misc/handle.c
+    misc/ns.c
+    misc/sndrcv.c
+    misc/stubs.c
+    misc/upcall.c
+    misc/async.c
+    ws2_32.rc)
+
+add_library(ws2_32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_ws2_32.h.gch ${SOURCE})
+
+set_module_type(ws2_32 win32dll)
+
+target_link_libraries(ws2_32
+     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def
+     wine)
+
+add_importlibs(ws2_32 ntdll user32 advapi32 dnsapi ws2help)
+add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE})
+add_dependencies(ws2_32 ws2_32_def psdk)
diff --git a/dll/win32/ws2_32_new/CMakeLists.txt b/dll/win32/ws2_32_new/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6549965
--- /dev/null
@@ -0,0 +1,55 @@
+
+add_definitions(-DLE)
+
+include_directories(inc)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
+
+spec2def(ws2_32_new ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def)
+
+add_library(ws2_32_new SHARED
+    src/addrconv.c
+    src/addrinfo.c
+    src/async.c
+    src/bhook.c
+    src/dcatalog.c
+    src/dcatitem.c
+    src/dllmain.c
+    src/dprocess.c
+    src/dprovide.c
+    src/dsocket.c
+    src/dthread.c
+    src/dupsock.c
+    src/enumprot.c
+    src/event.c
+    src/getproto.c
+    src/getxbyxx.c
+    src/ioctl.c
+    src/nscatalo.c
+    src/nscatent.c
+    src/nspinstl.c
+    src/nsprovid.c
+    src/nsquery.c
+    src/qos.c
+    src/qshelpr.c
+    src/rasdial.c
+    src/recv.c
+    src/rnr.c
+    src/scihlpr.c
+    src/select.c
+    src/send.c
+    src/sockctrl.c
+    src/socklife.c
+    src/spinstal.c
+    src/sputil.c
+    src/startup.c
+    src/wsautil.c
+    ws2_32.rc)
+
+set_module_type(ws2_32_new win32dll)
+
+target_link_libraries(ws2_32_new
+     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def
+     wine)
+
+add_importlibs(ws2_32_new ntdll user32 advapi32 dnsapi ws2help)
+add_dependencies(ws2_32_new ws2_32_new_def psdk)
index cd1ff8e..cfd8f9a 100644 (file)
@@ -1,5 +1,6 @@
 
 add_subdirectory(backpln)
+add_subdirectory(drm)
 add_subdirectory(filters)
 add_subdirectory(legacy)
 add_subdirectory(sysaudio)
diff --git a/drivers/wdm/audio/drm/CMakeLists.txt b/drivers/wdm/audio/drm/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5a4d5db
--- /dev/null
@@ -0,0 +1,2 @@
+
+add_subdirectory(drmk)
diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a212023
--- /dev/null
@@ -0,0 +1,12 @@
+
+add_definitions(-DBUILDING_DRMK)
+
+spec2def(drmk ${CMAKE_CURRENT_SOURCE_DIR}/drmk.spec ${CMAKE_CURRENT_BINARY_DIR}/drmk.def)
+
+add_library(drmk SHARED stubs.cpp drmk.rc)
+
+set_target_properties(drmk PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(drmk ${CMAKE_CURRENT_BINARY_DIR}/drmk.def)
+add_importlibs(drmk ntoskrnl)
+add_dependencies(drmk drmk_def psdk bugcodes)
diff --git a/importlibs/libws2help.a b/importlibs/libws2help.a
new file mode 100644 (file)
index 0000000..ccc5ed5
Binary files /dev/null and b/importlibs/libws2help.a differ