Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Making resource compiler output .asm instead of header files #115

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Moved files one level up + removed unused file
  • Loading branch information
dbeef committed Aug 1, 2021
commit 8b8b6c976e6ffa174da913de10add2523e1402aa
86 changes: 42 additions & 44 deletions src/audio/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
project(Audio CXX ASM)

# TODO: Make a function for marking each file in passed directory
set_property(SOURCE include/generated/arrowtrap.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/kiss.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/title.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/explosion.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/pickup.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/throw.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/jetpack.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/whip.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/hurt.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/coin.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/chestopen.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/doit.py.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/die.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/shotgun.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/gem.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/cave.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/jump.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/entering_door.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/climb2.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/hit.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/bat.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE include/generated/climb1.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/arrowtrap.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/kiss.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/title.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/explosion.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/pickup.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/throw.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/jetpack.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/whip.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/hurt.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/coin.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/chestopen.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/die.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/shotgun.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/gem.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/cave.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/jump.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/entering_door.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/climb2.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/hit.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/bat.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
set_property(SOURCE generated/climb1.wav.asm APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")

add_library(Audio STATIC
include/AudioBank.hpp
Expand All @@ -38,28 +37,27 @@ add_library(Audio STATIC
$<IF:$<BOOL:${SPELUNKY_PSP_PLATFORM_WINDOWS}>,src/Audio_SDL_mixer.cpp,>
$<IF:$<BOOL:${SPELUNKY_PSP_PLATFORM_LINUX}>,src/Audio_SDL_mixer.cpp,>
$<IF:$<BOOL:${SPELUNKY_PSP_PLATFORM_ANDROID}>,src/Audio_Dummy.cpp,>
include/generated/arrowtrap.wav.asm
include/generated/kiss.wav.asm
include/generated/title.wav.asm
include/generated/explosion.wav.asm
include/generated/pickup.wav.asm
include/generated/throw.wav.asm
include/generated/jetpack.wav.asm
include/generated/whip.wav.asm
include/generated/hurt.wav.asm
include/generated/coin.wav.asm
include/generated/chestopen.wav.asm
include/generated/doit.py.asm
include/generated/die.wav.asm
include/generated/shotgun.wav.asm
include/generated/gem.wav.asm
include/generated/cave.wav.asm
include/generated/jump.wav.asm
include/generated/entering_door.wav.asm
include/generated/climb2.wav.asm
include/generated/hit.wav.asm
include/generated/bat.wav.asm
include/generated/climb1.wav.asm
generated/arrowtrap.wav.asm
generated/kiss.wav.asm
generated/title.wav.asm
generated/explosion.wav.asm
generated/pickup.wav.asm
generated/throw.wav.asm
generated/jetpack.wav.asm
generated/whip.wav.asm
generated/hurt.wav.asm
generated/coin.wav.asm
generated/chestopen.wav.asm
generated/die.wav.asm
generated/shotgun.wav.asm
generated/gem.wav.asm
generated/cave.wav.asm
generated/jump.wav.asm
generated/entering_door.wav.asm
generated/climb2.wav.asm
generated/hit.wav.asm
generated/bat.wav.asm
generated/climb1.wav.asm
)

if (NOT SPELUNKY_PSP_PLATFORM_WINDOWS)
Expand Down
11 changes: 0 additions & 11 deletions src/audio/include/generated/doit.py.asm

This file was deleted.