Author: spetreolle Date: Fri Mar 16 20:58:54 2012 New Revision: 56176
URL: http://svn.reactos.org/svn/reactos?rev=56176&view=rev Log: [FUSION] Install fusion.dll where it belongs.
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] Fri Mar 16 20:58:54 2012 @@ -22,6 +22,9 @@ 6 = inf 7 = bin 8 = media +9 = Microsoft.NET +10 = Microsoft.NET\Framework +11 = 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] Fri Mar 16 20:58:54 2012 @@ -102,6 +102,12 @@ set(${var} 7) elseif(${dir} STREQUAL reactos/media) set(${var} 8) + elseif(${dir} STREQUAL reactos/Microsoft.NET) + set(${var} 9) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) + set(${var} 10) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) + set(${var} 11) else() message(ERROR "Wrong destination: ${dir}") endif()
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] Fri Mar 16 20:58:54 2012 @@ -23,4 +23,4 @@ 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/system32 FOR all) +add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)