RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 23:59:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added windows prefab builds

Browse Source
This commit is contained in:
Eric Froemling 2019-10-17 17:56:50 -07:00
parent 7b63d3774f
commit bb773799bd
5 changed files with 19211 additions and 6926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/ballisticacore.iml generated
View File

@ -16,6 +16,7 @@
<excludeFolder url="file://$MODULE_DIR$/assets/src/pylib-android" /> <excludeFolder url="file://$MODULE_DIR$/assets/src/pylib-android" />
<excludeFolder url="file://$MODULE_DIR$/assets/src/pylib-apple" /> <excludeFolder url="file://$MODULE_DIR$/assets/src/pylib-apple" />
<excludeFolder url="file://$MODULE_DIR$/assets/src/pylib-site-packages" /> <excludeFolder url="file://$MODULE_DIR$/assets/src/pylib-site-packages" />
<excludeFolder url="file://$MODULE_DIR$/assets/src/windows" />
<excludeFolder url="file://$MODULE_DIR$/ballisticacore-android" /> <excludeFolder url="file://$MODULE_DIR$/ballisticacore-android" />
<excludeFolder url="file://$MODULE_DIR$/ballisticacore-cmake" /> <excludeFolder url="file://$MODULE_DIR$/ballisticacore-cmake" />
<excludeFolder url="file://$MODULE_DIR$/ballisticacore-ios.xcodeproj" /> <excludeFolder url="file://$MODULE_DIR$/ballisticacore-ios.xcodeproj" />
@ -62,4 +63,4 @@
<component name="TestRunnerService"> <component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" /> <option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component> </component>
</module> </module>

27
Makefile
View File

@ -59,7 +59,7 @@ assets-cmake:
@cd assets && make -j${CPUS} cmake @cd assets && make -j${CPUS} cmake
# Build only assets required for windows builds # Build only assets required for windows builds
assets-win: assets-windows:
@cd assets && make -j${CPUS} win @cd assets && make -j${CPUS} win
# Build only assets required for mac xcode builds # Build only assets required for mac xcode builds
@ -106,7 +106,7 @@ cleanlist:
@git clean -dnx ${ROOT_CLEAN_IGNORES} @git clean -dnx ${ROOT_CLEAN_IGNORES}
# Tell make which of these targets don't represent files. # Tell make which of these targets don't represent files.
.PHONY: list prereqs prereqs-clean assets assets-cmake assets-win \ .PHONY: list prereqs prereqs-clean assets assets-cmake assets-windows \
assets-mac assets-ios assets-android assets-clean \ assets-mac assets-ios assets-android assets-clean \
resources resources-clean code code-clean\ resources resources-clean code code-clean\
clean cleanlist clean cleanlist
@ -175,10 +175,31 @@ prefab-linux-release-build: assets-cmake \
build/prefab/linux/release/ballisticacore: .efrocachemap build/prefab/linux/release/ballisticacore: .efrocachemap
@tools/snippets efrocache_get $@ @tools/snippets efrocache_get $@
prefab-windows-debug: prefab-windows-debug-build
@echo Build succesful - now run build/prefab/windows/debug/BallisticaCore.exe
prefab-windows-debug-build: assets-windows \
build/prefab/windows/debug/BallisticaCore.exe
@${STAGE_ASSETS} -win-$(PREFAB_WINDOWS_PLATFORM) build/prefab/windows/debug
build/prefab/windows/debug/BallisticaCore.exe: .efrocachemap
@tools/snippets efrocache_get $@
prefab-windows-release: prefab-windows-release-build
@echo Build succesful - now run build/prefab/windows/release/BallisticaCore.exe
prefab-windows-release-build: assets-windows \
build/prefab/windows/release/BallisticaCore.exe
@${STAGE_ASSETS} -win-$(PREFAB_WINDOWS_PLATFORM) build/prefab/windows/release
build/prefab/windows/release/BallisticaCore.exe: .efrocachemap
@tools/snippets efrocache_get $@
# Tell make which of these targets don't represent files. # Tell make which of these targets don't represent files.
.PHONY: prefab-mac prefab-mac-build prefab-mac-release \ .PHONY: prefab-mac prefab-mac-build prefab-mac-release \
prefab-mac-release-build prefab-linux prefab-linux-build prefab-linux-release \ prefab-mac-release-build prefab-linux prefab-linux-build prefab-linux-release \
prefab-linux-release-build\ prefab-linux-release-build prefab-windows-debug prefab-windows-debug-build \
prefab-windows-release prefab-windows-release-build
################################################################################ ################################################################################

2784
assets/.asset_manifest_2.json
View File

File diff suppressed because it is too large Load Diff

23311
assets/Makefile
View File

File diff suppressed because it is too large Load Diff

12
tools/stage_assets
View File

@ -124,27 +124,23 @@ class Config:
self.dst = sys.argv[2] self.dst = sys.argv[2]
self.tex_suffix = '.dds' self.tex_suffix = '.dds'
self.win_extras_src = os.path.abspath( self.win_extras_src = os.path.abspath(
os.path.dirname(sys.argv[0]) + os.path.dirname(sys.argv[0]) + '/../assets/src/windows/Win32')
'/../ballisticacore-windows/Extras/Win32')
elif '-win-x64' in sys.argv: elif '-win-x64' in sys.argv:
self.dst = sys.argv[2] self.dst = sys.argv[2]
self.tex_suffix = '.dds' self.tex_suffix = '.dds'
self.win_extras_src = os.path.abspath( self.win_extras_src = os.path.abspath(
os.path.dirname(sys.argv[0]) + os.path.dirname(sys.argv[0]) + '/../assets/src/windows/x64')
'/../ballisticacore-windows/Extras/x64')
elif '-win-server-Win32' in sys.argv: elif '-win-server-Win32' in sys.argv:
self.dst = sys.argv[2] self.dst = sys.argv[2]
self.win_extras_src = os.path.abspath( self.win_extras_src = os.path.abspath(
os.path.dirname(sys.argv[0]) + os.path.dirname(sys.argv[0]) + '/../assets/src/windows/Win32')
'/../ballisticacore-windows/Extras/Win32')
self.include_textures = False self.include_textures = False
self.include_audio = False self.include_audio = False
self.include_models = False self.include_models = False
elif '-win-server-x64' in sys.argv: elif '-win-server-x64' in sys.argv:
self.dst = sys.argv[2] self.dst = sys.argv[2]
self.win_extras_src = os.path.abspath( self.win_extras_src = os.path.abspath(
os.path.dirname(sys.argv[0]) + os.path.dirname(sys.argv[0]) + '/../assets/src/windows/x64')
'/../ballisticacore-windows/Extras/x64')
self.include_textures = False self.include_textures = False
self.include_audio = False self.include_audio = False
self.include_models = False self.include_models = False