diff options
| author | Anton Fedchin <anightik@gmail.com> | 2018-02-09 11:20:50 +0300 |
|---|---|---|
| committer | Anton Fedchin <anightik@gmail.com> | 2018-02-09 11:20:50 +0300 |
| commit | 8983601254af0c7fab3740431a27a997c8c57ce8 (patch) | |
| tree | f53e390f637624edcc23b077d09467742f42558f /cmake | |
| parent | c713854d7b4ec20153f53730bd068f51686d1272 (diff) | |
[windows] move IRSS classes to win32 platform.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/windowsstore/ArchSetup.cmake | 2 | ||||
| -rw-r--r-- | cmake/treedata/windows/subdirs.txt | 10 | ||||
| -rw-r--r-- | cmake/treedata/windowsstore/subdirs.txt | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake index 84fc1947f5..b73b12e0c6 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -66,7 +66,7 @@ set(SYSTEM_DEFINES -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>) # Additional SYSTEM_DEFINES -list(APPEND SYSTEM_DEFINES -DHAS_IRSERVERSUITE -DHAS_WIN10_NETWORK) +list(APPEND SYSTEM_DEFINES -DHAS_WIN10_NETWORK) # The /MP option enables /FS by default. set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /ZW /EHsc /await") diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt index 83443202a9..b08283fcb4 100644 --- a/cmake/treedata/windows/subdirs.txt +++ b/cmake/treedata/windows/subdirs.txt @@ -1,5 +1,5 @@ -xbmc/platform/win32 platform_win32 -xbmc/input/windows input/windows +xbmc/platform/win32 platform/win32 +xbmc/platform/win32/input platworm/win32/input xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/network/windows network/windows @@ -8,9 +8,9 @@ xbmc/peripherals/bus/win32 peripherals/bus/win32 xbmc/powermanagement/windows powermanagement/windows xbmc/storage/windows storage/windows xbmc/filesystem/win32 filesystem/win32 -xbmc/utils/win32 utils_win32 -xbmc/rendering/dx rendering_dx -xbmc/threads/platform/win threads_win +xbmc/utils/win32 utils/win32 +xbmc/rendering/dx rendering/dx +xbmc/threads/platform/win threads/win xbmc/windowing/windows windowing/windows xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt index 84150d52c7..d683ad620f 100644 --- a/cmake/treedata/windowsstore/subdirs.txt +++ b/cmake/treedata/windowsstore/subdirs.txt @@ -1,5 +1,4 @@ xbmc/platform/win10 platform_win10 -xbmc/input/windows input/windows xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/network/win10 network/win10 |