libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 14:51:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

COMMON: Split compression and formats into separate modules

Browse Source
This commit is contained in:
Cameron Cawley 2022-12-02 13:38:26 +00:00 committed by Eugene Sandulenko
parent 28d7b361ea
commit fd123d6679
6 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -36,6 +36,8 @@ MODULES += \
audio \
math \
common \
common/compression \
common/formats \
po \
doc

18
common/compression/module.mk Normal file
View File

@ -0,0 +1,18 @@
MODULE := common/compression
MODULE_OBJS := \
clickteam.o \
dcl.o \
gzio.o \
installshield_cab.o \
installshieldv3_archive.o \
powerpacker.o \
rnc_deco.o \
stuffit.o \
unarj.o \
unzip.o \
vise.o \
zlib.o
# Include common rules
include $(srcdir)/rules.mk

14
common/formats/module.mk Normal file
View File

@ -0,0 +1,14 @@
MODULE := common/formats
MODULE_OBJS := \
iff_container.o \
ini-file.o \
json.o \
quicktime.o \
winexe.o \
winexe_ne.o \
winexe_pe.o \
xmlparser.o
# Include common rules
include $(srcdir)/rules.mk

22
common/module.mk
View File

@ -39,27 +39,7 @@ MODULE_OBJS := \
unicode-bidi.o \
ustr.o \
util.o \
xpfloat.o \
compression/clickteam.o \
compression/dcl.o \
compression/gzio.o \
compression/installshield_cab.o \
compression/installshieldv3_archive.o \
compression/powerpacker.o \
compression/rnc_deco.o \
compression/stuffit.o \
compression/unarj.o \
compression/unzip.o \
compression/vise.o \
compression/zlib.o \
formats/iff_container.o \
formats/ini-file.o \
formats/json.o \
formats/quicktime.o \
formats/winexe.o \
formats/winexe_ne.o \
formats/winexe_pe.o \
formats/xmlparser.o
xpfloat.o
ifdef ENABLE_EVENTRECORDER
MODULE_OBJS += \

2
devtools/create_project/create_project.cpp
View File

@ -1608,6 +1608,8 @@ void ProjectProvider::createProject(BuildSetup &setup) {
createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/base", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common/compression", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common/formats", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/common/lua", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex);

2
test/module.mk
View File

@ -28,7 +28,7 @@ TEST_LIBS += test/null_osystem.o \
backends/platform/sdl/win32/win32_wrapper.o
endif
TEST_LIBS += audio/libaudio.a math/libmath.a common/libcommon.a image/libimage.a graphics/libgraphics.a
TEST_LIBS += audio/libaudio.a math/libmath.a common/formats/libformats.a common/compression/libcompression.a common/libcommon.a image/libimage.a graphics/libgraphics.a
ifeq ($(ENABLE_WINTERMUTE), STATIC_PLUGIN)
TESTS += $(srcdir)/test/engines/wintermute/*.h