libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGS: Merged engine/plugin/ into plugins/ folder

Browse Source
This commit is contained in:
Paul Gilbert 2021-01-25 19:40:32 -08:00
parent 8bc249b99f
commit d6b8c21557
32 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/ags/engine/ac/draw.cpp
View File

@ -61,8 +61,8 @@
#include "ags/shared/font/fonts.h"
#include "ags/shared/gui/guimain.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/ac/spritecache.h"
#include "ags/engine/gfx/gfx_util.h"
#include "ags/engine/gfx/graphicsdriver.h"

4
engines/ags/engine/ac/dynobj/cc_serializer.cpp
View File

@ -31,8 +31,8 @@
#include "ags/engine/ac/dynobj/scriptviewport.h"
#include "ags/engine/ac/game.h"
#include "ags/engine/debugging/debug_log.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/pluginobjectreader.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/pluginobjectreader.h"
namespace AGS3 {

4
engines/ags/engine/ac/event.cpp
View File

@ -33,8 +33,8 @@
#include "ags/engine/ac/screen.h"
#include "ags/shared/script/cc_error.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/engine/script/script.h"
#include "ags/shared/gfx/bitmap.h"
#include "ags/engine/gfx/ddb.h"

4
engines/ags/engine/ac/game.cpp
View File

@ -85,8 +85,8 @@
#include "ags/engine/main/graphics_mode.h"
#include "ags/engine/main/main.h"
#include "ags/engine/media/audio/audio_system.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/script/cc_error.h"
#include "ags/engine/script/runtimescriptvalue.h"
#include "ags/engine/script/script.h"

4
engines/ags/engine/ac/global_translation.cpp
View File

@ -28,8 +28,8 @@
#include "ags/engine/ac/string.h"
#include "ags/engine/ac/tree_map.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/util/memory.h"
#include "ags/shared/core/types.h"

4
engines/ags/engine/ac/room.cpp
View File

@ -60,8 +60,8 @@
#include "ags/shared/debugging/out.h"
#include "ags/shared/game/room_version.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/script/cc_error.h"
#include "ags/engine/script/script.h"
#include "ags/engine/script/script_runtime.h"

4
engines/ags/engine/ac/screen.cpp
View File

@ -31,8 +31,8 @@
#include "ags/engine/ac/dynobj/scriptuserobject.h"
#include "ags/engine/script/script_runtime.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/gfx/bitmap.h"
#include "ags/engine/gfx/graphicsdriver.h"

4
engines/ags/engine/ac/sprite.cpp
View File

@ -26,8 +26,8 @@
#include "ags/engine/ac/sprite.h"
#include "ags/engine/ac/system.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/ac/spritecache.h"
#include "ags/shared/gfx/bitmap.h"
#include "ags/engine/gfx/graphicsdriver.h"

2
engines/ags/engine/debugging/debug.cpp
View File

@ -38,7 +38,7 @@
#include "ags/engine/main/config.h"
#include "ags/engine/media/audio/audio_system.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/engine/script/script.h"
#include "ags/shared/script/script_common.h"
#include "ags/shared/script/cc_error.h"

2
engines/ags/engine/game/game_init.cpp
View File

@ -43,7 +43,7 @@
#include "ags/shared/gfx/bitmap.h"
#include "ags/engine/gfx/ddb.h"
#include "ags/shared/gui/guilabel.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/script/cc_error.h"
#include "ags/engine/script/exports.h"
#include "ags/engine/script/script.h"

4
engines/ags/engine/game/savegame.cpp
View File

@ -52,8 +52,8 @@
#include "ags/engine/main/engine.h"
#include "ags/engine/main/main.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/engine/script/script.h"
#include "ags/shared/script/cc_error.h"
#include "ags/shared/util/alignedstream.h"

4
engines/ags/engine/game/savegame_components.cpp
View File

@ -53,8 +53,8 @@
#include "ags/shared/gui/guimain.h"
#include "ags/shared/gui/guislider.h"
#include "ags/shared/gui/guitextbox.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/shared/script/cc_error.h"
#include "ags/engine/script/script.h"
#include "ags/shared/util/filestream.h" // TODO: needed only because plugins expect file handle

2
engines/ags/engine/main/game_file.cpp
View File

@ -50,7 +50,7 @@
#include "ags/engine/ac/gamesetup.h"
#include "ags/shared/game/main_game_file.h"
#include "ags/engine/game/game_init.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/plugins/agsplugin.h"
#include "ags/engine/script/script.h"
namespace AGS3 {

4
engines/ags/engine/main/game_run.cpp
View File

@ -57,8 +57,8 @@
#include "ags/engine/main/engine.h"
#include "ags/engine/main/game_run.h"
#include "ags/engine/main/update.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/engine/script/script.h"
#include "ags/shared/ac/spritecache.h"
#include "ags/engine/media/audio/audio_system.h"

2
engines/ags/engine/main/quit.cpp
View File

@ -44,7 +44,7 @@
#include "ags/engine/gfx/graphicsdriver.h"
#include "ags/shared/gfx/bitmap.h"
#include "ags/shared/core/assetmanager.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/engine/media/audio/audio_system.h"
#include "ags/engine/globals.h"
#include "ags/ags.h"

2
engines/ags/engine/platform/base/agsplatformdriver.cpp
View File

@ -33,7 +33,7 @@
#include "ags/shared/util/string_utils.h"
#include "ags/shared/util/stream.h"
#include "ags/shared/gfx/bitmap.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/plugins/agsplugin.h"
#include "ags/engine/ac/timer.h"
#include "ags/engine/media/audio/audio_system.h"
#include "ags/lib/system/datetime.h"

2
engines/ags/engine/platform/linux/acpllnx.cpp
View File

@ -36,7 +36,7 @@
#include "ags/engine/ac/runtime_defines.h"
#include "ags/engine/gfx/gfxdefines.h"
#include "ags/engine/platform/base/agsplatformdriver.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/plugins/agsplugin.h"
#include "ags/shared/util/string.h"
namespace AGS3 {

2
engines/ags/engine/script/script_runtime.cpp
View File

@ -39,7 +39,7 @@
#include "ags/shared/script/cc_error.h"
#include "ags/shared/script/cc_options.h"
#include "ags/engine/script/systemimports.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/plugins/agsplugin.h"
#include "ags/engine/ac/dynobj/cc_dynamicarray.h"
#include "ags/engine/ac/statobj/staticobject.h"

2
engines/ags/engine/util/library_posix.h
View File

@ -27,7 +27,7 @@
#include "ags/shared/core/platform.h"
#include "ags/shared/util/string.h"
#include "ags/shared/debugging/out.h"
#include "ags/engine/plugin/library.h"
#include "ags/plugins/library.h"
#include "ags/engine/globals.h"
namespace AGS3 {

8
engines/ags/module.mk
View File

@ -287,10 +287,6 @@ MODULE_OBJS = \
engine/media/video/video.o \
engine/platform/base/agsplatformdriver.o \
engine/platform/linux/acpllnx.o \
engine/plugin/agsplugin.o \
engine/plugin/global_plugin.o \
engine/plugin/library.o \
engine/plugin/pluginobjectreader.o \
engine/script/cc_instance.o \
engine/script/executingscript.o \
engine/script/exports.o \
@ -300,7 +296,11 @@ MODULE_OBJS = \
engine/script/script_engine.o \
engine/script/script_runtime.o \
engine/script/systemimports.o \
plugins/agsplugin.o \
plugins/dll.o \
plugins/global_plugin.o \
plugins/library.o \
plugins/pluginobjectreader.o \
plugins/ags_blend/ags_blend.o \
plugins/ags_creditz/ags_creditz.o \
plugins/ags_flashlight/ags_flashlight.o \

2
engines/ags/plugins/ags_pal_render/pal_render.h
View File

@ -24,7 +24,7 @@
#define AGS_PLUGINS_AGS_PAL_RENDER_PAL_RENDER_H
#include "ags/lib/allegro.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/plugins/agsplugin.h"
#include "common/algorithm.h"
namespace AGS3 {

8
engines/ags/engine/plugin/agsplugin.cpp → engines/ags/plugins/agsplugin.cpp
View File

@ -54,10 +54,10 @@
#include "ags/shared/gui/guidefines.h"
#include "ags/engine/main/game_run.h"
#include "ags/engine/main/engine.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/engine/plugin/plugin_engine.h"
#include "ags/engine/plugin/plugin_builtin.h"
#include "ags/engine/plugin/pluginobjectreader.h"
#include "ags/plugins/agsplugin.h"
#include "ags/plugins/plugin_engine.h"
#include "ags/plugins/plugin_builtin.h"
#include "ags/plugins/pluginobjectreader.h"
#include "ags/engine/script/script.h"
#include "ags/engine/script/script_runtime.h"
#include "ags/shared/ac/spritecache.h"

0
engines/ags/engine/plugin/agsplugin.h → engines/ags/plugins/agsplugin.h
View File

2
engines/ags/plugins/dll.h
View File

@ -24,7 +24,7 @@
#define AGS_PLUGINS_DLL_H
#include "ags/shared/util/string.h"
#include "ags/engine/plugin/agsplugin.h"
#include "ags/plugins/agsplugin.h"
#include "common/hashmap.h"
#include "common/hash-str.h"

0
engines/ags/engine/plugin/global_plugin.cpp → engines/ags/plugins/global_plugin.cpp
View File

2
engines/ags/engine/plugin/library.cpp → engines/ags/plugins/library.cpp
View File

@ -20,7 +20,7 @@
*
*/
#include "ags/engine/plugin/library.h"
#include "ags/plugins/library.h"
#include "ags/plugins/dll.h"
namespace AGS3 {

0
engines/ags/engine/plugin/library.h → engines/ags/plugins/library.h
View File

0
engines/ags/engine/plugin/plugin_builtin.h → engines/ags/plugins/plugin_builtin.h
View File

0
engines/ags/engine/plugin/plugin_engine.h → engines/ags/plugins/plugin_engine.h
View File

2
engines/ags/engine/plugin/pluginobjectreader.cpp → engines/ags/plugins/pluginobjectreader.cpp
View File

@ -20,7 +20,7 @@
*
*/
#include "ags/engine/plugin/pluginobjectreader.h"
#include "ags/plugins/pluginobjectreader.h"
#include "ags/engine/ac/runtime_defines.h"
namespace AGS3 {

0
engines/ags/engine/plugin/pluginobjectreader.h → engines/ags/plugins/pluginobjectreader.h
View File

2
engines/ags/plugins/serializer.h
View File

@ -23,7 +23,7 @@
#ifndef AGS_PLUGINS_SERIALIZER_H
#define AGS_PLUGINS_SERIALIZER_H
#include "ags/engine/plugin/agsplugin.h"
#include "ags/plugins/agsplugin.h"
#include "common/serializer.h"
namespace AGS3 {