diff --git a/src/memu/CMakeLists.txt b/src/memu/CMakeLists.txt index 2a3403d..5ed697d 100644 --- a/src/memu/CMakeLists.txt +++ b/src/memu/CMakeLists.txt @@ -47,7 +47,7 @@ if("${TARGET}" STREQUAL "Pico") elseif("${TARGET}" STREQUAL "XWin") - set (sdl_src + set (xwin_src ${CMAKE_CURRENT_LIST_DIR}/cfx2.c ${CMAKE_CURRENT_LIST_DIR}/common.c ${CMAKE_CURRENT_LIST_DIR}/config.c @@ -98,14 +98,14 @@ elseif("${TARGET}" STREQUAL "XWin") ${SDL2_INCLUDE_DIRS} ) - target_sources(memu_src INTERFACE ${sdl_src}) + target_sources(memu_src INTERFACE ${xwin_src}) else() cmake_minimum_required(VERSION 3.5) project(memu C) - add_executable(memu-x ${sdl_src}) + add_executable(memu-x ${xwin_src}) target_include_directories(memu-x PUBLIC ${CMAKE_CURRENT_LIST_DIR} @@ -242,6 +242,7 @@ elseif("${TARGET}" STREQUAL "RPi") ${CMAKE_CURRENT_LIST_DIR}/txtwin.c ${CMAKE_CURRENT_LIST_DIR}/ui.c ${CMAKE_CURRENT_LIST_DIR}/vdeb.c + ${CMAKE_CURRENT_LIST_DIR}/vdp.c ${CMAKE_CURRENT_LIST_DIR}/vga.c ${CMAKE_CURRENT_LIST_DIR}/vid.c ${CMAKE_CURRENT_LIST_DIR}/win.c diff --git a/src/memu/config.c b/src/memu/config.c index 9994cb2..7c682ef 100644 --- a/src/memu/config.c +++ b/src/memu/config.c @@ -1406,15 +1406,13 @@ static void cfg_save (const char *psConfig) { if ( cfg.rom_fn[rom] != NULL ) fprintf (pfil, "-rom%d \"%s\"\n", rom, PMapMapped (cfg.rom_fn[rom])); } -#ifndef SMALL_MEM - if ( cfg.large_rom != NULL ) - fprintf (pfil, "%s-largerom %s \"%s\"\n", ( cfg.mfx_emu > 0 ? "" : "-no" ), cfg.large_cfg, PMapMapped (cfg.large_rom)); -#endif #ifdef HAVE_CFX2 if ( cfg.rom_cfx2 != NULL ) fprintf (pfil, "%s \"%s\"\n", ( cfg.bCFX2 ? "-cfx2" : "-no-cfx2" ), PMapMapped (cfg.rom_cfx2)); #endif #ifdef HAVE_MFX + if ( cfg.large_rom != NULL ) + fprintf (pfil, "%s-largerom %s \"%s\"\n", ( cfg.mfx_emu > 0 ? "" : "-no" ), cfg.large_cfg, PMapMapped (cfg.large_rom)); if ( cfg.mfx_emu >= MFXEMU_MAX ) { fprintf (pfil, "-mfx-max\n");