RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-24 16:06:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

split windows asset build into 32 and 64 bit to reduce prefab size

Browse Source
This commit is contained in:
Eric Froemling 2019-10-18 16:21:07 -07:00
parent 633c7f5f18
commit 511a3d116f
4 changed files with 104 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/dictionaries/ericf.xml generated
View File

@ -369,6 +369,7 @@
<w>dlls</w>
<w>dmodule</w>
<w>dname</w>
<w>dnames</w>
<w>dnode</w>
<w>doclines</w>
<w>docprefix</w>
@ -394,6 +395,7 @@
<w>drumroll</w>
<w>dsqlite</w>
<w>dstattr</w>
<w>dstbase</w>
<w>dstdata</w>
<w>dstfile</w>
<w>dstfin</w>
@ -835,6 +837,7 @@
<w>lindexorig</w>
<w>lineheight</w>
<w>linenum</w>
<w>linflav</w>
<w>linkto</w>
<w>lintable</w>
<w>lintcode</w>
@ -1007,6 +1010,7 @@
<w>newpath</w>
<w>nextlevel</w>
<w>nfoo</w>
<w>nilly</w>
<w>ninjafight</w>
<w>nitpicky</w>
<w>nline</w>
@ -1249,6 +1253,7 @@
<w>pypaths</w>
<w>pysources</w>
<w>pythonpath</w>
<w>pythonw</w>
<w>pytree</w>
<w>pytz</w>
<w>qrcode</w>
@ -1499,6 +1504,7 @@
<w>taobaomascot</w>
<w>targ</w>
<w>targetdir</w>
<w>targetpath</w>
<w>targetpractice</w>
<w>tbtcolor</w>
<w>tbtn</w>

18
Makefile
View File

@ -58,9 +58,18 @@ assets:
assets-cmake:
@cd assets && make -j${CPUS} cmake
# Build only assets required for windows builds
# Build only assets required for windows builds.
# (honoring the WINDOWS_PLATFORM value)
assets-windows:
@cd assets && make -j${CPUS} win
@cd assets && make -j${CPUS} win-${WINDOWS_PLATFORM}
# Build only assets required for Win32 windows builds.
assets-windows-Win32:
@cd assets && make -j${CPUS} win-Win32
# Build only assets required for x64 windows builds.
assets-windows-x64:
@cd assets && make -j${CPUS} win-x64
# Build only assets required for mac xcode builds
assets-mac:
@ -107,6 +116,7 @@ cleanlist:
# Tell make which of these targets don't represent files.
.PHONY: list prereqs prereqs-clean assets assets-cmake assets-windows \
assets-windows-Win32 assets-windows-x64 \
assets-mac assets-ios assets-android assets-clean \
resources resources-clean code code-clean\
clean cleanlist
@ -181,7 +191,7 @@ prefab-windows-debug: prefab-windows-debug-build
@echo Build successful - now run:\
build/prefab/windows/debug/BallisticaCore.exe
prefab-windows-debug-build: assets-windows \
prefab-windows-debug-build: assets-windows-${PREFAB_WINDOWS_PLATFORM} \
build/prefab/windows/debug/BallisticaCore.exe
@${STAGE_ASSETS} -win-$(PREFAB_WINDOWS_PLATFORM) build/prefab/windows/debug
@ -192,7 +202,7 @@ prefab-windows-release: prefab-windows-release-build
@echo Build successful - now run:\
build/prefab/windows/release/BallisticaCore.exe
prefab-windows-release-build: assets-windows \
prefab-windows-release-build: assets-windows-${PREFAB_WINDOWS_PLATFORM} \
build/prefab/windows/release/BallisticaCore.exe
@${STAGE_ASSETS} -win-$(PREFAB_WINDOWS_PLATFORM) build/prefab/windows/release

148
assets/Makefile
View File

