From 7f773550af73e124cf8f775a1a7811ec240fecd2 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 1 Oct 2010 21:52:15 +0000 Subject: [PATCH] [CMAKE] - Add wlanapi, wldap32, ws2_32(_new) and drmk to build. By Alexey Komarov. svn path=/branches/cmake-bringup/; revision=48957 --- dll/win32/CMakeLists.txt | 8 ++-- dll/win32/wlanapi/CMakeLists.txt | 17 +++++++ dll/win32/wldap32/CMakeLists.txt | 37 +++++++++++++++ dll/win32/ws2_32/CMakeLists.txt | 35 ++++++++++++++ dll/win32/ws2_32_new/CMakeLists.txt | 55 ++++++++++++++++++++++ drivers/wdm/audio/CMakeLists.txt | 1 + drivers/wdm/audio/drm/CMakeLists.txt | 2 + drivers/wdm/audio/drm/drmk/CMakeLists.txt | 12 +++++ importlibs/libws2help.a | Bin 0 -> 20152 bytes 9 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 dll/win32/wlanapi/CMakeLists.txt create mode 100644 dll/win32/wldap32/CMakeLists.txt create mode 100644 dll/win32/ws2_32/CMakeLists.txt create mode 100644 dll/win32/ws2_32_new/CMakeLists.txt create mode 100644 drivers/wdm/audio/drm/CMakeLists.txt create mode 100644 drivers/wdm/audio/drm/drmk/CMakeLists.txt create mode 100644 importlibs/libws2help.a diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 405f80c7996..6d0e94d161d 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -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 index 00000000000..345dd2cfcaf --- /dev/null +++ b/dll/win32/wlanapi/CMakeLists.txt @@ -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 index 00000000000..ad71bc5d7ad --- /dev/null +++ b/dll/win32/wldap32/CMakeLists.txt @@ -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 index 00000000000..3798b30a01e --- /dev/null +++ b/dll/win32/ws2_32/CMakeLists.txt @@ -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 index 00000000000..654996527a9 --- /dev/null +++ b/dll/win32/ws2_32_new/CMakeLists.txt @@ -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) diff --git a/drivers/wdm/audio/CMakeLists.txt b/drivers/wdm/audio/CMakeLists.txt index cd1ff8ecb87..cfd8f9addaf 100644 --- a/drivers/wdm/audio/CMakeLists.txt +++ b/drivers/wdm/audio/CMakeLists.txt @@ -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 index 00000000000..5a4d5db0715 --- /dev/null +++ b/drivers/wdm/audio/drm/CMakeLists.txt @@ -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 index 00000000000..a2120230764 --- /dev/null +++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -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 index 0000000000000000000000000000000000000000..ccc5ed58e49eebc7a17c1f235039362ded629c0d GIT binary patch literal 20152 zcmeI4Pm>cx6u{qR7Z%n<5CIWIqkw;^s5r^)Cc6|;L4*RK5Em>wpxNy1ED2qJXn4Li?bg6ue(sIHQf5DZ6>H)tv9aLo8FmD?_$Smt~FQcUbEA#7Ry*t zbG=)O6TrNS?t15zd$!(QZMmm9ZO^^qRp+Iw5$P=Fn%i^RD?zpo?($LwvPTPH8J}#p z8}6rlw|BC;qTaHWg3=#%-L|YGzusA_NViv=m2P^NpkG#O{=q~)?bD(ziq^sto_ zRq3Kys-Fwhi?~fC1*MsOcTcujmwKHQx8HaBie~0y%y+JhwdnDiHnn3!I_5mx-dJ~g zbx(z$UoDoT8jTZTWz?5j?!`{~+?mV#9xiWmyPcj_b(BJ4q_C6^oBbF8L36wqmE-ok zUdPALuZ$~HvQm|?Qdr6eql(>XQdHVcU|l-AT0;CEmaqB1(` z-InXQi|&^jSRvJt+!Urn%G2ufT?5+#@quJ?5y^4;*-dkm-1v0Sg zJUYmOvs75Ed-Z4$mQn@hVPU!7A0h_#NUli*9-a+kC-7tf?@M;9JT5mE#FN~%Xt_!t zH;pIL2Du>Jf6Eo{6$pj3X3O;x{(TH^eQd3MGl=lx<$9uG#|O$LF}aR%Q8H5fj7P~x zbwm1&k5Q;Pzy4UgY{8@$8CECM^5bJvE4m9xCz%{jlZ@I&ASxT9P`Oais4QcRVrK>2 z#M7p-#BKwFJ?w7y6GL&-VkRmnZO}<_g7QHb`b~1Cc#5O;nq(n8uam5PcCa%WW*e;k zhT`a0`@@>o*l6G6F^n2`3S6_=k3%yKwV;qCw)s=iDRhZ;Y8e1v{Ico4<`>;rsr z8patULp;zmi60!Pq33l?zvVNHecghC{61s$8hjpEZP8W6gP7132QjP$6pERybPt?* z%1@4z<`loqegn|c$z!U13>|XN!7y$FCAtoVy5R$wkw$YN<3(G>Wy_v1?$eTp@x8>j zVZ6&pNH62Bkpk#K#!v7F7Up0bkHok^b!E&Fm7b7r$CB`cqGrW^#0Pko6-thi^E)2#TnW;sDPwXUrd-@^$vPsw08X}08t7|k-}XZ;vD`=Oq$!$b>nEh zW0uos{=qCKXnqr0%$DZeM04EKHe(>Ybia-FPcEeU5|3bE4!*-9(H&O>$_(#N!GxB) zV#j{DtXuMX$ip!9Ka-f*O!k+h>&CI)GRtY~-!jVy_V;0X+Oq#bz`i`8i}};sV|j&f zE%QF_$Iu}M*D(xum(|u7*Af$QUAE;~pI6DaJ}kJVx3n$Sy8^D2mBVy%{VL&$F0|vv zcmxY`(8OcFwW7At1vf6IChe`vS(2Ugy;&P^!!1^g1lfBq)t2m?0oh_bE!|Yx_PvQ) zp|WPG)s%#Gde)NWiav9a+393<`gx+6Ek`SRGg96EILMxL*-jt#W9X0rTDT%Rt*fnI z9g&=n?HOCP^}cnswiB{F%G%BjV%xAkh*OZ>@ucm%w?TEKClZyOkZ{}8%WU480EDQ% z$SCvP(?od07PhogZaeQCp}ze#zodO{+m*}(eWoy5=Ls!(9znJ3dq2l{kJwC^?tb`T zdSKCoqsxzY1PgO;7mw6yIo*y>-+oJKQsS*wHgO9)bF^2GuiazYFoa%o1 z5ufjn_zMd0U;D&ItFItGL@Zga#<5-9%&a_XyQp4G9#d_t{C38C)L!>z!^+2Q;uo8< z;-wN2Z@B_m&Sqg^i63RQd>aw3e|V8<>ux&>qpPh9QX`TRvTeJ zZP!Dy9W1fDkFtYh3*%k=CX)(Jvt75{!D9N_RCLabi3z#3T^XIz=Nhv;w&BdnD0^%t z7}w!8AW0G6Cp9o4v>*SeS$F@hEI|R28V5ZX!NbGNE0!T@B6bI%~TpVb{k5{qjcXbQ3?4 zU6<9?Dc4dHl5M-{Ij8qnvc7j{*GJi73xaI1uQb);$(Mbr9olj6Q3