Author: akhaldi Date: Mon Nov 8 22:57:05 2010 New Revision: 49537
URL: http://svn.reactos.org/svn/reactos?rev=49537&view=rev Log: [CMAKE] - Use pdef files in some dlls.
Added: branches/cmake-bringup/dll/win32/aclui/aclui.pdef (with props) branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef (with props) branches/cmake-bringup/dll/win32/batt/batt.pdef (with props) branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef (with props) branches/cmake-bringup/dll/win32/cards/cards.pdef (with props) branches/cmake-bringup/dll/win32/compstui/compstui.pdef (with props) branches/cmake-bringup/dll/win32/getuname/getuname.pdef (with props) branches/cmake-bringup/dll/win32/localui/localui.pdef (with props) branches/cmake-bringup/dll/win32/lpk/lpk.pdef (with props) Removed: branches/cmake-bringup/dll/win32/aclui/aclui.def branches/cmake-bringup/dll/win32/avicap32/avicap32.def branches/cmake-bringup/dll/win32/batt/batt.def branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def branches/cmake-bringup/dll/win32/cards/cards.def branches/cmake-bringup/dll/win32/getuname/getuname.def branches/cmake-bringup/dll/win32/localui/localui.def branches/cmake-bringup/dll/win32/lpk/lpk.def Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt branches/cmake-bringup/dll/win32/localui/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt
Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit/... ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -4,8 +4,7 @@ list(APPEND SOURCE acledit.c stubs.c - acledit.rc - ) + acledit.rc)
add_library(acledit SHARED ${SOURCE})
Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -9,13 +9,7 @@ guid.c misc.c sidcache.c - aclui.rc - aclui.def) - -if(NOT MSVC) - set_source_files_properties(aclui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() - + aclui.rc)
add_library(aclui SHARED ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch @@ -23,6 +17,9 @@
set_module_type(aclui win32dll)
+set_pdef_file(aclui aclui.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def) + add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll)
add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
Removed: branches/cmake-bringup/dll/win32/aclui/aclui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/ac... ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/aclui.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/aclui.def (removed) @@ -1,7 +1,0 @@ - -LIBRARY aclui.dll - -EXPORTS - CreateSecurityPage@4 @1 - EditSecurity@8 @2 - IID_ISecurityInformation @3 DATA
Added: branches/cmake-bringup/dll/win32/aclui/aclui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/ac... ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/aclui.pdef (added) +++ branches/cmake-bringup/dll/win32/aclui/aclui.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,20 @@ +; File generated automatically, do not edit! + +LIBRARY aclui.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(CreateSecurityPage,STDCALL,4) +_NAME(EditSecurity,STDCALL,8) +_NAME(IID_ISecurityInformation,EXTERN,0) DATA
Propchange: branches/cmake-bringup/dll/win32/aclui/aclui.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap32... ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,13 +1,12 @@
set_unicode()
-add_library(avicap32 SHARED avicap32.c avicap32.rc avicap32.def) - -if(NOT MSVC) - set_source_files_properties(avicap32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(avicap32 SHARED avicap32.c avicap32.rc)
set_module_type(avicap32 win32dll) + +set_pdef_file(avicap32 avicap32.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/avicap32.def)
target_link_libraries(avicap32 wine)
Removed: branches/cmake-bringup/dll/win32/avicap32/avicap32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap32... ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/avicap32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/avicap32.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY avicap32.dll - -EXPORTS - AppCleanup@4 @1 - capCreateCaptureWindowA@32 @2 - capCreateCaptureWindowW@32 @3 - capGetDriverDescriptionA@20 @4 - capGetDriverDescriptionW@20 @5 - videoThunk32@20 @6
Added: branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap32... ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef (added) +++ branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,23 @@ +; File generated automatically, do not edit! + +LIBRARY avicap32.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(AppCleanup,STDCALL,4) +_NAME(capCreateCaptureWindowA,STDCALL,32) +_NAME(capCreateCaptureWindowW,STDCALL,32) +_NAME(capGetDriverDescriptionA,STDCALL,20) +_NAME(capGetDriverDescriptionW,STDCALL,20) +_NAME(videoThunk32,STDCALL,20)
Propchange: branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CMa... ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,13 +1,12 @@
set_unicode()
-add_library(batt SHARED batt.c batt.rc batt.def) - -if(NOT MSVC) - set_source_files_properties(batt.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(batt SHARED batt.c batt.rc)
set_module_type(batt win32dll) + +set_pdef_file(batt batt.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def)
add_importlibs(batt kernel32)
Removed: branches/cmake-bringup/dll/win32/batt/batt.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/bat... ============================================================================== --- branches/cmake-bringup/dll/win32/batt/batt.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/batt.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY batt.dll - -EXPORTS - BatteryClassCoInstaller@16 @1 - BatteryClassInstall@12 @2
Added: branches/cmake-bringup/dll/win32/batt/batt.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/bat... ============================================================================== --- branches/cmake-bringup/dll/win32/batt/batt.pdef (added) +++ branches/cmake-bringup/dll/win32/batt/batt.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,19 @@ +; File generated automatically, do not edit! + +LIBRARY batt.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(BatteryClassCoInstaller,STDCALL,16) +_NAME(BatteryClassInstall,STDCALL,12)
Propchange: branches/cmake-bringup/dll/win32/batt/batt.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmidi... ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,11 +1,10 @@
set_unicode()
-add_library(beepmidi SHARED beepmidi.c beepmidi.def) +add_library(beepmidi SHARED beepmidi.c)
-if(NOT MSVC) - set_source_files_properties(beepmidi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(beepmidi beepmidi.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
set_entrypoint(beepmidi 0)
Removed: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmidi... ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY beepmidi.dll - -EXPORTS - DriverProc@20 @1 - modMessage@20 @2
Added: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmidi... ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef (added) +++ branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,19 @@ +; File generated automatically, do not edit! + +LIBRARY beepmidi.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(DriverProc,STDCALL,20) +_NAME(modMessage,STDCALL,20)
Propchange: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -4,11 +4,10 @@ # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN add_definitions(-DCARDSTYLE_DEFAULT)
-add_library(cards SHARED cards.c cards.rc cards.def) +add_library(cards SHARED cards.c cards.rc)
-if(NOT MSVC) - set_source_files_properties(cards.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(cards cards.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/cards.def)
set_module_type(cards win32dll)
Removed: branches/cmake-bringup/dll/win32/cards/cards.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/ca... ============================================================================== --- branches/cmake-bringup/dll/win32/cards/cards.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/cards.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY cards.dll - -EXPORTS - WEP@4 @1 - cdtAnimate@20 @2 - cdtDraw@24 @3 - cdtDrawExt@32 @4 - cdtInit@8 @5 - cdtTerm@0 @6
Added: branches/cmake-bringup/dll/win32/cards/cards.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/ca... ============================================================================== --- branches/cmake-bringup/dll/win32/cards/cards.pdef (added) +++ branches/cmake-bringup/dll/win32/cards/cards.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,23 @@ +; File generated automatically, do not edit! + +LIBRARY cards.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(WEP,STDCALL,4) +_NAME(cdtAnimate,STDCALL,20) +_NAME(cdtDraw,STDCALL,24) +_NAME(cdtDrawExt,STDCALL,32) +_NAME(cdtInit,STDCALL,8) +_NAME(cdtTerm,STDCALL,0)
Propchange: branches/cmake-bringup/dll/win32/cards/cards.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstui... ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,13 +1,11 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_library(compstui SHARED compstui_main.c compstui.def) +add_library(compstui SHARED compstui_main.c)
-if(NOT MSVC) - set_source_files_properties(compstui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(compstui compstui.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/compstui.def)
set_module_type(compstui win32dll)
Added: branches/cmake-bringup/dll/win32/compstui/compstui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstui... ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/compstui.pdef (added) +++ branches/cmake-bringup/dll/win32/compstui/compstui.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,21 @@ +; File generated automatically, do not edit! + +LIBRARY compstui.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(CommonPropertySheetUIA,STDCALL,16) +_NAME(CommonPropertySheetUIW,STDCALL,16) +_NAME(GetCPSUIUserData,STDCALL,4) +_NAME(SetCPSUIUserData,STDCALL,8)
Propchange: branches/cmake-bringup/dll/win32/compstui/compstui.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getuname... ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -3,11 +3,10 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_library(getuname SHARED getuname.c getuname.rc getuname.def) +add_library(getuname SHARED getuname.c getuname.rc)
-if(NOT MSVC) - set_source_files_properties(getuname.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(getuname getuname.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
set_module_type(getuname win32dll)
Removed: branches/cmake-bringup/dll/win32/getuname/getuname.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getuname... ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/getuname.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/getuname.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY getuname.dll - -EXPORTS - GetUName@8 @1
Added: branches/cmake-bringup/dll/win32/getuname/getuname.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getuname... ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/getuname.pdef (added) +++ branches/cmake-bringup/dll/win32/getuname/getuname.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,18 @@ +; File generated automatically, do not edit! + +LIBRARY getuname.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(GetUName,STDCALL,8)
Propchange: branches/cmake-bringup/dll/win32/getuname/getuname.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui/... ============================================================================== --- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -2,11 +2,10 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_library(localui SHARED localui.c localui.rc localui.def) +add_library(localui SHARED localui.c localui.rc)
-if(NOT MSVC) - set_source_files_properties(localui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(localui localui.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/localui.def)
set_module_type(localui win32dll)
Removed: branches/cmake-bringup/dll/win32/localui/localui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui/... ============================================================================== --- branches/cmake-bringup/dll/win32/localui/localui.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/localui.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY localui.dll - -EXPORTS - InitializePrintMonitorUI@0 @1
Added: branches/cmake-bringup/dll/win32/localui/localui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui/... ============================================================================== --- branches/cmake-bringup/dll/win32/localui/localui.pdef (added) +++ branches/cmake-bringup/dll/win32/localui/localui.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,18 @@ +; File generated automatically, do not edit! + +LIBRARY localui.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(InitializePrintMonitorUI,STDCALL,0)
Propchange: branches/cmake-bringup/dll/win32/localui/localui.pdef ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -4,11 +4,10 @@ add_definitions(-DLANGPACK) include_directories(include)
-add_library(lpk SHARED dllmain.c stub.c lpk.rc lpk.def) +add_library(lpk SHARED dllmain.c stub.c lpk.rc)
-if(NOT MSVC) - set_source_files_properties(lpk.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(lpk lpk.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
set_module_type(lpk win32dll)
Removed: branches/cmake-bringup/dll/win32/lpk/lpk.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/lpk.... ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/lpk.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/lpk.def (removed) @@ -1,15 +1,0 @@ - -LIBRARY lpk.dll - -EXPORTS - LpkInitialize@4 @1 - LpkTabbedTextOut@48 @2 - LpkDllInitialize@12 @3 - LpkDrawTextEx@40 @4 - LpkEditControl @5 DATA - LpkExtTextOut@36 @6 - LpkGetCharacterPlacement@28 @7 - LpkGetTextExtentExPoint@36 @8 - LpkPSMTextOut@24 @9 - LpkUseGDIWidthCache@20 @10 - ftsWordBreak@20 @11
Added: branches/cmake-bringup/dll/win32/lpk/lpk.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/lpk.... ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/lpk.pdef (added) +++ branches/cmake-bringup/dll/win32/lpk/lpk.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,28 @@ +; File generated automatically, do not edit! + +LIBRARY lpk.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(LpkInitialize,STDCALL,4) +_NAME(LpkTabbedTextOut,STDCALL,48) +_NAME(LpkDllInitialize,STDCALL,12) +_NAME(LpkDrawTextEx,STDCALL,40) +_NAME(LpkEditControl,EXTERN,0) DATA +_NAME(LpkExtTextOut,STDCALL,36) +_NAME(LpkGetCharacterPlacement,STDCALL,28) +_NAME(LpkGetTextExtentExPoint,STDCALL,36) +_NAME(LpkPSMTextOut,STDCALL,24) +_NAME(LpkUseGDIWidthCache,STDCALL,20) +_NAME(ftsWordBreak,STDCALL,20)
Propchange: branches/cmake-bringup/dll/win32/lpk/lpk.pdef ------------------------------------------------------------------------------ svn:eol-style = native
-
akhaldi＠svn.reactos.org