- Fix the importlib order for the GNU linker according to Amine's suggestion.

- Add PSEH for winspool.

svn path=/branches/colins-printing-for-freedom/; revision=67694

diff --git a/reactos/win32ss/printing/base/spoolss/CMakeLists.txt b/reactos/win32ss/printing/base/spoolss/CMakeLists.txt
index 98d0ae9..024e51d 100644 (file)
--- a/reactos/win32ss/printing/base/spoolss/CMakeLists.txt
+++ b/reactos/win32ss/printing/base/spoolss/CMakeLists.txt
@@ -14,6 +14,6 @@ add_library(spoolss SHARED
 
 set_module_type(spoolss win32dll UNICODE)
 target_link_libraries(spoolss wine)
 
 set_module_type(spoolss win32dll UNICODE)
 target_link_libraries(spoolss wine)

-add_importlibs(spoolss msvcrt kernel32 advapi32 ntdll)
+add_importlibs(spoolss advapi32 msvcrt kernel32 ntdll)

 add_pch(spoolss precomp.h SOURCE)
 add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)
 add_pch(spoolss precomp.h SOURCE)
 add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)

diff --git a/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt b/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt
index a8c55a4..62d7030 100644 (file)
--- a/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt
+++ b/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt
@@ -14,6 +14,6 @@ add_executable(spoolsv ${SOURCE} spoolsv.rc)
 set_module_type(spoolsv win32cui UNICODE)
 target_link_libraries(spoolsv wine)
 add_delay_importlibs(spoolsv spoolss)
 set_module_type(spoolsv win32cui UNICODE)
 target_link_libraries(spoolsv wine)
 add_delay_importlibs(spoolsv spoolss)

-add_importlibs(spoolsv msvcrt kernel32 advapi32 ntdll rpcrt4)
+add_importlibs(spoolsv advapi32 rpcrt4 msvcrt kernel32 ntdll)

 add_pch(spoolsv precomp.h SOURCE)
 add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all)
 add_pch(spoolsv precomp.h SOURCE)
 add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all)

diff --git a/reactos/win32ss/printing/base/winspool/CMakeLists.txt b/reactos/win32ss/printing/base/winspool/CMakeLists.txt
index f3ab3da..670959e 100644 (file)
--- a/reactos/win32ss/printing/base/winspool/CMakeLists.txt
+++ b/reactos/win32ss/printing/base/winspool/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(winspool SHARED
 
 set_target_properties(winspool PROPERTIES SUFFIX ".drv")
 set_module_type(winspool win32dll UNICODE)
 
 set_target_properties(winspool PROPERTIES SUFFIX ".drv")
 set_module_type(winspool win32dll UNICODE)

-target_link_libraries(winspool wine)
-add_importlibs(winspool kernel32 msvcrt ntdll rpcrt4)
+target_link_libraries(winspool wine ${PSEH_LIB})
+add_importlibs(winspool rpcrt4 msvcrt kernel32 ntdll)

 add_pch(winspool precomp.h SOURCE)
 add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all)
 add_pch(winspool precomp.h SOURCE)
 add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all)