Author: spetreolle Date: Mon Apr 30 19:14:43 2012 New Revision: 56453
URL: http://svn.reactos.org/svn/reactos?rev=56453&view=rev Log: [FUSION] 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.
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/dll/win32/fusion/CMakeLists.txt
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reac... ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Mon Apr 30 19:14:43 2012 @@ -24,9 +24,9 @@ 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
Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev... ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Apr 30 19:14:43 2012 @@ -106,11 +106,11 @@ set(${var} 9) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) set(${var} 10) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705) + set(${var} 11) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322) - set(${var} 11) + set(${var} 12) 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}")
Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Mon Apr 30 19:14:43 2012 @@ -23,6 +23,6 @@ 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)