ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

All: Rearrange some directories to make more sense

This commit is contained in:
Jeffrey Pfau 2016-05-04 01:28:30 -07:00
parent df8cddb289
commit 93e5b6da7b
43 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -39,21 +39,20 @@ file(GLOB GBA_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/*.c)
file(GLOB GB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/*.c) file(GLOB GB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/*.c)
file(GLOB GBA_CHEATS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/cheats/*.c) file(GLOB GBA_CHEATS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/cheats/*.c)
file(GLOB GBA_RR_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/rr/*.c) file(GLOB GBA_RR_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/rr/*.c)
file(GLOB GBA_SV_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/supervisor/*.c) file(GLOB GBA_EXTRA_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/extra/*.c)
file(GLOB GBA_CTX_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/context/*.c)
file(GLOB UTIL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/*.[cSs] ${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.c) file(GLOB UTIL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/*.[cSs] ${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.c)
file(GLOB GUI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/gui/*.c ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/gui/*.c) file(GLOB GUI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/gui/*.c ${CMAKE_CURRENT_SOURCE_DIR}/src/feature/gui/*.c)
file(GLOB GBA_RENDERER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/renderers/*.c) file(GLOB GBA_RENDERER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/renderers/*.c)
file(GLOB SIO_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/sio/lockstep.c) file(GLOB SIO_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/sio/lockstep.c)
file(GLOB GB_RENDERER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/renderers/*.c) file(GLOB GB_RENDERER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/renderers/*.c)
file(GLOB THIRD_PARTY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/inih/*.c) file(GLOB THIRD_PARTY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/inih/*.c)
set(CLI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/commandline.c) set(CLI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/feature/commandline.c)
set(CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-mem.c) set(CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-mem.c)
set(VFS_SRC) set(VFS_SRC)
source_group("ARM core" FILES ${ARM_SRC}) source_group("ARM core" FILES ${ARM_SRC})
source_group("LR35902 core" FILES ${LR35902_SRC}) source_group("LR35902 core" FILES ${LR35902_SRC})
source_group("GBA board" FILES ${GBA_SRC} ${GBA_RENDERER_SRC} ${SIO_SRC}) source_group("GBA board" FILES ${GBA_SRC} ${GBA_RENDERER_SRC} ${SIO_SRC})
source_group("GBA extra" FILES ${GBA_CHEATS_SRC} ${GBA_CTX_SRC} ${GBA_SV_SRC} ${GBA_RR_SRC}) source_group("GBA extra" FILES ${GBA_CHEATS_SRC} ${GBA_EXTRA_SRC} ${GBA_RR_SRC})
source_group("GB board" FILES ${GB_SRC}) source_group("GB board" FILES ${GB_SRC})
source_group("Utilities" FILES ${UTIL_SRC}) source_group("Utilities" FILES ${UTIL_SRC})
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
@ -327,7 +326,7 @@ if(USE_CLI_DEBUGGER)
list(APPEND FEATURES CLI_DEBUGGER) list(APPEND FEATURES CLI_DEBUGGER)
list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/debugger/cli-debugger.c) list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/debugger/cli-debugger.c)
list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/debugger/parser.c) list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/debugger/parser.c)
list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/supervisor/cli.c) list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/extra/cli.c)
include_directories(AFTER ${LIBEDIT_INCLUDE_DIRS}) include_directories(AFTER ${LIBEDIT_INCLUDE_DIRS})
link_directories(${LIBEDIT_LIBRARY_DIRS}) link_directories(${LIBEDIT_LIBRARY_DIRS})
set(DEBUGGER_LIB ${LIBEDIT_LIBRARIES}) set(DEBUGGER_LIB ${LIBEDIT_LIBRARIES})
@ -350,7 +349,7 @@ if(USE_FFMPEG)
endif() endif()
include_directories(AFTER ${LIBAVCODEC_INCLUDE_DIRS} ${LIBAVFORMAT_INCLUDE_DIRS} ${LIBAVRESAMPLE_INCLUDE_DIRS} ${LIBAVUTIL_INCLUDE_DIRS} ${LIBSWSCALE_INCLUDE_DIRS}) include_directories(AFTER ${LIBAVCODEC_INCLUDE_DIRS} ${LIBAVFORMAT_INCLUDE_DIRS} ${LIBAVRESAMPLE_INCLUDE_DIRS} ${LIBAVUTIL_INCLUDE_DIRS} ${LIBSWSCALE_INCLUDE_DIRS})
link_directories(${LIBAVCODEC_LIBRARY_DIRS} ${LIBAVFORMAT_LIBRARY_DIRS} ${LIBAVRESAMPLE_LIBRARY_DIRS} ${LIBAVUTIL_LIBRARY_DIRS} ${LIBSWSCALE_LIBRARY_DIRS}) link_directories(${LIBAVCODEC_LIBRARY_DIRS} ${LIBAVFORMAT_LIBRARY_DIRS} ${LIBAVRESAMPLE_LIBRARY_DIRS} ${LIBAVUTIL_LIBRARY_DIRS} ${LIBSWSCALE_LIBRARY_DIRS})
list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/platform/ffmpeg/ffmpeg-encoder.c") list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/ffmpeg/ffmpeg-encoder.c")
string(REGEX MATCH "^[0-9]+" LIBAVCODEC_VERSION_MAJOR ${libavcodec_VERSION}) string(REGEX MATCH "^[0-9]+" LIBAVCODEC_VERSION_MAJOR ${libavcodec_VERSION})
string(REGEX MATCH "^[0-9]+" LIBAVFORMAT_VERSION_MAJOR ${libavformat_VERSION}) string(REGEX MATCH "^[0-9]+" LIBAVFORMAT_VERSION_MAJOR ${libavformat_VERSION})
string(REGEX MATCH "^[0-9]+" LIBAVRESAMPLE_VERSION_MAJOR ${libavresample_VERSION}) string(REGEX MATCH "^[0-9]+" LIBAVRESAMPLE_VERSION_MAJOR ${libavresample_VERSION})
@ -375,7 +374,7 @@ if(USE_MAGICK)
list(APPEND FEATURES MAGICK) list(APPEND FEATURES MAGICK)
include_directories(AFTER ${MAGICKWAND_INCLUDE_DIRS}) include_directories(AFTER ${MAGICKWAND_INCLUDE_DIRS})
link_directories(${MAGICKWAND_LIBRARY_DIRS}) link_directories(${MAGICKWAND_LIBRARY_DIRS})
list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/platform/imagemagick/imagemagick-gif-encoder.c") list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES}) list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION}) string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7") if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
@ -503,7 +502,6 @@ if(M_CORE_GBA)
${ARM_SRC} ${ARM_SRC}
${GBA_SRC} ${GBA_SRC}
${GBA_CHEATS_SRC} ${GBA_CHEATS_SRC}
${GBA_CTX_SRC}
${DEBUGGER_SRC} ${DEBUGGER_SRC}
${GBA_RENDERER_SRC}) ${GBA_RENDERER_SRC})
if(NOT M_CORE_GB) if(NOT M_CORE_GB)
@ -540,7 +538,7 @@ if(NOT MINIMAL_CORE)
if(M_CORE_GBA) if(M_CORE_GBA)
list(APPEND SRC list(APPEND SRC
${GBA_RR_SRC} ${GBA_RR_SRC}
${GBA_SV_SRC} ${GBA_EXTRA_SRC}
${SIO_SRC}) ${SIO_SRC})
endif() endif()
list(APPEND SRC list(APPEND SRC

2
src/core/thread.c
View File

@ -9,7 +9,7 @@
#include "util/patch.h" #include "util/patch.h"
#include "util/vfs.h" #include "util/vfs.h"
#include "platform/commandline.h" #include "feature/commandline.h"
#include <signal.h> #include <signal.h>

1
src/debugger/debugger.c
View File

@ -9,7 +9,6 @@
#ifdef USE_CLI_DEBUGGER #ifdef USE_CLI_DEBUGGER
#include "debugger/cli-debugger.h" #include "debugger/cli-debugger.h"
#include "gba/supervisor/cli.h"
#endif #endif
#ifdef USE_GDB_STUB #ifdef USE_GDB_STUB

0
src/platform/commandline.c → src/feature/commandline.c
View File

0
src/platform/commandline.h → src/feature/commandline.h
View File

0
src/platform/ffmpeg/ffmpeg-encoder.c → src/feature/ffmpeg/ffmpeg-encoder.c
View File

0
src/platform/ffmpeg/ffmpeg-encoder.h → src/feature/ffmpeg/ffmpeg-encoder.h
View File

4
src/gba/gui/gui-config.c → src/feature/gui/gui-config.c
View File

@ -7,9 +7,9 @@
#include "core/config.h" #include "core/config.h"
#include "core/core.h" #include "core/core.h"
#include "feature/gui/gui-runner.h"
#include "feature/gui/remap.h"
#include "gba/gba.h" #include "gba/gba.h"
#include "gba/gui/gui-runner.h"
#include "gba/gui/remap.h"
#include "util/gui/file-select.h" #include "util/gui/file-select.h"
#include "util/gui/menu.h" #include "util/gui/menu.h"

0
src/gba/gui/gui-config.h → src/feature/gui/gui-config.h
View File

2
src/gba/gui/gui-runner.c → src/feature/gui/gui-runner.c
View File

@ -6,7 +6,7 @@
#include "gui-runner.h" #include "gui-runner.h"
#include "core/core.h" #include "core/core.h"
#include "gba/gui/gui-config.h" #include "feature/gui/gui-config.h"
#include "gba/input.h" #include "gba/input.h"
#include "gba/interface.h" #include "gba/interface.h"
#include "gba/serialize.h" #include "gba/serialize.h"

2
src/gba/gui/gui-runner.h → src/feature/gui/gui-runner.h
View File

@ -8,7 +8,7 @@
#include "util/common.h" #include "util/common.h"
#include "gba/gui/remap.h" #include "feature/gui/remap.h"
#include "gba/hardware.h" #include "gba/hardware.h"
#include "util/circle-buffer.h" #include "util/circle-buffer.h"
#include "util/gui.h" #include "util/gui.h"

0
src/gba/gui/remap.c → src/feature/gui/remap.c
View File

0
src/gba/gui/remap.h → src/feature/gui/remap.h
View File

0
src/platform/imagemagick/imagemagick-gif-encoder.c → src/feature/imagemagick/imagemagick-gif-encoder.c
View File

0
src/platform/imagemagick/imagemagick-gif-encoder.h → src/feature/imagemagick/imagemagick-gif-encoder.h
View File

4
src/gba/core.c
View File

@ -8,10 +8,10 @@
#include "core/core.h" #include "core/core.h"
#include "core/log.h" #include "core/log.h"
#include "gba/gba.h" #include "gba/gba.h"
#include "gba/context/overrides.h" #include "gba/extra/cli.h"
#include "gba/overrides.h"
#include "gba/renderers/video-software.h" #include "gba/renderers/video-software.h"
#include "gba/serialize.h" #include "gba/serialize.h"
#include "gba/supervisor/cli.h"
#include "util/memory.h" #include "util/memory.h"
#include "util/patch.h" #include "util/patch.h"
#include "util/vfs.h" #include "util/vfs.h"

0
src/gba/supervisor/cli.c → src/gba/extra/cli.c
View File

0
src/gba/supervisor/cli.h → src/gba/extra/cli.h
View File

0
src/gba/supervisor/export.c → src/gba/extra/export.c
View File

0
src/gba/supervisor/export.h → src/gba/extra/export.h
View File

0
src/gba/sharkport.c → src/gba/extra/sharkport.c
View File

0
src/gba/sharkport.h → src/gba/extra/sharkport.h
View File

2
src/gba/gba.c
View File

@ -12,8 +12,8 @@
#include "gba/bios.h" #include "gba/bios.h"
#include "gba/cheats.h" #include "gba/cheats.h"
#include "gba/context/overrides.h"
#include "gba/io.h" #include "gba/io.h"
#include "gba/overrides.h"
#include "gba/rr/rr.h" #include "gba/rr/rr.h"
#include "gba/serialize.h" #include "gba/serialize.h"
#include "gba/sio.h" #include "gba/sio.h"

0
src/gba/context/overrides.c → src/gba/overrides.c
View File

0
src/gba/context/overrides.h → src/gba/overrides.h
View File

2
src/platform/3ds/main.c
View File

@ -6,13 +6,13 @@
#ifdef M_CORE_GBA #ifdef M_CORE_GBA
#include "gba/gba.h" #include "gba/gba.h"
#include "gba/gui/gui-runner.h"
#include "gba/input.h" #include "gba/input.h"
#include "gba/video.h" #include "gba/video.h"
#endif #endif
#ifdef M_CORE_GB #ifdef M_CORE_GB
#include "gb/gb.h" #include "gb/gb.h"
#endif #endif
#include "feature/gui/gui-runner.h"
#include "util/gui.h" #include "util/gui.h"
#include "util/gui/file-select.h" #include "util/gui/file-select.h"
#include "util/gui/font.h" #include "util/gui/font.h"

2
src/platform/example/client-server/server.c
View File

@ -1,6 +1,6 @@
// This source file is placed into the public domain. // This source file is placed into the public domain.
#include "core/core.h" #include "core/core.h"
#include "platform/commandline.h" #include "feature/commandline.h"
#include "util/socket.h" #include "util/socket.h"
#define DEFAULT_PORT 13721 #define DEFAULT_PORT 13721

2
src/platform/psp2/main.c
View File

@ -6,7 +6,7 @@
#include "psp2-context.h" #include "psp2-context.h"
#include "gba/gba.h" #include "gba/gba.h"
#include "gba/gui/gui-runner.h" #include "feature/gui/gui-runner.h"
#include "util/gui.h" #include "util/gui.h"
#include "util/gui/font.h" #include "util/gui/font.h"
#include "util/gui/file-select.h" #include "util/gui/file-select.h"

2
src/platform/psp2/psp2-context.c
View File

@ -14,8 +14,8 @@
#include "gb/gb.h" #include "gb/gb.h"
#endif #endif
#include "feature/gui/gui-runner.h"
#include "gba/input.h" #include "gba/input.h"
#include "gba/gui/gui-runner.h"
#include "util/circle-buffer.h" #include "util/circle-buffer.h"
#include "util/memory.h" #include "util/memory.h"

4
src/platform/qt/ConfigController.cpp
View File

@ -12,8 +12,8 @@
#include <QMenu> #include <QMenu>
extern "C" { extern "C" {
#include "gba/context/overrides.h" #include "gba/overrides.h"
#include "platform/commandline.h" #include "feature/commandline.h"
} }
using namespace QGBA; using namespace QGBA;

2
src/platform/qt/ConfigController.h
View File

@ -16,7 +16,7 @@
extern "C" { extern "C" {
#include "core/config.h" #include "core/config.h"
#include "util/configuration.h" #include "util/configuration.h"
#include "platform/commandline.h" #include "feature/commandline.h"
} }
class QAction; class QAction;

2
src/platform/qt/GBAApp.cpp
View File

@ -16,7 +16,7 @@
#include <QIcon> #include <QIcon>
extern "C" { extern "C" {
#include "platform/commandline.h" #include "feature/commandline.h"
#include "util/nointro.h" #include "util/nointro.h"
#include "util/socket.h" #include "util/socket.h"
} }

2
src/platform/qt/GIFView.h
View File

@ -13,7 +13,7 @@
#include "ui_GIFView.h" #include "ui_GIFView.h"
extern "C" { extern "C" {
#include "platform/imagemagick/imagemagick-gif-encoder.h" #include "feature/imagemagick/imagemagick-gif-encoder.h"
} }
namespace QGBA { namespace QGBA {

2
src/platform/qt/GameController.cpp
View File

@ -25,7 +25,7 @@ extern "C" {
#include "gba/core.h" #include "gba/core.h"
#include "gba/gba.h" #include "gba/gba.h"
#include "gba/serialize.h" #include "gba/serialize.h"
#include "gba/sharkport.h" #include "gba/extra/sharkport.h"
#endif #endif
#ifdef M_CORE_GB #ifdef M_CORE_GB
#include "gb/gb.h" #include "gb/gb.h"

2
src/platform/qt/GameController.h
View File

@ -19,9 +19,9 @@ extern "C" {
#include "core/core.h" #include "core/core.h"
#include "core/thread.h" #include "core/thread.h"
#include "gba/cheats.h" #include "gba/cheats.h"
#include "gba/context/overrides.h"
#include "gba/hardware.h" #include "gba/hardware.h"
#include "gba/input.h" #include "gba/input.h"
#include "gba/overrides.h"
#ifdef BUILD_SDL #ifdef BUILD_SDL
#include "sdl-events.h" #include "sdl-events.h"
#endif #endif

2
src/platform/qt/OverrideView.h
View File

@ -11,7 +11,7 @@
#include "ui_OverrideView.h" #include "ui_OverrideView.h"
extern "C" { extern "C" {
#include "gba/context/overrides.h" #include "gba/overrides.h"
} }
struct mCoreThread; struct mCoreThread;

2
src/platform/qt/PaletteView.cpp
View File

@ -14,7 +14,7 @@
extern "C" { extern "C" {
#include "core/core.h" #include "core/core.h"
#include "gba/supervisor/export.h" #include "gba/extra/export.h"
#include "util/vfs.h" #include "util/vfs.h"
} }

2
src/platform/qt/VideoView.h
View File

@ -13,7 +13,7 @@
#include "ui_VideoView.h" #include "ui_VideoView.h"
extern "C" { extern "C" {
#include "platform/ffmpeg/ffmpeg-encoder.h" #include "feature/ffmpeg/ffmpeg-encoder.h"
} }
namespace QGBA { namespace QGBA {

2
src/platform/qt/Window.cpp
View File

@ -41,7 +41,7 @@ extern "C" {
#ifdef M_CORE_GB #ifdef M_CORE_GB
#include "gb/gb.h" #include "gb/gb.h"
#endif #endif
#include "platform/commandline.h" #include "feature/commandline.h"
#include "util/nointro.h" #include "util/nointro.h"
#include "util/vfs.h" #include "util/vfs.h"
} }

2
src/platform/sdl/main.c
View File

@ -28,7 +28,7 @@
#include "gb/gb.h" #include "gb/gb.h"
#include "gb/video.h" #include "gb/video.h"
#endif #endif
#include "platform/commandline.h" #include "feature/commandline.h"
#include "util/configuration.h" #include "util/configuration.h"
#include "util/vfs.h" #include "util/vfs.h"

2
src/platform/test/fuzz-main.c
View File

@ -9,7 +9,7 @@
#include "gba/gba.h" #include "gba/gba.h"
#include "gba/serialize.h" #include "gba/serialize.h"
#include "platform/commandline.h" #include "feature/commandline.h"
#include "util/memory.h" #include "util/memory.h"
#include "util/string.h" #include "util/string.h"
#include "util/vfs.h" #include "util/vfs.h"

2
src/platform/test/perf-main.c
View File

@ -9,7 +9,7 @@
#include "gba/renderers/video-software.h" #include "gba/renderers/video-software.h"
#include "gba/serialize.h" #include "gba/serialize.h"
#include "platform/commandline.h" #include "feature/commandline.h"
#include "util/socket.h" #include "util/socket.h"
#include "util/string.h" #include "util/string.h"
#include "util/vfs.h" #include "util/vfs.h"

2
src/platform/wii/main.c
View File

@ -15,9 +15,9 @@
#include "util/common.h" #include "util/common.h"
#include "core/core.h" #include "core/core.h"
#include "feature/gui/gui-runner.h"
#include "gba/audio.h" #include "gba/audio.h"
#include "gba/gba.h" #include "gba/gba.h"
#include "gba/gui/gui-runner.h"
#include "gba/input.h" #include "gba/input.h"
#include "util/gui.h" #include "util/gui.h"
#include "util/gui/file-select.h" #include "util/gui/file-select.h"