[ros-diffs] [tkreuzer] 49839: [CMAKE] add a number of importlin targets and convert to spec

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sun Nov 28 10:19:28 UTC 2010


Author: tkreuzer
Date: Sun Nov 28 10:19:28 2010
New Revision: 49839

URL: http://svn.reactos.org/svn/reactos?rev=49839&view=rev
Log:
[CMAKE]
add a number of importlin targets and convert to spec

Added:
    branches/cmake-bringup/drivers/video/font/ftfd/ftfd.spec   (with props)
Modified:
    branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
    branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt
    branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt
    branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt
    branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt
    branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt
    branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt

Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -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)
+add_cab_target(battc 2)
+add_importlib_target(battc.spec)

Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -1,3 +1,5 @@
+
+spec2def(ks.sys ks.spec)
 
 add_definitions(
     -DBUILDING_KS
@@ -25,7 +27,8 @@
     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_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)
+add_cab_target(ks 2)
+add_importlib_target(ks.spec)

Modified: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -43,3 +43,4 @@
 add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE})
 
 add_cab_target(ndis 2)
+add_importlib_target(ndis.spec)

Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -13,3 +13,4 @@
 
 add_minicd_target(class2 reactos class2.sys)
 add_livecd_target(class2 reactos/system32/drivers)
+add_importlib_target(class2.spec)

Modified: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -14,3 +14,4 @@
 add_importlibs(pciidex ntoskrnl)
 
 add_cab_target(pciidex 2)
+add_importlib_target(pciidex.spec)

Modified: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -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 at 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)
+add_importlib_target(ftfd.spec)

Added: branches/cmake-bringup/drivers/video/font/ftfd/ftfd.spec
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/font/ftfd/ftfd.spec?rev=49839&view=auto
==============================================================================
--- branches/cmake-bringup/drivers/video/font/ftfd/ftfd.spec (added)
+++ branches/cmake-bringup/drivers/video/font/ftfd/ftfd.spec [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -1,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()

Propchange: branches/cmake-bringup/drivers/video/font/ftfd/ftfd.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Sun Nov 28 10:19:28 2010
@@ -30,3 +30,4 @@
 
 add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE})
 add_cab_target(videoprt 2)
+add_importlib_target(videoprt.spec)




More information about the Ros-diffs mailing list