Merge pull request #2133 from MikuAuahDark/nativefile-sdl

Replace NativeFile to use SDL IO functions.
love2d · Jan 14, 2025 · 176a3c1 · 176a3c1
2 parents 5ac9b2f + 0589245
commit 176a3c1
Show file tree

Hide file tree

Showing 4 changed files with 280 additions and 136 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1962,7 +1962,7 @@ love_group_projects(NAME "liblove" NESTED TARGETS ${LIBLOVE_DEPENDENCIES})
 love_group_projects(NAME "liblove/libraries" NESTED TARGETS ${LIBLOVE_LIBRARIES})
 love_group_projects(NAME "liblove" TARGETS liblove ${LOVE_EXTRA_DEPENDECIES})
 
-love_group_projects(NAME "lovedep" TARGETS lovedep::SDL3 lovedep::Freetype lovedep::Harfbuzz lovedep::OpenAL lovedep::Modplug lovedep::Theora lovedep::Vorbis lovedep::Ogg lovedep::Zlib lovedep::Lua)
+love_group_projects(NAME "lovedep" TARGETS lovedep::SDL lovedep::Freetype lovedep::Harfbuzz lovedep::OpenAL lovedep::Modplug lovedep::Theora lovedep::Vorbis lovedep::Ogg lovedep::Zlib lovedep::Lua)
 love_group_projects(NAME "lovedep" TARGETS lua51 alcommon al-excommon harfbuzz-subset zlib)
 
 

diff --git a/extra/cmake/LoveMacros.cmake b/extra/cmake/LoveMacros.cmake
@@ -16,6 +16,12 @@ function(love_group_projects)
 				foreach(TARGET_LIB ${TARGET_LIBS})
 					# Is this a target? (Could also be a .lib file)
 					if (TARGET ${TARGET_LIB})
+						# Resolve aliased target
+						get_target_property(ORIGINAL_TARGET ${TARGET_LIB} ALIASED_TARGET)
+						if (ORIGINAL_TARGET)
+							set(TARGET_LIB ${ORIGINAL_TARGET})
+						endif()
+
 						# Do we want to nest per-project?
 						if (LOVE_GROUP_NESTED)
 							set_target_properties(${TARGET_LIB} PROPERTIES FOLDER "${LOVE_GROUP_NAME}/${TARGET_NAME}")