Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-17 17:35:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BOOTDATA][CMAKE] Enumerate the four first installation directories in 'canonical' order, to keep compatibility with Windows' txtsetup.sif/layout.inf.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-01-07 01:46:31 +01:00
parent 8468ad5cf4
commit 287d35b84d
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,10 +17,10 @@ Signature = "$ReactOS$"
; For specifying absolute directories, use the SystemPartitionFiles section, ; For specifying absolute directories, use the SystemPartitionFiles section,
; or use names starting with \. ; or use names starting with \.
[Directories] [Directories]
1 = system32 1 = "\"
2 = system32\drivers 2 = system32
3 = Fonts 3 = system32\drivers
4 = "\" 4 = Fonts
5 = system32\drivers\etc 5 = system32\drivers\etc
6 = inf 6 = inf
7 = bin 7 = bin

13
sdk/cmake/CMakeMacros.cmake
View file

@ -162,14 +162,19 @@ function(add_link)
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk PROPERTIES GENERATED TRUE) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk PROPERTIES GENERATED TRUE)
endfunction() endfunction()
#
# WARNING!
# Please keep the numbering in this list in sync with
# boot/bootdata/packages/reactos.dff.in
#
macro(dir_to_num dir var) macro(dir_to_num dir var)
if(${dir} STREQUAL reactos/system32) if(${dir} STREQUAL reactos)
set(${var} 1) set(${var} 1)
elseif(${dir} STREQUAL reactos/system32/drivers) elseif(${dir} STREQUAL reactos/system32)
set(${var} 2) set(${var} 2)
elseif(${dir} STREQUAL reactos/Fonts) elseif(${dir} STREQUAL reactos/system32/drivers)
set(${var} 3) set(${var} 3)
elseif(${dir} STREQUAL reactos) elseif(${dir} STREQUAL reactos/Fonts)
set(${var} 4) set(${var} 4)
elseif(${dir} STREQUAL reactos/system32/drivers/etc) elseif(${dir} STREQUAL reactos/system32/drivers/etc)
set(${var} 5) set(${var} 5)