Change directories again

LizardByte · Jan 22, 2024 · c5c906c · c5c906c
1 parent b2fceeb
commit c5c906c
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 7 deletions.
diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake
@@ -231,7 +231,7 @@ list(APPEND PLATFORM_TARGET_FILES
         src/platform/linux/misc.cpp
         src/platform/linux/audio.cpp
         src/platform/linux/input.cpp
-        src/display_device/linux/display_device.cpp
+        src/platform/linux/display_device.cpp
         third-party/glad/src/egl.c
         third-party/glad/src/gl.c
         third-party/glad/include/EGL/eglplatform.h

diff --git a/cmake/compile_definitions/macos.cmake b/cmake/compile_definitions/macos.cmake
@@ -37,7 +37,7 @@ set(PLATFORM_TARGET_FILES
         src/platform/macos/nv12_zero_device.cpp
         src/platform/macos/nv12_zero_device.h
         src/platform/macos/publish.cpp
-        src/display_device/macos/display_device.cpp
+        src/platform/macos/display_device.cpp
         third-party/TPCircularBuffer/TPCircularBuffer.c
         third-party/TPCircularBuffer/TPCircularBuffer.h
         ${APPLE_PLIST_FILE})

diff --git a/cmake/compile_definitions/windows.cmake b/cmake/compile_definitions/windows.cmake
@@ -49,9 +49,9 @@ set(PLATFORM_TARGET_FILES
         src/platform/windows/display_vram.cpp
         src/platform/windows/display_ram.cpp
         src/platform/windows/audio.cpp
-        src/display_device/windows/display_device.cpp
-        src/display_device/windows/display_device_utils.h
-        src/display_device/windows/display_device_utils.cpp
+        src/platform/windows/display_device/display_device.cpp
+        src/platform/windows/display_device/display_device_utils.h
+        src/platform/windows/display_device/display_device_utils.cpp
         third-party/ViGEmClient/src/ViGEmClient.cpp
         third-party/ViGEmClient/include/ViGEm/Client.h
         third-party/ViGEmClient/include/ViGEm/Common.h

diff --git a/src/display_device/linux/display_device.cpp → src/platform/linux/display_device.cpp b/src/display_device/linux/display_device.cpp → src/platform/linux/display_device.cpp
diff --git a/src/display_device/macos/display_device.cpp → src/platform/macos/display_device.cpp b/src/display_device/macos/display_device.cpp → src/platform/macos/display_device.cpp
diff --git a/...display_device/windows/display_device.cpp → ...windows/display_device/display_device.cpp b/...display_device/windows/display_device.cpp → ...windows/display_device/display_device.cpp
@@ -2,7 +2,7 @@
 #include <unordered_set>
 
 // local includes
-#include "src/display_device/windows/display_device_utils.h"
+#include "src/platform/windows/display_device/display_device_utils.h"
 #include "src/main.h"
 
 namespace display_device {

diff --git a/...y_device/windows/display_device_utils.cpp → ...s/display_device/display_device_utils.cpp b/...y_device/windows/display_device_utils.cpp → ...s/display_device/display_device_utils.cpp
@@ -3,7 +3,7 @@
 #include <system_error>
 
 // local includes
-#include "src/display_device/windows/display_device_utils.h"
+#include "src/platform/windows/display_device/display_device_utils.h"
 #include "src/main.h"
 
 namespace display_device {

diff --git a/...lay_device/windows/display_device_utils.h → ...ows/display_device/display_device_utils.h b/...lay_device/windows/display_device_utils.h → ...ows/display_device/display_device_utils.h
diff --git a/third-party/nlohmann_json b/third-party/nlohmann_json