From 9bc71287d1a56cfe08e27d767c81217a5f17da26 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Fri, 2 Oct 2020 10:02:31 -0500 Subject: [PATCH] Bringing over more C++ stuff... --- .idea/dictionaries/ericf.xml | 12 ++++++------ Makefile | 12 +++++++++++- resources/Makefile | 8 ++++++++ resources/README.md | 4 ++++ 4 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 resources/Makefile create mode 100644 resources/README.md diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index fae1c944..a1496dc2 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -29,8 +29,8 @@ achname achs acinstance - ack'ed ack + ack'ed acked acks acnt @@ -151,8 +151,8 @@ bacommon badguy bafoundation - ballistica's ballistica + ballistica's ballisticacore ballisticacorecb bamaster @@ -793,8 +793,8 @@ gamedata gameinstance gamemap - gamepad's gamepad + gamepad's gamepadadvanced gamepads gamepadselect @@ -1177,8 +1177,8 @@ lsqlite lssl lstart - lstr's lstr + lstr's lstrs lsval ltex @@ -1803,8 +1803,8 @@ sessionname sessionplayer sessionplayers - sessionteam's sessionteam + sessionteam's sessionteams sessiontype setactivity @@ -2134,8 +2134,8 @@ txtw typeargs typecheck - typechecker's typechecker + typechecker's typedval typeshed typestr diff --git a/Makefile b/Makefile index 7910e969..850234a0 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,16 @@ assets-android: prereqs assets-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 # (except for a few things such as localconfig.json). clean: @@ -85,7 +95,7 @@ clean-list: .PHONY: list prereqs prereqs-clean assets assets-cmake assets-windows \ assets-windows-Win32 assets-windows-x64 \ assets-mac assets-ios assets-android assets-clean \ - -clean-clean\ + resources resources-clean-clean\ clean clean-list diff --git a/resources/Makefile b/resources/Makefile new file mode 100644 index 00000000..46a99a6e --- /dev/null +++ b/resources/Makefile @@ -0,0 +1,8 @@ +# Released under the MIT License. See LICENSE for details. + +# Dummy resources makefile; nothing here for now. +all: resources + +resources: + +clean: diff --git a/resources/README.md b/resources/README.md new file mode 100644 index 00000000..2d7fafc6 --- /dev/null +++ b/resources/README.md @@ -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.