all repos — mgba @ 80dc3a8fb74abcb00f2b771e82328e6960da5bc3

mGBA Game Boy Advance Emulator

Wii: Bring Wii port in line with other ports
Jeffrey Pfau jeffrey@endrift.com
Thu, 18 Jun 2015 02:42:23 -0700
commit

80dc3a8fb74abcb00f2b771e82328e6960da5bc3

parent

4f8020dd1f26ad86e1c87df65940c146a564748f

2 files changed, 7 insertions(+), 5 deletions(-)

jump to
M CMakeLists.txt → CMakeLists.txt 
@@ -180,6 +180,12 @@
 	list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-dirent.c)
 	file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/posix/*.c)
 	source_group("POSIX-specific code" FILES ${OS_SRC})
+elseif(WII)
+	list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-file.c)
+	add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5)
+	file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/wii/wii-*.c)
+	list(APPEND OS_LIB fat ogc)
+	source_group("Wii-specific code" FILES ${OS_SRC})
 endif()
 
 if(APPLE)

@@ -203,11 +209,7 @@ endif()
 endif()
 
 if(WII)
-	list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-file.c)
-	add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5)
-	file(GLOB WII_SRC ${CMAKE_SOURCE_DIR}/src/platform/wii/*.c)
-	add_executable(${BINARY_NAME}.elf ${WII_SRC})
-	list(APPEND OS_LIB fat ogc)
+	add_executable(${BINARY_NAME}.elf ${CMAKE_SOURCE_DIR}/src/platform/wii/main.c)
 	target_link_libraries(${BINARY_NAME}.elf ${BINARY_NAME} ${OS_LIB})
 	add_custom_command(TARGET ${BINARY_NAME}.elf POST_BUILD COMMAND ${ELF2DOL} ${BINARY_NAME}.elf ${BINARY_NAME}.dol)
 endif()