Skip to content

Commit

Permalink
Merge pull request #46 from Pokechu22/misc-cleanup
Browse files Browse the repository at this point in the history
Misc cleanup
  • Loading branch information
Pokechu22 authored Apr 20, 2022
2 parents 328faf9 + af5a13c commit 2967cdc
Show file tree
Hide file tree
Showing 77 changed files with 28,331 additions and 1,127 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ link_directories(${DEVKITPRO}/libogc/lib/wii)

set(MACHDEP "-DGEKKO -mrvl -mcpu=750 -meabi -mhard-float")

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set(CMAKE_ASM_FLAGS "-x assembler-with-cpp")
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${MACHDEP}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MACHDEP} -fdiagnostics-color")
set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-function -O2 ${CMAKE_CXX_FLAGS} ${MACHDEP}")
set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-function -O2 ${CMAKE_CXX_FLAGS} ${MACHDEP} -fdiagnostics-color")
set(CMAKE_EXECUTABLE_SUFFIX ".elf")

add_custom_target(run)
Expand All @@ -28,14 +28,15 @@ function(add_hwtest)
set(executable_name ${add_hwtest_MODULE}_${add_hwtest_TEST})

add_executable(${executable_name} ${add_hwtest_FILES})
target_link_libraries(${executable_name} hwtests_common wiiuse bte fat ogc m)
target_link_libraries(${executable_name} hwtests_common fmt::fmt wiiuse bte fat ogc m)
add_custom_target(run_${executable_name} sh ${CMAKE_SOURCE_DIR}/run.sh ${executable_name}${CMAKE_EXECUTABLE_SUFFIX})
add_dependencies(run_${executable_name} ${executable_name})
add_dependencies(run run_${executable_name})
endfunction()

include_directories(./)

add_subdirectory(Externals/fmt EXCLUDE_FROM_ALL)
add_subdirectory(common)
add_subdirectory(cputest)
add_subdirectory(gxtest)
Expand Down
Loading

0 comments on commit 2967cdc

Please sign in to comment.