@ -52,10 +52,16 @@ cmake:
@make assets-cmake
@${TOOLS_DIR}/snippets clean_orphaned_assets
# Build everything needed for our windows builds (linux, mac).
win:
# Build everything needed for x86 windows builds.
win-Win32:
@${TOOLS_DIR}/snippets warm_start_asset_build
@make assets-win
@make assets-win-Win32
@${TOOLS_DIR}/snippets clean_orphaned_assets
# Build everything needed for x86-64 windows builds.
win-x64:
@${TOOLS_DIR}/snippets warm_start_asset_build
@make assets-win-x64
@${TOOLS_DIR}/snippets clean_orphaned_assets
# Build everything needed for our mac xcode builds.
@ -85,7 +91,8 @@ MAKE_DATA = 1
ASSET_TARGETS_COMMON =
ASSET_TARGETS_CMAKE =
ASSET_TARGETS_MAC =
ASSET_TARGETS_WIN =
ASSET_TARGETS_WIN_WIN32 =
ASSET_TARGETS_WIN_X64 =
ASSET_TARGETS_IOS =
ASSET_TARGETS_ANDROID =
@ -109,7 +116,8 @@ ifeq ($(MAKE_TEXTURES),1)
ASSET_TARGETS_CMAKE += $(TEXTURE_TARGETS_CMAKE)
ASSET_TARGETS_MAC += $(TEXTURE_TARGETS_MAC)
ASSET_TARGETS_WIN += $(TEXTURE_TARGETS_WIN)
ASSET_TARGETS_WIN_WIN32 += $(TEXTURE_TARGETS_WIN)
ASSET_TARGETS_WIN_X64 += $(TEXTURE_TARGETS_WIN)
ASSET_TARGETS_IOS += $(TEXTURE_TARGETS_IOS)
ASSET_TARGETS_ANDROID += $(TEXTURE_TARGETS_ANDROID)
ASSET_TARGETS_COMMON += $(TEXTURE_TARGETS_COMMON)
@ -120,14 +128,16 @@ endif # Textures
ifeq ($(MAKE_SCRIPTS),1)
ASSET_TARGETS_CMAKE += $(SCRIPT_TARGETS_CMAKE)
ASSET_TARGETS_MAC += $(SCRIPT_TARGETS_MAC)
ASSET_TARGETS_WIN += $(SCRIPT_TARGETS_WIN)
ASSET_TARGETS_WIN_WIN32 += $(SCRIPT_TARGETS_WIN)
ASSET_TARGETS_WIN_X64 += $(SCRIPT_TARGETS_WIN)
ASSET_TARGETS_IOS += $(SCRIPT_TARGETS_IOS)
ASSET_TARGETS_ANDROID += $(SCRIPT_TARGETS_ANDROID)
ASSET_TARGETS_COMMON += $(SCRIPT_TARGETS_COMMON)
endif
# Extras
ASSET_TARGETS_WIN += $(EXTRAS_TARGETS_WIN)
ASSET_TARGETS_WIN_WIN32 += $(EXTRAS_TARGETS_WIN_WIN32)
ASSET_TARGETS_WIN_X64 += $(EXTRAS_TARGETS_WIN_X64)
#AUTOGENERATED_BEGIN_1 (this section is managed by the "update_project" tool)
@ -19731,62 +19741,7 @@ TEX2D_PREVIEW_PNG_TARGETS = \
build/data/textures/impactBombColorLit_preview.png \
build/data/textures/achievementStayinAlive_preview.png
EXTRAS_TARGETS_WIN = \
build/windows/x64/python37.dll \
build/windows/x64/pythonw.exe \
build/windows/x64/OpenAL32.dll \
build/windows/x64/libvorbis.dll \
build/windows/x64/python.exe \
build/windows/x64/libvorbisfile.dll \
build/windows/x64/SDL2.dll \
build/windows/x64/ogg.dll \
build/windows/x64/VC_redist.x64.exe \
build/windows/x64/DLLs/python_tools.cat \
build/windows/x64/DLLs/_msi.pyd \
build/windows/x64/DLLs/_elementtree.pyd \
build/windows/x64/DLLs/_hashlib.pyd \
build/windows/x64/DLLs/python_lib.cat \
build/windows/x64/DLLs/winsound.pyd \
build/windows/x64/DLLs/_ssl.pyd \
build/windows/x64/DLLs/libssl-1_1.dll \
build/windows/x64/DLLs/sqlite3.dll \
build/windows/x64/DLLs/_overlapped.pyd \
build/windows/x64/DLLs/libcrypto-1_1.dll \
build/windows/x64/DLLs/_asyncio.pyd \
build/windows/x64/DLLs/_lzma.pyd \
build/windows/x64/DLLs/_multiprocessing.pyd \
build/windows/x64/DLLs/pyexpat.pyd \
build/windows/x64/DLLs/_sqlite3.pyd \
build/windows/x64/DLLs/_queue.pyd \
build/windows/x64/DLLs/_socket.pyd \
build/windows/x64/DLLs/pyd.ico \
build/windows/x64/DLLs/py.ico \
build/windows/x64/DLLs/_ctypes.pyd \
build/windows/x64/DLLs/pyc.ico \
build/windows/x64/DLLs/_bz2.pyd \
build/windows/x64/DLLs/select.pyd \
build/windows/x64/DLLs/_decimal.pyd \
build/windows/x64/DLLs/unicodedata.pyd \
build/windows/x64/Lib/distutils/README \
build/windows/x64/Lib/distutils/tests/includetest.rst \
build/windows/x64/Lib/distutils/tests/Setup.sample \
build/windows/x64/Lib/distutils/command/command_template \
build/windows/x64/Lib/ctypes/macholib/fetch_macholib \
build/windows/x64/Lib/ctypes/macholib/README.ctypes \
build/windows/x64/Lib/ctypes/macholib/fetch_macholib.bat \
build/windows/x64/Lib/site-packages/README.txt \
build/windows/x64/Lib/ensurepip/_bundled/pip-19.0.3-py2.py3-none-any.whl \
build/windows/x64/Lib/ensurepip/_bundled/setuptools-40.8.0-py2.py3-none-any.whl \
build/windows/x64/Lib/venv/scripts/posix/activate.fish \
build/windows/x64/Lib/venv/scripts/posix/activate.csh \
build/windows/x64/Lib/venv/scripts/nt/activate.bat \
build/windows/x64/Lib/venv/scripts/nt/Activate.ps1 \
build/windows/x64/Lib/venv/scripts/nt/pythonw.exe \
build/windows/x64/Lib/venv/scripts/nt/python.exe \
build/windows/x64/Lib/venv/scripts/nt/deactivate.bat \
build/windows/x64/Lib/venv/scripts/common/activate \
build/windows/x64/Lib/pydoc_data/_pydoc.css \
build/windows/x64/Lib/email/architecture.rst \
EXTRAS_TARGETS_WIN_WIN32 = \
build/windows/Win32/VC_redist.x86.exe \
build/windows/Win32/python37.dll \
build/windows/Win32/pythonw.exe \
@ -19844,7 +19799,69 @@ EXTRAS_TARGETS_WIN = \
build/windows/Win32/Lib/email/architecture.rst
# Rule to copy src extras to build.
$(EXTRAS_TARGETS_WIN) : ../.efrocachemap
$(EXTRAS_TARGETS_WIN_WIN32) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
EXTRAS_TARGETS_WIN_X64 = \
build/windows/x64/python37.dll \
build/windows/x64/pythonw.exe \
build/windows/x64/OpenAL32.dll \
build/windows/x64/libvorbis.dll \
build/windows/x64/python.exe \
build/windows/x64/libvorbisfile.dll \
build/windows/x64/SDL2.dll \
build/windows/x64/ogg.dll \
build/windows/x64/VC_redist.x64.exe \
build/windows/x64/DLLs/python_tools.cat \
build/windows/x64/DLLs/_msi.pyd \
build/windows/x64/DLLs/_elementtree.pyd \
build/windows/x64/DLLs/_hashlib.pyd \
build/windows/x64/DLLs/python_lib.cat \
build/windows/x64/DLLs/winsound.pyd \
build/windows/x64/DLLs/_ssl.pyd \
build/windows/x64/DLLs/libssl-1_1.dll \
build/windows/x64/DLLs/sqlite3.dll \
build/windows/x64/DLLs/_overlapped.pyd \
build/windows/x64/DLLs/libcrypto-1_1.dll \
build/windows/x64/DLLs/_asyncio.pyd \
build/windows/x64/DLLs/_lzma.pyd \
build/windows/x64/DLLs/_multiprocessing.pyd \
build/windows/x64/DLLs/pyexpat.pyd \
build/windows/x64/DLLs/_sqlite3.pyd \
build/windows/x64/DLLs/_queue.pyd \
build/windows/x64/DLLs/_socket.pyd \
build/windows/x64/DLLs/pyd.ico \
build/windows/x64/DLLs/py.ico \
build/windows/x64/DLLs/_ctypes.pyd \
build/windows/x64/DLLs/pyc.ico \
build/windows/x64/DLLs/_bz2.pyd \
build/windows/x64/DLLs/select.pyd \
build/windows/x64/DLLs/_decimal.pyd \
build/windows/x64/DLLs/unicodedata.pyd \
build/windows/x64/Lib/distutils/README \
build/windows/x64/Lib/distutils/tests/includetest.rst \
build/windows/x64/Lib/distutils/tests/Setup.sample \
build/windows/x64/Lib/distutils/command/command_template \
build/windows/x64/Lib/ctypes/macholib/fetch_macholib \
build/windows/x64/Lib/ctypes/macholib/README.ctypes \
build/windows/x64/Lib/ctypes/macholib/fetch_macholib.bat \
build/windows/x64/Lib/site-packages/README.txt \
build/windows/x64/Lib/ensurepip/_bundled/pip-19.0.3-py2.py3-none-any.whl \
build/windows/x64/Lib/ensurepip/_bundled/setuptools-40.8.0-py2.py3-none-any.whl \
build/windows/x64/Lib/venv/scripts/posix/activate.fish \
build/windows/x64/Lib/venv/scripts/posix/activate.csh \
build/windows/x64/Lib/venv/scripts/nt/activate.bat \
build/windows/x64/Lib/venv/scripts/nt/Activate.ps1 \
build/windows/x64/Lib/venv/scripts/nt/pythonw.exe \
build/windows/x64/Lib/venv/scripts/nt/python.exe \
build/windows/x64/Lib/venv/scripts/nt/deactivate.bat \
build/windows/x64/Lib/venv/scripts/common/activate \
build/windows/x64/Lib/pydoc_data/_pydoc.css \
build/windows/x64/Lib/email/architecture.rst
# Rule to copy src extras to build.
$(EXTRAS_TARGETS_WIN_X64) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
#AUTOGENERATED_END_2
@ -19953,7 +19970,8 @@ clean-scripts:
# Build all required assets for a specific platform.
assets-cmake: $(ASSET_TARGETS_CMAKE) $(ASSET_TARGETS_COMMON)
assets-win: $(ASSET_TARGETS_WIN) $(ASSET_TARGETS_COMMON)
assets-win-Win32: $(ASSET_TARGETS_WIN_WIN32) $(ASSET_TARGETS_COMMON)
assets-win-x64: $(ASSET_TARGETS_WIN_X64) $(ASSET_TARGETS_COMMON)
assets-mac: $(ASSET_TARGETS_MAC) $(ASSET_TARGETS_COMMON)
assets-ios: $(ASSET_TARGETS_IOS) $(ASSET_TARGETS_COMMON)
assets-android: $(ASSET_TARGETS_ANDROID) $(ASSET_TARGETS_COMMON)

2
tools/efrotools/snippets.py
View File

@ -145,7 +145,7 @@ def _spelling(words: List[str]) -> None:
def spelling_all() -> None:
"""Add all misspellings from a pycharscripts run."""
"""Add all misspellings from a pycharmscripts run."""
print('Running "make pycharmscriptsfull"...')
lines = [