diff --git a/bin/dink_html5/midi/TimGM6mbTiny.dls b/bin/dink_html5/midi/TimGM6mbTiny.dls new file mode 100644 index 0000000..62eee4a Binary files /dev/null and b/bin/dink_html5/midi/TimGM6mbTiny.dls differ diff --git a/bin/dink_html5/sound/1.mid b/bin/dink_html5/sound/1.mid new file mode 100644 index 0000000..bfd3547 Binary files /dev/null and b/bin/dink_html5/sound/1.mid differ diff --git a/bin/dink_html5/sound/10.mid b/bin/dink_html5/sound/10.mid new file mode 100644 index 0000000..b5ea334 Binary files /dev/null and b/bin/dink_html5/sound/10.mid differ diff --git a/bin/dink_html5/sound/10.mp3 b/bin/dink_html5/sound/10.mp3 deleted file mode 100644 index 7acd069..0000000 Binary files a/bin/dink_html5/sound/10.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/100.mid b/bin/dink_html5/sound/100.mid new file mode 100644 index 0000000..a4f5cef Binary files /dev/null and b/bin/dink_html5/sound/100.mid differ diff --git a/bin/dink_html5/sound/100.mp3 b/bin/dink_html5/sound/100.mp3 deleted file mode 100644 index 4573f12..0000000 Binary files a/bin/dink_html5/sound/100.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/1003.mid b/bin/dink_html5/sound/1003.mid new file mode 100644 index 0000000..391a70c Binary files /dev/null and b/bin/dink_html5/sound/1003.mid differ diff --git a/bin/dink_html5/sound/1003.mp3 b/bin/dink_html5/sound/1003.mp3 deleted file mode 100644 index 17acaa5..0000000 Binary files a/bin/dink_html5/sound/1003.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/101.mid b/bin/dink_html5/sound/101.mid new file mode 100644 index 0000000..cfb40a2 Binary files /dev/null and b/bin/dink_html5/sound/101.mid differ diff --git a/bin/dink_html5/sound/101.mp3 b/bin/dink_html5/sound/101.mp3 deleted file mode 100644 index 4b90ddd..0000000 Binary files a/bin/dink_html5/sound/101.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/102.mid b/bin/dink_html5/sound/102.mid new file mode 100644 index 0000000..9db8f09 Binary files /dev/null and b/bin/dink_html5/sound/102.mid differ diff --git a/bin/dink_html5/sound/102.mp3 b/bin/dink_html5/sound/102.mp3 deleted file mode 100644 index c6b381f..0000000 Binary files a/bin/dink_html5/sound/102.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/103.mid b/bin/dink_html5/sound/103.mid new file mode 100644 index 0000000..fb64a15 Binary files /dev/null and b/bin/dink_html5/sound/103.mid differ diff --git a/bin/dink_html5/sound/103.mp3 b/bin/dink_html5/sound/103.mp3 deleted file mode 100644 index 4e8a58e..0000000 Binary files a/bin/dink_html5/sound/103.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/104.mid b/bin/dink_html5/sound/104.mid new file mode 100644 index 0000000..1d867bd Binary files /dev/null and b/bin/dink_html5/sound/104.mid differ diff --git a/bin/dink_html5/sound/104.mp3 b/bin/dink_html5/sound/104.mp3 deleted file mode 100644 index 70f10da..0000000 Binary files a/bin/dink_html5/sound/104.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/105.mid b/bin/dink_html5/sound/105.mid new file mode 100644 index 0000000..5f74b35 Binary files /dev/null and b/bin/dink_html5/sound/105.mid differ diff --git a/bin/dink_html5/sound/105.mp3 b/bin/dink_html5/sound/105.mp3 deleted file mode 100644 index 46f22a0..0000000 Binary files a/bin/dink_html5/sound/105.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/106.mid b/bin/dink_html5/sound/106.mid new file mode 100644 index 0000000..fc87956 Binary files /dev/null and b/bin/dink_html5/sound/106.mid differ diff --git a/bin/dink_html5/sound/106.mp3 b/bin/dink_html5/sound/106.mp3 deleted file mode 100644 index d4c981d..0000000 Binary files a/bin/dink_html5/sound/106.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/107.mid b/bin/dink_html5/sound/107.mid new file mode 100644 index 0000000..b5ea334 Binary files /dev/null and b/bin/dink_html5/sound/107.mid differ diff --git a/bin/dink_html5/sound/107.mp3 b/bin/dink_html5/sound/107.mp3 deleted file mode 100644 index 26232e1..0000000 Binary files a/bin/dink_html5/sound/107.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/11.mid b/bin/dink_html5/sound/11.mid new file mode 100644 index 0000000..87fd83c Binary files /dev/null and b/bin/dink_html5/sound/11.mid differ diff --git a/bin/dink_html5/sound/11.mp3 b/bin/dink_html5/sound/11.mp3 deleted file mode 100644 index a671cd5..0000000 Binary files a/bin/dink_html5/sound/11.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/12.mid b/bin/dink_html5/sound/12.mid new file mode 100644 index 0000000..caee2f1 Binary files /dev/null and b/bin/dink_html5/sound/12.mid differ diff --git a/bin/dink_html5/sound/12.mp3 b/bin/dink_html5/sound/12.mp3 deleted file mode 100644 index 9034cc9..0000000 Binary files a/bin/dink_html5/sound/12.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/13.mid b/bin/dink_html5/sound/13.mid new file mode 100644 index 0000000..3cde650 Binary files /dev/null and b/bin/dink_html5/sound/13.mid differ diff --git a/bin/dink_html5/sound/13.mp3 b/bin/dink_html5/sound/13.mp3 deleted file mode 100644 index 343cf5d..0000000 Binary files a/bin/dink_html5/sound/13.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/14.mp3 b/bin/dink_html5/sound/14.mp3 deleted file mode 100644 index 5069cde..0000000 Binary files a/bin/dink_html5/sound/14.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/15.mp3 b/bin/dink_html5/sound/15.mp3 deleted file mode 100644 index 4715ba2..0000000 Binary files a/bin/dink_html5/sound/15.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/16.mid b/bin/dink_html5/sound/16.mid new file mode 100644 index 0000000..9b3befa Binary files /dev/null and b/bin/dink_html5/sound/16.mid differ diff --git a/bin/dink_html5/sound/16.mp3 b/bin/dink_html5/sound/16.mp3 deleted file mode 100644 index fde2deb..0000000 Binary files a/bin/dink_html5/sound/16.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/17.mp3 b/bin/dink_html5/sound/17.mp3 deleted file mode 100644 index e8f5cc9..0000000 Binary files a/bin/dink_html5/sound/17.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/18.mid b/bin/dink_html5/sound/18.mid new file mode 100644 index 0000000..a13d454 Binary files /dev/null and b/bin/dink_html5/sound/18.mid differ diff --git a/bin/dink_html5/sound/18.mp3 b/bin/dink_html5/sound/18.mp3 deleted file mode 100644 index cb475ce..0000000 Binary files a/bin/dink_html5/sound/18.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/19.mp3 b/bin/dink_html5/sound/19.mp3 deleted file mode 100644 index d7a609d..0000000 Binary files a/bin/dink_html5/sound/19.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/2.mid b/bin/dink_html5/sound/2.mid new file mode 100644 index 0000000..00e4b8e Binary files /dev/null and b/bin/dink_html5/sound/2.mid differ diff --git a/bin/dink_html5/sound/2.mp3 b/bin/dink_html5/sound/2.mp3 deleted file mode 100644 index c734ddb..0000000 Binary files a/bin/dink_html5/sound/2.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/4.mid b/bin/dink_html5/sound/4.mid new file mode 100644 index 0000000..35ac5a8 Binary files /dev/null and b/bin/dink_html5/sound/4.mid differ diff --git a/bin/dink_html5/sound/4.mp3 b/bin/dink_html5/sound/4.mp3 deleted file mode 100644 index 4beacf4..0000000 Binary files a/bin/dink_html5/sound/4.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/5.mid b/bin/dink_html5/sound/5.mid new file mode 100644 index 0000000..78d324f Binary files /dev/null and b/bin/dink_html5/sound/5.mid differ diff --git a/bin/dink_html5/sound/5.mp3 b/bin/dink_html5/sound/5.mp3 deleted file mode 100644 index 1466e17..0000000 Binary files a/bin/dink_html5/sound/5.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/6.mid b/bin/dink_html5/sound/6.mid new file mode 100644 index 0000000..a13d454 Binary files /dev/null and b/bin/dink_html5/sound/6.mid differ diff --git a/bin/dink_html5/sound/6.mp3 b/bin/dink_html5/sound/6.mp3 deleted file mode 100644 index 5df9c3e..0000000 Binary files a/bin/dink_html5/sound/6.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/7.mid b/bin/dink_html5/sound/7.mid new file mode 100644 index 0000000..c45df86 Binary files /dev/null and b/bin/dink_html5/sound/7.mid differ diff --git a/bin/dink_html5/sound/7.mp3 b/bin/dink_html5/sound/7.mp3 deleted file mode 100644 index edc7a08..0000000 Binary files a/bin/dink_html5/sound/7.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/8.mp3 b/bin/dink_html5/sound/8.mp3 deleted file mode 100644 index 41b36f6..0000000 Binary files a/bin/dink_html5/sound/8.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/9.mid b/bin/dink_html5/sound/9.mid new file mode 100644 index 0000000..6bbca90 Binary files /dev/null and b/bin/dink_html5/sound/9.mid differ diff --git a/bin/dink_html5/sound/9.mp3 b/bin/dink_html5/sound/9.mp3 deleted file mode 100644 index 8c98510..0000000 Binary files a/bin/dink_html5/sound/9.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/battle.mid b/bin/dink_html5/sound/battle.mid new file mode 100644 index 0000000..35ac5a8 Binary files /dev/null and b/bin/dink_html5/sound/battle.mid differ diff --git a/bin/dink_html5/sound/battle.mp3 b/bin/dink_html5/sound/battle.mp3 deleted file mode 100644 index b4caaee..0000000 Binary files a/bin/dink_html5/sound/battle.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/bullythe.mid b/bin/dink_html5/sound/bullythe.mid new file mode 100644 index 0000000..2b526e1 Binary files /dev/null and b/bin/dink_html5/sound/bullythe.mid differ diff --git a/bin/dink_html5/sound/bullythe.mp3 b/bin/dink_html5/sound/bullythe.mp3 deleted file mode 100644 index 8a95848..0000000 Binary files a/bin/dink_html5/sound/bullythe.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/caveexpl.mid b/bin/dink_html5/sound/caveexpl.mid new file mode 100644 index 0000000..b5ea334 Binary files /dev/null and b/bin/dink_html5/sound/caveexpl.mid differ diff --git a/bin/dink_html5/sound/caveexpl.mp3 b/bin/dink_html5/sound/caveexpl.mp3 deleted file mode 100644 index 80dcc52..0000000 Binary files a/bin/dink_html5/sound/caveexpl.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/dance.mid b/bin/dink_html5/sound/dance.mid new file mode 100644 index 0000000..38ec178 Binary files /dev/null and b/bin/dink_html5/sound/dance.mid differ diff --git a/bin/dink_html5/sound/dance.mp3 b/bin/dink_html5/sound/dance.mp3 deleted file mode 100644 index 9849ac8..0000000 Binary files a/bin/dink_html5/sound/dance.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/denube.mid b/bin/dink_html5/sound/denube.mid new file mode 100644 index 0000000..d5cfec2 Binary files /dev/null and b/bin/dink_html5/sound/denube.mid differ diff --git a/bin/dink_html5/sound/denube.mp3 b/bin/dink_html5/sound/denube.mp3 deleted file mode 100644 index 47862cc..0000000 Binary files a/bin/dink_html5/sound/denube.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/insper.mid b/bin/dink_html5/sound/insper.mid new file mode 100644 index 0000000..2b3e737 Binary files /dev/null and b/bin/dink_html5/sound/insper.mid differ diff --git a/bin/dink_html5/sound/insper.mp3 b/bin/dink_html5/sound/insper.mp3 deleted file mode 100644 index 3a42130..0000000 Binary files a/bin/dink_html5/sound/insper.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/lively.mid b/bin/dink_html5/sound/lively.mid new file mode 100644 index 0000000..7b9dc2b Binary files /dev/null and b/bin/dink_html5/sound/lively.mid differ diff --git a/bin/dink_html5/sound/lively.mp3 b/bin/dink_html5/sound/lively.mp3 deleted file mode 100644 index 3f53fea..0000000 Binary files a/bin/dink_html5/sound/lively.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/love.mid b/bin/dink_html5/sound/love.mid new file mode 100644 index 0000000..d899d82 Binary files /dev/null and b/bin/dink_html5/sound/love.mid differ diff --git a/bin/dink_html5/sound/love.mp3 b/bin/dink_html5/sound/love.mp3 deleted file mode 100644 index 591bfed..0000000 Binary files a/bin/dink_html5/sound/love.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/lovin.mid b/bin/dink_html5/sound/lovin.mid new file mode 100644 index 0000000..8b0ceb0 Binary files /dev/null and b/bin/dink_html5/sound/lovin.mid differ diff --git a/bin/dink_html5/sound/lovin.mp3 b/bin/dink_html5/sound/lovin.mp3 deleted file mode 100644 index 61be98e..0000000 Binary files a/bin/dink_html5/sound/lovin.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/neighbor.mid b/bin/dink_html5/sound/neighbor.mid new file mode 100644 index 0000000..09ce47f Binary files /dev/null and b/bin/dink_html5/sound/neighbor.mid differ diff --git a/bin/dink_html5/sound/neighbor.mp3 b/bin/dink_html5/sound/neighbor.mp3 deleted file mode 100644 index aee00b3..0000000 Binary files a/bin/dink_html5/sound/neighbor.mp3 and /dev/null differ diff --git a/bin/dink_html5/sound/wanderer.mid b/bin/dink_html5/sound/wanderer.mid new file mode 100644 index 0000000..fd8cd22 Binary files /dev/null and b/bin/dink_html5/sound/wanderer.mid differ diff --git a/bin/dink_html5/sound/wanderer.mp3 b/bin/dink_html5/sound/wanderer.mp3 deleted file mode 100644 index 0349af4..0000000 Binary files a/bin/dink_html5/sound/wanderer.mp3 and /dev/null differ diff --git a/html5/build_release.bat b/html5/build_release.bat index a51141f..ed64adb 100644 --- a/html5/build_release.bat +++ b/html5/build_release.bat @@ -71,7 +71,7 @@ set SRC= %SHARED%\PlatformSetup.cpp %SHARED%\html5\HTML5Main.cpp %SHARED%\html5 %SHARED%\util\CRandom.cpp %SHARED%\util\GLESUtils.cpp %SHARED%\util\MathUtils.cpp %SHARED%\util\MiscUtils.cpp %SHARED%\util\RenderUtils.cpp %SHARED%\util\ResourceUtils.cpp ^ %SHARED%\util\Variant.cpp %SHARED%\util\boost\libs\signals\src\connection.cpp %SHARED%\util\boost\libs\signals\src\named_slot_map.cpp %SHARED%\util\boost\libs\signals\src\signal_base.cpp ^ %SHARED%\util\boost\libs\signals\src\slot.cpp %SHARED%\util\boost\libs\signals\src\trackable.cpp %SHARED%\BaseApp.cpp %SHARED%\util\TextScanner.cpp %SHARED%\Entity\EntityUtils.cpp ^ -%SHARED%\Network\NetSocket.cpp %SHARED%\Network\NetUtils.cpp %SHARED%\Audio\AudioManagerSDL.cpp %SHARED%\FileSystem\StreamingInstance.cpp %SHARED%\FileSystem\FileSystem.cpp ^ +%SHARED%\Network\NetSocket.cpp %SHARED%\Network\NetUtils.cpp %SHARED%\Audio\AudioManagerFMODStudio.cpp %SHARED%\FileSystem\StreamingInstance.cpp %SHARED%\FileSystem\FileSystem.cpp ^ %SHARED%\FileSystem\StreamingInstanceZip.cpp %SHARED%\FileSystem\StreamingInstanceFile.cpp %SHARED%\FileSystem\FileSystemZip.cpp %SHARED%\util\unzip\unzip.c %SHARED%\util\unzip\ioapi.c %SHARED%\util\PrimeSearch.cpp ^ %SHARED%\Manager\AdManager.cpp %SHARED%/Renderer/JPGSurfaceLoader.cpp %SHARED%\util\archive\TarHandler.cpp %SHARED%\Gamepad\GamepadManager.cpp ^ %SHARED%\Gamepad\GamepadProvideriCade.cpp %SHARED%\Gamepad\Gamepad.cpp %SHARED%\Gamepad\GamepadProvider.cpp %SHARED%\util\bzip2\blocksort.c ^ @@ -136,7 +136,7 @@ SET CUSTOM_FLAGS=%CUSTOM_FLAGS% -D_DEBUG -s GL_UNSAFE_OPTS=0 -s WARN_ON_UNDEFINE ) SET INCLUDE_DIRS=-I%SHARED% -I%APP% -I../../shared/util/boost -I../../shared/ClanLib-2.0/Sources -I../../shared/Network/enet/include ^ --I%ZLIBPATH% +-I%ZLIBPATH% -I../../shared/html5 :compile some libs into a separate thing, otherwise our list of files is too long and breaks stuff @@ -151,9 +151,10 @@ del temp.bc call emcc %CUSTOM_FLAGS% %INCLUDE_DIRS% ^ %ZLIB_SRC% %JPG_SRC% %PARTICLE_SRC% -o temp.bc +:../../shared/html5/fmodstudio/api/studio/lib/fmodstudio.bc call emcc %CUSTOM_FLAGS% %INCLUDE_DIRS% ^ -%APP_SRC% %SRC% %COMPONENT_SRC% temp.bc ^ ---preload-file ../bin/interface@interface/ --preload-file ../bin/audio@audio/ --preload-file ../bin/dink_html5_uncompressed@dink/ --js-library %SHARED%\html5\SharedJSLIB.js -o %APP_NAME%.%FINAL_EXTENSION% +%APP_SRC% %SRC% %COMPONENT_SRC% temp.bc ../../shared/html5/fmodstudio/api/lowlevel/lib/fmod.bc --exclude-file .svn ^ +--preload-file ../bin/interface@interface/ --preload-file ../bin/audio@audio/ --preload-file ../bin/dink_html5@dink/ --js-library %SHARED%\html5\SharedJSLIB.js -o %APP_NAME%.%FINAL_EXTENSION% REM Make sure the file compiled ok if not exist %APP_NAME%.js beeper.exe /p diff --git a/source/App.cpp b/source/App.cpp index 7fd2144..dc0555b 100644 --- a/source/App.cpp +++ b/source/App.cpp @@ -102,9 +102,9 @@ GamepadManager * GetGamepadManager() {return &g_gamepadManager;} //AudioManager g_audioManager; //to disable sound AudioManagerBBX g_audioManager; #elif defined PLATFORM_HTML5 -#include "Audio/AudioManagerSDL.h" +#include "Audio/AudioManagerFMODStudio.h" //AudioManager g_audioManager; //to disable sound -AudioManagerSDL g_audioManager; +AudioManagerFMOD g_audioManager; #elif defined PLATFORM_FLASH //AudioManager g_audioManager; //to disable sound @@ -581,15 +581,12 @@ bool App::Init() //preload audio -if (GetEmulatedPlatformID() == PLATFORM_ID_IOS) +if (GetEmulatedPlatformID() == PLATFORM_ID_IOS || GetEmulatedPlatformID() == PLATFORM_ID_HTML5 ) { //use our own DLS, as iPhone/iPad don't have any midi system g_audioManager.SetDLS("dink/midi/TimGM6mbTiny.dls"); } -#ifdef _DEBUG - -#endif #ifdef _WIN32 //temporary while I make movies