[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Mon, 8 Nov 2010 22:57:05 +0000 (22:57 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Mon, 8 Nov 2010 22:57:05 +0000 (22:57 +0000)
- Use pdef files in some dlls.

svn path=/branches/cmake-bringup/; revision=49537

27 files changed:
dll/win32/acledit/CMakeLists.txt
dll/win32/aclui/CMakeLists.txt
dll/win32/aclui/aclui.def [deleted file]
dll/win32/aclui/aclui.pdef [new file with mode: 0644]
dll/win32/avicap32/CMakeLists.txt
dll/win32/avicap32/avicap32.def [deleted file]
dll/win32/avicap32/avicap32.pdef [new file with mode: 0644]
dll/win32/batt/CMakeLists.txt
dll/win32/batt/batt.def [deleted file]
dll/win32/batt/batt.pdef [new file with mode: 0644]
dll/win32/beepmidi/CMakeLists.txt
dll/win32/beepmidi/beepmidi.def [deleted file]
dll/win32/beepmidi/beepmidi.pdef [new file with mode: 0644]
dll/win32/cards/CMakeLists.txt
dll/win32/cards/cards.def [deleted file]
dll/win32/cards/cards.pdef [new file with mode: 0644]
dll/win32/compstui/CMakeLists.txt
dll/win32/compstui/compstui.pdef [new file with mode: 0644]
dll/win32/getuname/CMakeLists.txt
dll/win32/getuname/getuname.def [deleted file]
dll/win32/getuname/getuname.pdef [new file with mode: 0644]
dll/win32/localui/CMakeLists.txt
dll/win32/localui/localui.def [deleted file]
dll/win32/localui/localui.pdef [new file with mode: 0644]
dll/win32/lpk/CMakeLists.txt
dll/win32/lpk/lpk.def [deleted file]
dll/win32/lpk/lpk.pdef [new file with mode: 0644]

index e99e698..af6252f 100644 (file)
@@ -4,8 +4,7 @@ set_unicode()
 list(APPEND SOURCE
     acledit.c
     stubs.c
-    acledit.rc
-    )
+    acledit.rc)
 
 add_library(acledit SHARED ${SOURCE})
 
index ca00b83..2cf6d96 100644 (file)
@@ -9,13 +9,7 @@ list(APPEND SOURCE
     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 @@ add_library(aclui SHARED
 
 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})
diff --git a/dll/win32/aclui/aclui.def b/dll/win32/aclui/aclui.def
deleted file mode 100644 (file)
index e439f48..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LIBRARY aclui.dll
-
-EXPORTS
-  CreateSecurityPage@4 @1
-  EditSecurity@8 @2
-  IID_ISecurityInformation @3 DATA
diff --git a/dll/win32/aclui/aclui.pdef b/dll/win32/aclui/aclui.pdef
new file mode 100644 (file)
index 0000000..9ffc762
--- /dev/null
@@ -0,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
index 0b01e0c..f75d829 100644 (file)
@@ -1,14 +1,13 @@
 
 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)
 
 add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll)
diff --git a/dll/win32/avicap32/avicap32.def b/dll/win32/avicap32/avicap32.def
deleted file mode 100644 (file)
index 330c561..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-LIBRARY avicap32.dll
-
-EXPORTS
-  AppCleanup@4 @1
-  capCreateCaptureWindowA@32 @2
-  capCreateCaptureWindowW@32 @3
-  capGetDriverDescriptionA@20 @4
-  capGetDriverDescriptionW@20 @5
-  videoThunk32@20 @6
diff --git a/dll/win32/avicap32/avicap32.pdef b/dll/win32/avicap32/avicap32.pdef
new file mode 100644 (file)
index 0000000..8e812eb
--- /dev/null
@@ -0,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)
index ca1b26a..3e93140 100644 (file)
@@ -1,14 +1,13 @@
 
 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)
 
 add_cab_target(batt 1)
diff --git a/dll/win32/batt/batt.def b/dll/win32/batt/batt.def
deleted file mode 100644 (file)
index af6ca40..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-LIBRARY batt.dll
-
-EXPORTS
-  BatteryClassCoInstaller@16 @1
-  BatteryClassInstall@12 @2
diff --git a/dll/win32/batt/batt.pdef b/dll/win32/batt/batt.pdef
new file mode 100644 (file)
index 0000000..78775e6
--- /dev/null
@@ -0,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)
index c703e8a..dc9a371 100644 (file)
@@ -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)
 
diff --git a/dll/win32/beepmidi/beepmidi.def b/dll/win32/beepmidi/beepmidi.def
deleted file mode 100644 (file)
index 95f73cb..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-LIBRARY beepmidi.dll
-
-EXPORTS
-  DriverProc@20 @1
-  modMessage@20 @2
diff --git a/dll/win32/beepmidi/beepmidi.pdef b/dll/win32/beepmidi/beepmidi.pdef
new file mode 100644 (file)
index 0000000..dd84210
--- /dev/null
@@ -0,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)
index 8a5c496..4c8227b 100644 (file)
@@ -4,11 +4,10 @@ set_unicode()
 # 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)
 
diff --git a/dll/win32/cards/cards.def b/dll/win32/cards/cards.def
deleted file mode 100644 (file)
index 68d20d9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-LIBRARY cards.dll
-
-EXPORTS
-  WEP@4 @1
-  cdtAnimate@20 @2
-  cdtDraw@24 @3
-  cdtDrawExt@32 @4
-  cdtInit@8 @5
-  cdtTerm@0 @6
diff --git a/dll/win32/cards/cards.pdef b/dll/win32/cards/cards.pdef
new file mode 100644 (file)
index 0000000..e6c19e9
--- /dev/null
@@ -0,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)
index 57b5fc0..f2f6dd8 100644 (file)
@@ -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)
 
diff --git a/dll/win32/compstui/compstui.pdef b/dll/win32/compstui/compstui.pdef
new file mode 100644 (file)
index 0000000..cac0069
--- /dev/null
@@ -0,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)
index 1c0b82a..5921701 100644 (file)
@@ -3,11 +3,10 @@ set_unicode()
 
 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)
 
diff --git a/dll/win32/getuname/getuname.def b/dll/win32/getuname/getuname.def
deleted file mode 100644 (file)
index 94633d8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LIBRARY getuname.dll
-
-EXPORTS
-  GetUName@8 @1
diff --git a/dll/win32/getuname/getuname.pdef b/dll/win32/getuname/getuname.pdef
new file mode 100644 (file)
index 0000000..d483b4e
--- /dev/null
@@ -0,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)
index e825cc7..724571d 100644 (file)
@@ -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)
 
diff --git a/dll/win32/localui/localui.def b/dll/win32/localui/localui.def
deleted file mode 100644 (file)
index c11e9f3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LIBRARY localui.dll
-
-EXPORTS
-  InitializePrintMonitorUI@0 @1
diff --git a/dll/win32/localui/localui.pdef b/dll/win32/localui/localui.pdef
new file mode 100644 (file)
index 0000000..d43bb60
--- /dev/null
@@ -0,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)
index 1400bd9..febd777 100644 (file)
@@ -4,11 +4,10 @@ set_unicode()
 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)
 
diff --git a/dll/win32/lpk/lpk.def b/dll/win32/lpk/lpk.def
deleted file mode 100644 (file)
index e557576..0000000
+++ /dev/null
@@ -1,15 +0,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
diff --git a/dll/win32/lpk/lpk.pdef b/dll/win32/lpk/lpk.pdef
new file mode 100644 (file)
index 0000000..afe6479
--- /dev/null
@@ -0,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)