Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FUSION] Use a static library instead of an objects one. Fix MSVC build. Brought to you by Amine!

Browse source 
svn path=/trunk/; revision=68650
This commit is contained in:
Daniel Reimer 2015-08-09 10:24:37 +00:00
parent c1ae42088e
commit a400ad445b
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/dll/win32/fusion/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(fusion.dll fusion.spec) spec2def(fusion.dll fusion.spec)
list(APPEND SOURCE list(APPEND COMMON_SOURCE
asmcache.c asmcache.c
asmenum.c asmenum.c
asmname.c asmname.c
@ -12,17 +12,16 @@ list(APPEND SOURCE
fusionpriv.h fusionpriv.h
${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c) ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c)
add_library(fusion_lib OBJECT ${SOURCE}) add_library(fusion_common STATIC ${COMMON_SOURCE})
add_library(fusion SHARED add_library(fusion SHARED
$<TARGET_OBJECTS:fusion_lib>
version.rc version.rc
${CMAKE_CURRENT_BINARY_DIR}/fusion.def) ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
set_module_type(fusion win32dll) 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_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/Microsoft.NET/Framework/v1.0.3705 FOR all)
add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all)

3
reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt
View file

@ -3,12 +3,11 @@ set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
spec2def(fusion.dll fusion.spec) spec2def(fusion.dll fusion.spec)
add_library(fusion_1_1 SHARED add_library(fusion_1_1 SHARED
$<TARGET_OBJECTS:fusion_lib>
${fusion_folder}/version.rc ${fusion_folder}/version.rc
${CMAKE_CURRENT_BINARY_DIR}/fusion.def) ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
set_module_type(fusion_1_1 win32dll) 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") set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion")
add_importlibs(fusion_1_1 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) 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) add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)

3
reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt
View file

@ -3,12 +3,11 @@ set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
spec2def(fusion.dll fusion.spec) spec2def(fusion.dll fusion.spec)
add_library(fusion_2_0 SHARED add_library(fusion_2_0 SHARED
$<TARGET_OBJECTS:fusion_lib>
${fusion_folder}/version.rc ${fusion_folder}/version.rc
${CMAKE_CURRENT_BINARY_DIR}/fusion.def) ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
set_module_type(fusion_2_0 win32dll) 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") set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion")
add_importlibs(fusion_2_0 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) 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) add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)