diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index c70ae413b..d6d134203 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -79,21 +79,25 @@ public slots: std::string filename; std::string key; std::string ext; + void* mTrack; #elif defined WITH_FMOD FSOUND_SAMPLE* mTrack; // MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs + void* mTrack; #elif defined ANDROID SLObjectItf playerObject; SLPlayItf playInterface; SLSeekItf seekInterface; SLVolumeItf musicVolumeInterface; + void* mTrack; #elif (defined QT_CONFIG) QMediaPlaylist* playlist; QMediaPlayer* player; string fullpath; + void* mTrack; #elif (defined WIN32) std::string filename; + void* mTrack; #endif - void* mTrack; //#endif //WITH_FMOD }; diff --git a/projects/mtg/bin/createWindowsZip.py b/projects/mtg/bin/createWindowsZip.py index 374d118f9..59c4e5df3 100644 --- a/projects/mtg/bin/createWindowsZip.py +++ b/projects/mtg/bin/createWindowsZip.py @@ -9,9 +9,9 @@ def createWindowsZipFile(filename, buildpath): zip_file = zipfile.ZipFile(filename, 'w', zipfile.ZIP_STORED) zip_file.write('../../../LICENSE') zip_file.write('libpng13.dll') - zip_file.write(buildpath + 'lib/Release/SDL2.dll') - zip_file.write(buildpath + 'lib/Release/zlib.dll') - zip_file.write(buildpath + 'bin/Release/Wagic.exe') + zip_file.write(buildpath + '/lib/Release/SDL2.dll') + zip_file.write(buildpath + '/lib/Release/zlib.dll') + zip_file.write(buildpath + '/bin/Release/Wagic.exe') zip_file.write('Res/' + getFilename('core') + '.zip') zip_file.close()