From: Timo Kreuzer Date: Sun, 28 Nov 2010 10:19:28 +0000 (+0000) Subject: [CMAKE] X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~395 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b46aa6630595f2faa5bda11679d39645e5444f3d [CMAKE] add a number of importlin targets and convert to spec svn path=/branches/cmake-bringup/; revision=49839 --- diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt index f921abf547b..ac2e45cb606 100644 --- a/drivers/battery/battc/CMakeLists.txt +++ b/drivers/battery/battc/CMakeLists.txt @@ -1,9 +1,15 @@ add_definitions(-D_BATTERYCLASS_) -add_library(battc SHARED battc.c battc.rc) +spec2def(batc.sys battc.spec) + +add_library(battc SHARED + battc.c + battc.rc + ${CMAKE_CURRENT_BINARY_DIR}/battc.def) set_module_type(battc kernelmodedriver) add_importlibs(battc ntoskrnl hal) -add_cab_target(battc 2) \ No newline at end of file +add_cab_target(battc 2) +add_importlib_target(battc.spec) \ No newline at end of file diff --git a/drivers/ksfilter/ks/CMakeLists.txt b/drivers/ksfilter/ks/CMakeLists.txt index b5d0d34a56d..d2d6c71fa9f 100644 --- a/drivers/ksfilter/ks/CMakeLists.txt +++ b/drivers/ksfilter/ks/CMakeLists.txt @@ -1,4 +1,6 @@ +spec2def(ks.sys ks.spec) + add_definitions( -DBUILDING_KS -D_COMDDK_) @@ -25,7 +27,8 @@ add_library(ks SHARED unknown.c worker.c kcom.c - ks.rc) + ks.rc + ${CMAKE_CURRENT_BINARY_DIR}/ks.def) set_target_properties(ks PROPERTIES SUFFIX ".sys") set_entrypoint(ks 0) @@ -33,10 +36,10 @@ set_subsystem(ks native) set_image_base(ks 0x00010000) target_link_libraries(ks - ${CMAKE_CURRENT_SOURCE_DIR}/ks.def ${PSEH_LIB}) add_importlibs(ks ntoskrnl hal msvcrt) add_dependencies(ks psdk bugcodes) -add_cab_target(ks 2) \ No newline at end of file +add_cab_target(ks 2) +add_importlib_target(ks.spec) \ No newline at end of file diff --git a/drivers/network/ndis/CMakeLists.txt b/drivers/network/ndis/CMakeLists.txt index 8c3e2e98608..16263ac4112 100644 --- a/drivers/network/ndis/CMakeLists.txt +++ b/drivers/network/ndis/CMakeLists.txt @@ -43,3 +43,4 @@ add_importlibs(ndis ntoskrnl hal) add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) add_cab_target(ndis 2) +add_importlib_target(ndis.spec) diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt index d41c52a5c9b..2791ec5df02 100644 --- a/drivers/storage/class/class2/CMakeLists.txt +++ b/drivers/storage/class/class2/CMakeLists.txt @@ -13,3 +13,4 @@ add_importlibs(class2 scsiport ntoskrnl hal) add_minicd_target(class2 reactos class2.sys) add_livecd_target(class2 reactos/system32/drivers) +add_importlib_target(class2.spec) diff --git a/drivers/storage/ide/pciidex/CMakeLists.txt b/drivers/storage/ide/pciidex/CMakeLists.txt index 852e44db688..c7280cefefa 100644 --- a/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/drivers/storage/ide/pciidex/CMakeLists.txt @@ -14,3 +14,4 @@ set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) add_cab_target(pciidex 2) +add_importlib_target(pciidex.spec) diff --git a/drivers/video/font/ftfd/CMakeLists.txt b/drivers/video/font/ftfd/CMakeLists.txt index 0755b8feea4..a666c4bd3b3 100644 --- a/drivers/video/font/ftfd/CMakeLists.txt +++ b/drivers/video/font/ftfd/CMakeLists.txt @@ -1,22 +1,24 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) +spec2def(ftfd.dll ftfd.spec) + add_library(ftfd SHARED enable.c font.c glyph.c rosglue.c - sprintf.c) + sprintf.c + ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) set_entrypoint(ftfd FtfdEnableDriver@12) set_subsystem(ftfd native) target_link_libraries(ftfd - ${CMAKE_CURRENT_SOURCE_DIR}/freetype.def freetype libcntpr) add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cab_target(ftfd 1) -add_importlib_target(ftfd.spec) \ No newline at end of file +add_importlib_target(ftfd.spec) diff --git a/drivers/video/font/ftfd/ftfd.spec b/drivers/video/font/ftfd/ftfd.spec new file mode 100644 index 00000000000..cad62a10367 --- /dev/null +++ b/drivers/video/font/ftfd/ftfd.spec @@ -0,0 +1,56 @@ + + @ cdecl FT_Bitmap_Convert() + @ cdecl FT_Bitmap_Done() + @ cdecl FT_Bitmap_New() + @ cdecl FT_Done_Face() + @ cdecl FT_Done_Glyph() + @ cdecl FT_Get_Char_Index() + @ cdecl FT_Get_First_Char() + @ cdecl FT_Get_Glyph() + @ cdecl FT_Get_Kerning() + @ cdecl FT_Get_Next_Char() + @ cdecl FT_Get_PS_Font_Info() + @ cdecl FT_Get_Sfnt_Table() + @ cdecl FT_Get_WinFNT_Header() + @ cdecl FT_Glyph_To_Bitmap() + @ cdecl FT_Init_FreeType() + @ cdecl FT_Load_Glyph() + @ cdecl FT_Load_Sfnt_Table() + @ cdecl FT_Matrix_Multiply() + @ cdecl FT_MulFix() + @ cdecl FT_New_Memory_Face() + @ cdecl FT_Outline_Get_Bitmap() + @ cdecl FT_Outline_Transform() + @ cdecl FT_Outline_Translate() + @ cdecl FT_Set_Charmap() + @ cdecl FT_Set_Pixel_Sizes() + @ cdecl FT_Vector_Transform() + @ cdecl FT_Vector_Unit() + + @ cdecl FT_Bitmap_Convert() + @ cdecl FT_Bitmap_Done() + @ cdecl FT_Bitmap_New() + @ cdecl FT_Done_Face() + @ cdecl FT_Done_Glyph() + @ cdecl FT_Get_Char_Index() + @ cdecl FT_Get_First_Char() + @ cdecl FT_Get_Glyph() + @ cdecl FT_Get_Kerning() + @ cdecl FT_Get_Next_Char() + @ cdecl FT_Get_PS_Font_Info() + @ cdecl FT_Get_Sfnt_Table() + @ cdecl FT_Get_WinFNT_Header() + @ cdecl FT_Glyph_To_Bitmap() + @ cdecl FT_Init_FreeType() + @ cdecl FT_Load_Glyph() + @ cdecl FT_Load_Sfnt_Table() + @ cdecl FT_Matrix_Multiply() + @ cdecl FT_MulFix() + @ cdecl FT_New_Memory_Face() + @ cdecl FT_Outline_Get_Bitmap() + @ cdecl FT_Outline_Transform() + @ cdecl FT_Outline_Translate() + @ cdecl FT_Set_Charmap() + @ cdecl FT_Set_Pixel_Sizes() + @ cdecl FT_Vector_Transform() + @ cdecl FT_Vector_Unit() diff --git a/drivers/video/videoprt/CMakeLists.txt b/drivers/video/videoprt/CMakeLists.txt index 54a52de4642..492ca51edea 100644 --- a/drivers/video/videoprt/CMakeLists.txt +++ b/drivers/video/videoprt/CMakeLists.txt @@ -30,3 +30,4 @@ add_importlibs(videoprt ntoskrnl hal) add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) add_cab_target(videoprt 2) +add_importlib_target(videoprt.spec)