diff --git a/Box b/Box index e240b7a..602a83d 160000 --- a/Box +++ b/Box @@ -1 +1 @@ -Subproject commit e240b7ac3fedc1bf912016ca1d6b822db1d6c7e9 +Subproject commit 602a83dab6a18057ec926d5637aa8eaea98a383d diff --git a/README.md b/README.md index 7499d2e..fe7dc87 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Make sure the program can see the `assets` folder (symbolic links can help), and * SDL2 * SDL2_image +* SDL2_mixer * SDL2_ttf * libcurses (for debugging only) @@ -33,11 +34,14 @@ The source code for this project, not including the contents of Box, is covered The art assets are covered by creative commons license CC BY Evan Hartshorn. +The audio assets are covered by the creative commons license CC BY Forcy. + The font assets are used with permission, links to the relevant licenses are provided below. ## Credits * Art - Evan Hartshorn +* Music & SFX - Forcy * Coding - Kayne Ruse * Font - Ancient God (Koczman B�lint) - https://www.dafont.com/ancient-god.font * Font - AlphaBeta (Brian Kent) - https://www.fontpalace.com/font-download/alpha-beta/ diff --git a/assets/audio/music/Music_Skylands_placeholder.ogg b/assets/audio/music/Music_Skylands_placeholder.ogg new file mode 100644 index 0000000..b217758 Binary files /dev/null and b/assets/audio/music/Music_Skylands_placeholder.ogg differ diff --git a/source/main.c b/source/main.c index 95341f9..f34e811 100644 --- a/source/main.c +++ b/source/main.c @@ -13,6 +13,9 @@ int main(int argc, char* argv[]) { // Toy_setDrivePath("airport", "assets/airport-demo"); //DEBUG Toy_setDrivePath("scripts", "assets/scripts"); Toy_setDrivePath("sprites", "assets/sprites"); + Toy_setDrivePath("audio", "assets/audio"); + Toy_setDrivePath("music", "assets/audio/music"); + Toy_setDrivePath("sounds", "assets/audio/sounds"); Toy_setDrivePath("fonts", "assets/fonts"); Box_initEngine("scripts:/init.toy"); diff --git a/source/makefile b/source/makefile index 04012fb..885a38f 100644 --- a/source/makefile +++ b/source/makefile @@ -2,7 +2,7 @@ CC=gcc IDIR+=. ../Box/Toy/source ../Box/source CFLAGS+=$(addprefix -I,$(IDIR)) -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable -LIBS+=-lSDL2 -ltoy -lbox -lSDL2_image -lSDL2_ttf -lSDL2main -lSDL2 +LIBS+=-ltoy -lbox -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lSDL2main -lSDL2 ODIR = obj SRC = $(wildcard *.c)