CMakeLists.txt

@@ -483,6 +483,24 @@ set(FFmpeg_COMPONENTS
     avutil
     swscale)
 
+# This function should be passed a list of all files in a target. It will automatically generate
+# file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
+# one in the filesystem.
+function(create_target_directory_groups target_name)
+    # Place any files that aren't in the source list in a separate group so that they don't get in
+    # the way.
+    source_group("Other Files" REGULAR_EXPRESSION ".")
+
+    get_target_property(target_sources "${target_name}" SOURCES)
+
+    foreach(file_name IN LISTS target_sources)
+        get_filename_component(dir_name "${file_name}" PATH)
+        # Group names use '\' as a separator even though the entire rest of CMake uses '/'...
+        string(REPLACE "/" "\\" group_name "${dir_name}")
+        source_group("${group_name}" FILES "${file_name}")
+    endforeach()
+endfunction()
+
 add_subdirectory(externals)
 
 if (ENABLE_QT)
@@ -656,24 +674,6 @@ endif()
 # Include source code
 # ===================
 
-# This function should be passed a list of all files in a target. It will automatically generate
-# file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
-# one in the filesystem.
-function(create_target_directory_groups target_name)
-    # Place any files that aren't in the source list in a separate group so that they don't get in
-    # the way.
-    source_group("Other Files" REGULAR_EXPRESSION ".")
-
-    get_target_property(target_sources "${target_name}" SOURCES)
-
-    foreach(file_name IN LISTS target_sources)
-        get_filename_component(dir_name "${file_name}" PATH)
-        # Group names use '\' as a separator even though the entire rest of CMake uses '/'...
-        string(REPLACE "/" "\\" group_name "${dir_name}")
-        source_group("${group_name}" FILES "${file_name}")
-    endforeach()
-endfunction()
-
 # Adjustments for MSVC + Ninja
 if (MSVC AND CMAKE_GENERATOR STREQUAL "Ninja")
     add_compile_options(

externals/CMakeLists.txt

@@ -41,13 +41,6 @@ if (ARCHITECTURE_arm64)
     )
     endif()
 
-# Dynarmic
-if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)
-    set(DYNARMIC_IGNORE_ASSERTS ON)
-    add_subdirectory(dynarmic)
-    add_library(dynarmic::dynarmic ALIAS dynarmic)
-endif()
-
 # getopt
 if (MSVC)
     add_subdirectory(getopt)

src/CMakeLists.txt

@@ -6,6 +6,13 @@
 # Enable modules to include each other's files
 include_directories(.)
 
+# Dynarmic
+if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64))
+    set(DYNARMIC_IGNORE_ASSERTS ON)
+    add_subdirectory(dynarmic)
+    add_library(dynarmic::dynarmic ALIAS dynarmic)
+endif()
+
 # CMake seems to only define _DEBUG on Windows
 set_property(DIRECTORY APPEND PROPERTY
     COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)

src/dynarmic/.clang-format

@@ -212,4 +212,3 @@ WhitespaceSensitiveMacros:
   - FCODE
   - ICODE
 ...
-