Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FUSION]

Browse source 
Addendum to r56176:
Install fusion.dll to 2 more directories.

svn path=/trunk/; revision=56177
This commit is contained in:
Sylvain Petreolle 2012-03-16 22:04:47 +00:00
parent 7a79589a38
commit 090591fa14
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/boot/bootdata/packages/reactos.dff.in
View file

@ -24,7 +24,9 @@ Signature = "$ReactOS$"
8 = media
9 = Microsoft.NET
10 = Microsoft.NET\Framework
11 = Microsoft.NET\Framework\v2.0.50727
11 = Microsoft.NET\Framework\v1.1.4322
12 = Microsoft.NET\Framework\v2.0.50727
13 = Microsoft.NET\Framework\v4.0.30319
.InfEnd

6
reactos/cmake/CMakeMacros.cmake
View file

@ -106,8 +106,12 @@ macro(dir_to_num dir var)
set(${var} 9)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
set(${var} 10)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
set(${var} 11)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
set(${var} 12)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v4.0.30319)
set(${var} 13)
else()
message(ERROR "Wrong destination: ${dir}")
endif()

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

@ -23,4 +23,6 @@ add_library(fusion SHARED ${SOURCE})
set_module_type(fusion win32dll)
target_link_libraries(fusion wine uuid)
add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)
add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)
add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v4.0.30319 FOR all)