Author: akhaldi Date: Mon Sep 13 13:48:29 2010 New Revision: 48765
URL: http://svn.reactos.org/svn/reactos?rev=48765&view=rev Log: [CMAKE] - Add pci, pcixn pcmcia, videoprt and wmilib to build.
Added: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wmi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt branches/cmake-bringup/drivers/bus/CMakeLists.txt branches/cmake-bringup/drivers/video/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/videoprt.spec
Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeLists... ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -7,3 +7,4 @@ add_subdirectory(setup) add_subdirectory(storage) add_subdirectory(video) +add_subdirectory(wmi)
Modified: branches/cmake-bringup/drivers/bus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/CMakeL... ============================================================================== --- branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,3 +1,6 @@
add_subdirectory(acpi) add_subdirectory(isapnp) +add_subdirectory(pci) +add_subdirectory(pcix) +add_subdirectory(pcmcia)
Added: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/CM... ============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,16 @@ + +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_library(pci SHARED + fdo.c + pci.c + pdo.c + pci.rc) + +set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pci + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(pci psdk bugcodes buildno_header)
Propchange: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/C... ============================================================================== --- branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,50 @@ + +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>") + +list(APPEND SOURCE + arb/ar_busno.c + arb/ar_memio.c + arb/arb_comn.c + arb/tr_irq.c + intrface/agpintrf.c + intrface/busintrf.c + intrface/cardbus.c + intrface/devhere.c + intrface/ideintrf.c + intrface/intrface.c + intrface/lddintrf.c + intrface/locintrf.c + intrface/pmeintf.c + intrface/routintf.c + pci/busno.c + pci/config.c + pci/devhere.c + pci/id.c + pci/ppbridge.c + pci/romimage.c + pci/state.c + debug.c + device.c + dispatch.c + enum.c + fdo.c + guid.c + hookhal.c + init.c + pcivrify.c + pdo.c + power.c + usage.c + utils.c + pci.rc) + +add_library(pcix SHARED ${CMAKE_CURRENT_BINARY_DIR}/pcix_pci.h.gch ${SOURCE}) + +set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pcix + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) +add_dependencies(pcix pcix_def psdk pciclass)
Propchange: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmcia... ============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,16 @@ + +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_library(pcmcia SHARED + fdo.c + pcmcia.c + pdo.c + pcmcia.rc) + +set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pcmcia + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(pcmcia psdk bugcodes buildno_header)
Propchange: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/drivers/video/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/CMak... ============================================================================== --- branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,2 +1,3 @@
add_subdirectory(font) +add_subdirectory(videoprt)
Added: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vide... ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,37 @@ + +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>") + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_definitions(-D_VIDEOPORT_) + +spec2def(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.spec ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def) + +list(APPEND SOURCE + agp.c + ddc.c + dispatch.c + dma.c + event.c + funclist.c + int10.c + interrupt.c + resource.c + services.c + spinlock.c + stubs.c + timer.c + videoprt.c + videoprt.rc) + +add_library(videoprt SHARED ${CMAKE_CURRENT_BINARY_DIR}/videoprt_videoprt.h.gch ${SOURCE}) + +set_target_properties(videoprt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(videoprt + ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) +add_dependencies(videoprt videoprt_def psdk bugcodes buildno_header)
Propchange: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vide... ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -44,9 +44,9 @@ @ stdcall VideoPortGetVgaStatus(ptr ptr) @ stdcall VideoPortInitialize(ptr ptr ptr ptr) @ stdcall VideoPortInt10(ptr ptr) -@ fastcall VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement -@ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange -@ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ stdcall -norelay VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement +@ stdcall -norelay VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange +@ stdcall -norelay VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement @ stdcall VideoPortIsNoVesa() @ stdcall VideoPortLockBuffer(ptr ptr long long) @ stdcall VideoPortLockPages(ptr ptr ptr ptr long)
Added: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMakeL... ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,14 @@ + +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>") + +spec2def(wmilib ${CMAKE_CURRENT_SOURCE_DIR}/wmilib.spec ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) + +add_library(wmilib SHARED wmilib.c wmilib.rc) + +set_target_properties(wmilib PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(wmilib + ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a) + +add_dependencies(wmilib wmilib_def psdk buildno_header bugcodes)
Propchange: branches/cmake-bringup/drivers/wmi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
-
akhaldi＠svn.reactos.org