Author: akhaldi Date: Fri Nov 5 17:29:01 2010 New Revision: 49489
URL: http://svn.reactos.org/svn/reactos?rev=49489&view=rev Log: [CMAKE] - Improve drivers' libs.
Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt
Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CMa... ============================================================================== --- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,35 @@ + add_definitions(-D__NTDRIVER__)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories( + BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include + ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
-file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S) -file(GLOB_RECURSE SOURCE "*.c") +if(ARCH MATCHES i386) +list(APPEND SOURCE network/i386/checksum.S) +endif()
-add_library(ip ${ARCH_SOURCE} ${SOURCE}) +list(APPEND SOURCE + network/address.c + network/arp.c + network/checksum.c + network/icmp.c + network/interface.c + network/ip.c + network/loopback.c + network/neighbor.c + network/ports.c + network/receive.c + network/router.c + network/routines.c + network/transmit.c + transport/datagram/datagram.c + transport/rawip/rawip.c + transport/tcp/accept.c + transport/tcp/event.c + transport/tcp/if.c + transport/tcp/tcp.c + transport/udp/udp.c) + +add_library(ip ${SOURCE}) add_dependencies(ip bugcodes) -
Modified: branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/oskitt... ============================================================================== --- branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,18 +1,51 @@
-include_directories(BEFORE include/freebsd/src/sys) -include_directories(include/freebsd) -include_directories(include/freebsd/sys/include) -include_directories(include/freebsd/dev/include) -include_directories(include/freebsd/net/include) +include_directories( + BEFORE include/freebsd/src/sys + include/freebsd + include/freebsd/sys/include + include/freebsd/dev/include + include/freebsd/net/include + include)
-include_directories(include) +add_definitions( + -D__NTDRIVER__ + -DKERNEL + -DOSKIT)
-add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) -add_definitions(-DOSKIT) - -file(GLOB_RECURSE SOURCE "oskittcp/*.c") +list(APPEND SOURCE + oskittcp/defaults.c + oskittcp/in.c + oskittcp/in_cksum.c + oskittcp/in_pcb.c + oskittcp/in_proto.c + oskittcp/in_rmx.c + oskittcp/inet_ntoa.c + oskittcp/interface.c + oskittcp/ip_input.c + oskittcp/ip_output.c + oskittcp/kern_clock.c + oskittcp/kern_subr.c + oskittcp/osenv.c + oskittcp/param.c + oskittcp/radix.c + oskittcp/random.c + oskittcp/raw_cb.c + oskittcp/raw_ip.c + oskittcp/raw_usrreq.c + oskittcp/route.c + oskittcp/rtsock.c + oskittcp/scanc.c + oskittcp/sleep.c + oskittcp/tcp_input.c + oskittcp/tcp_output.c + oskittcp/tcp_subr.c + oskittcp/tcp_usrreq.c + oskittcp/tcp_debug.c + oskittcp/tcp_timer.c + oskittcp/uipc_domain.c + oskittcp/uipc_mbuf.c + oskittcp/uipc_socket.c + oskittcp/uipc_socket2.c)
add_library(oskittcp ${SOURCE}) add_dependencies(oskittcp bugcodes) -
Modified: branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound/... ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,11 @@
-add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL)
-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-file(GLOB_RECURSE SOURCE "*.c") - -add_library(audioleg ${SOURCE}) +add_library(audioleg devname.c hardware.c) add_dependencies(audioleg bugcodes)
Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound/... ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,6 +1,7 @@
-add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DNDEBUG=1) +add_definitions( + -DUNICODE -D_UNICODE + -DNDEBUG=1)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
Modified: branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound/... ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,10 +1,14 @@
-add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DDEBUG_NT4=1) +add_definitions( + -DUNICODE -D_UNICODE + -DDEBUG_NT4=1)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + detect.c + registry.c + control.c)
add_library(mment4 ${SOURCE}) add_dependencies(mment4 psdk)
Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound/... ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,10 +1,17 @@
-add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DNDEBUG=1) +add_definitions( + -DUNICODE -D_UNICODE + -DNDEBUG=1)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + controls.c + filter.c + mixer.c + sup.c + wave.c + topology.c)
add_library(mmixer ${SOURCE}) add_dependencies(mmixer bugcodes)
Modified: branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound/... ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,9 +1,11 @@
-add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL)
-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
add_library(audio time.c) add_dependencies(audio bugcodes)
Modified: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound/... ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,16 @@
-add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-file(GLOB_RECURSE SOURCE "*.c") +file(APPEND SOURCE + dsp_io.c + version.c + speaker.c + rate.c + mixer.c)
add_library(soundblaster ${SOURCE}) add_dependencies(soundblaster bugcodes) -
Modified: branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound/... ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,9 +1,11 @@
-add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL)
-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
add_library(uartmidi midiuart.c) add_dependencies(uartmidi bugcodes)
-
akhaldi＠svn.reactos.org