[ros-diffs] [spetreolle] 56177: [FUSION] Addendum to r56176: Install fusion.dll to 2 more directories.

[spetreolle at svn.reactos.org]

Author: spetreolle
Date: Fri Mar 16 22:04:47 2012
New Revision: 56177

URL: http://svn.reactos.org/svn/reactos?rev=56177&view=rev
Log:
[FUSION]
Addendum to r56176:
Install fusion.dll to 2 more directories.

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/reactos.dff.in?rev=56177&r1=56176&r2=56177&view=diff
==============================================================================
--- 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 22:04:47 2012
@@ -24,7 +24,9 @@
 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
 

Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev=56177&r1=56176&r2=56177&view=diff
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Mar 16 22:04:47 2012
@@ -106,8 +106,12 @@
         set(${var} 9)
     elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
         set(${var} 10)
+    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} 11)
+        set(${var} 12)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v4.0.30319)
+        set(${var} 13)
     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.txt?rev=56177&r1=56176&r2=56177&view=diff
==============================================================================
--- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Fri Mar 16 22:04:47 2012
@@ -23,4 +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.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)