Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FUSION]

Browse source 
Never ever trust the wine file layout.
wine can load a dll when there is no file using builtins, while normal windows dont.
This fixes fusion beeing installed in the wrong places.
Loading the 2nd and 3rd copy of fusion fails atm.

svn path=/trunk/; revision=56453
This commit is contained in:
Sylvain Petreolle 2012-04-30 19:14:43 +00:00
parent a087b26b8c
commit 4755834726
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

6
reactos/cmake/CMakeMacros.cmake
View file

@ -106,11 +106,11 @@ 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/v1.1.4322)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705)
set(${var} 11)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
set(${var} 12)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v4.0.30319)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
set(${var} 13)
else()
message(ERROR "Wrong destination: ${dir}")

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

@ -23,6 +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.0.3705 FOR all)
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)