[ros-diffs] [dreimer] 68650: [FUSION] Use a static library instead of an objects one. Fix MSVC build. Brought to you by Amine!

Author: dreimer
Date: Sun Aug  9 10:24:37 2015
New Revision: 68650

URL: http://svn.reactos.org/svn/reactos?rev=68650&view=rev
Log:
[FUSION] Use a static library instead of an objects one. Fix MSVC build. Brought to you by
Amine!

Modified:
    trunk/reactos/dll/win32/fusion/CMakeLists.txt
    trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt
    trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt

Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/fusion/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/CMakeLists.txt	[iso-8859-1] Sun Aug  9 10:24:37 2015
@@ -3,7 +3,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(fusion.dll fusion.spec)
 
-list(APPEND SOURCE
+list(APPEND COMMON_SOURCE
     asmcache.c
     asmenum.c
     asmname.c
@@ -12,17 +12,16 @@
     fusionpriv.h
     ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c)
 
-add_library(fusion_lib OBJECT ${SOURCE})
+add_library(fusion_common STATIC ${COMMON_SOURCE})
 
 add_library(fusion SHARED
-    $<TARGET_OBJECTS:fusion_lib>
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
 set_module_type(fusion win32dll)
-target_link_libraries(fusion uuid wine)
+target_link_libraries(fusion fusion_common uuid wine)
 add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
-add_pch(fusion fusionpriv.h SOURCE)
+add_pch(fusion_common fusionpriv.h COMMON_SOURCE)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all)
 

Modified: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_1_…
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt	[iso-8859-1] Sun Aug  9
10:24:37 2015
@@ -3,12 +3,11 @@
 spec2def(fusion.dll fusion.spec)
 
 add_library(fusion_1_1 SHARED
-    $<TARGET_OBJECTS:fusion_lib>
     ${fusion_folder}/version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
 set_module_type(fusion_1_1 win32dll)
-target_link_libraries(fusion_1_1 uuid wine)
+target_link_libraries(fusion_1_1 fusion_common uuid wine)
 set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion")
 add_importlibs(fusion_1_1 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR
all)

Modified: trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_2_…
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt	[iso-8859-1] Sun Aug  9
10:24:37 2015
@@ -3,12 +3,11 @@
 spec2def(fusion.dll fusion.spec)
 
 add_library(fusion_2_0 SHARED
-    $<TARGET_OBJECTS:fusion_lib>
     ${fusion_folder}/version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
 set_module_type(fusion_2_0 win32dll)
-target_link_libraries(fusion_2_0 uuid wine)
+target_link_libraries(fusion_2_0 fusion_common uuid wine)
 set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion")
 add_importlibs(fusion_2_0 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR
all)