Author: cfinck
Date: Tue May 12 14:56:54 2015
New Revision: 67694
URL: http://svn.reactos.org/svn/reactos?rev=67694&view=rev
Log:
- Fix the importlib order for the GNU linker according to Amine's suggestion.
- Add PSEH for winspool.
Modified:
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt
Modified:
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt?rev=67694&r1=67693&r2=67694&view=diff
==============================================================================
---
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt
[iso-8859-1] (original)
+++
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt
[iso-8859-1] Tue May 12 14:56:54 2015
@@ -14,6 +14,6 @@
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)
Modified:
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt?rev=67694&r1=67693&r2=67694&view=diff
==============================================================================
---
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt
[iso-8859-1] (original)
+++
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt
[iso-8859-1] Tue May 12 14:56:54 2015
@@ -14,6 +14,6 @@
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)
Modified:
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt?rev=67694&r1=67693&r2=67694&view=diff
==============================================================================
---
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt
[iso-8859-1] (original)
+++
branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt
[iso-8859-1] Tue May 12 14:56:54 2015
@@ -16,7 +16,7 @@
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)
