diff --git a/CMakeLists.txt b/CMakeLists.txt index a8307e3..fd65a0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,6 +245,10 @@ set(SOURCES_CG src/render-cg/image/image_p4_dye.c ) +set(SOURCES_FXASCG + # R61524 driver +) + set(ASSETS_FX src/font5x7.png) set(ASSETS_CG src/font8x9.png) fxconv_declare_assets(${ASSETS_FX} ${ASSETS_CG}) @@ -273,6 +277,17 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50) ${LINKER_SCRIPTS}) endif() +if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G_AS_CG) + add_compile_options(-DFX9860G) + add_compile_definitions(FX9860G_AS_CG) + set(NAME "gint-fxascg") + set(LINKER_SCRIPTS + "${CMAKE_CURRENT_BINARY_DIR}/fxcg50.ld" + "${CMAKE_CURRENT_BINARY_DIR}/fxcg50_fastload.ld") + add_library(gint-fxascg STATIC ${SOURCES_COMMON} ${SOURCES_FX} ${SOURCES_FXASCG} ${ASSETS_FX} + ${LINKER_SCRIPTS}) +endif() + set_target_properties("${NAME}" PROPERTIES OUTPUT_NAME "${NAME}") # Generate linker scripts diff --git a/cmake/FindGint.cmake b/cmake/FindGint.cmake index 89ddd4f..2d765c8 100644 --- a/cmake/FindGint.cmake +++ b/cmake/FindGint.cmake @@ -7,6 +7,10 @@ elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G) set(PC fx) set(INTF_DEFN FX9860G) set(INTF_LINK "-T;fx9860g.ld") +elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G_AS_CG) + set(PC fxascg) + set(INTF_DEFN FX9860G_AS_CG) + set(INTF_LINK "-T;fxcg50.ld") else() message(FATAL_ERROR "gint: unknown fxSDK platform '${FXSDK_PLATFORM}'") endif() diff --git a/giteapc.make b/giteapc.make index 0e04359..c3ef6ce 100644 --- a/giteapc.make +++ b/giteapc.make @@ -5,14 +5,17 @@ configure: @ fxsdk build-fx -c $(GINT_CMAKE_OPTIONS) @ fxsdk build-cg -c $(GINT_CMAKE_OPTIONS) + @ fxsdk build-fx-as-cg -c $(GINT_CMAKE_OPTIONS) build: @ fxsdk build-fx @ fxsdk build-cg + @ fxsdk build-fx-as-cg install: @ fxsdk build-fx install @ fxsdk build-cg install + @ fxsdk build-fx-as-cg install uninstall: @ if [ -e build-fx/install_manifest.txt ]; then \ @@ -21,5 +24,8 @@ uninstall: @ if [ -e build-cg/install_manifest.txt ]; then \ xargs rm -f < build-cg/install_manifest.txt; \ fi + @ if [ -e build-fx-as-cg/install_manifest.txt ]; then \ + xargs rm -f < build-fxascg/install_manifest.txt; \ + fi .PHONY: configure build install uninstall