Bringing over more C++ stuff...

This commit is contained in:
Eric Froemling 2020-10-02 10:02:31 -05:00
parent e21082406f
commit 9bc71287d1
4 changed files with 29 additions and 7 deletions

View File

@ -29,8 +29,8 @@
<w>achname</w> <w>achname</w>
<w>achs</w> <w>achs</w>
<w>acinstance</w> <w>acinstance</w>
<w>ack'ed</w>
<w>ack</w> <w>ack</w>
<w>ack'ed</w>
<w>acked</w> <w>acked</w>
<w>acks</w> <w>acks</w>
<w>acnt</w> <w>acnt</w>
@ -151,8 +151,8 @@
<w>bacommon</w> <w>bacommon</w>
<w>badguy</w> <w>badguy</w>
<w>bafoundation</w> <w>bafoundation</w>
<w>ballistica's</w>
<w>ballistica</w> <w>ballistica</w>
<w>ballistica's</w>
<w>ballisticacore</w> <w>ballisticacore</w>
<w>ballisticacorecb</w> <w>ballisticacorecb</w>
<w>bamaster</w> <w>bamaster</w>
@ -793,8 +793,8 @@
<w>gamedata</w> <w>gamedata</w>
<w>gameinstance</w> <w>gameinstance</w>
<w>gamemap</w> <w>gamemap</w>
<w>gamepad's</w>
<w>gamepad</w> <w>gamepad</w>
<w>gamepad's</w>
<w>gamepadadvanced</w> <w>gamepadadvanced</w>
<w>gamepads</w> <w>gamepads</w>
<w>gamepadselect</w> <w>gamepadselect</w>
@ -1177,8 +1177,8 @@
<w>lsqlite</w> <w>lsqlite</w>
<w>lssl</w> <w>lssl</w>
<w>lstart</w> <w>lstart</w>
<w>lstr's</w>
<w>lstr</w> <w>lstr</w>
<w>lstr's</w>
<w>lstrs</w> <w>lstrs</w>
<w>lsval</w> <w>lsval</w>
<w>ltex</w> <w>ltex</w>
@ -1803,8 +1803,8 @@
<w>sessionname</w> <w>sessionname</w>
<w>sessionplayer</w> <w>sessionplayer</w>
<w>sessionplayers</w> <w>sessionplayers</w>
<w>sessionteam's</w>
<w>sessionteam</w> <w>sessionteam</w>
<w>sessionteam's</w>
<w>sessionteams</w> <w>sessionteams</w>
<w>sessiontype</w> <w>sessiontype</w>
<w>setactivity</w> <w>setactivity</w>
@ -2134,8 +2134,8 @@
<w>txtw</w> <w>txtw</w>
<w>typeargs</w> <w>typeargs</w>
<w>typecheck</w> <w>typecheck</w>
<w>typechecker's</w>
<w>typechecker</w> <w>typechecker</w>
<w>typechecker's</w>
<w>typedval</w> <w>typedval</w>
<w>typeshed</w> <w>typeshed</w>
<w>typestr</w> <w>typestr</w>

View File

@ -70,6 +70,16 @@ assets-android: prereqs
assets-clean: assets-clean:
@cd assets && ${MAKE} clean @cd assets && ${MAKE} clean
# Build resources.
resources: prereqs
@tools/pcommand lazybuild resources_src ${LAZYBUILDDIR}/resources \
cd resources \&\& ${MAKE} -j${CPUS} resources
# Clean resources.
resources-clean:
@cd resources && ${MAKE} clean
@rm -f ${LAZYBUILDDIR}/resources
# Remove *ALL* files and directories that aren't managed by git # Remove *ALL* files and directories that aren't managed by git
# (except for a few things such as localconfig.json). # (except for a few things such as localconfig.json).
clean: clean:
@ -85,7 +95,7 @@ clean-list:
.PHONY: list prereqs prereqs-clean assets assets-cmake assets-windows \ .PHONY: list prereqs prereqs-clean assets assets-cmake assets-windows \
assets-windows-Win32 assets-windows-x64 \ assets-windows-Win32 assets-windows-x64 \
assets-mac assets-ios assets-android assets-clean \ assets-mac assets-ios assets-android assets-clean \
-clean-clean\ resources resources-clean-clean\
clean clean-list clean clean-list

8
resources/Makefile Normal file
View File

@ -0,0 +1,8 @@
# Released under the MIT License. See LICENSE for details.
# Dummy resources makefile; nothing here for now.
all: resources
resources:
clean:

4
resources/README.md Normal file
View File

@ -0,0 +1,4 @@
# BallisticaCore Resources
This directory should contain sources for a common set of resources such as icons, launch screens, etc.
Run 'make' to compile and push them to their platform-specific locations.