Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Should fix PSP build and Windows ZIP creation

Browse Source
This commit is contained in:
xawotihs
2016-06-09 21:26:11 +02:00
parent 39dfaf3acb
commit 9335063d68
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/include/JSoundSystem.h
+5 -1
View File
@@ -79,21 +79,25 @@ public slots:
std::string filename; std::string filename;
std::string key; std::string key;
std::string ext; std::string ext;
void* mTrack;
#elif defined WITH_FMOD #elif defined WITH_FMOD
FSOUND_SAMPLE* mTrack; // MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs FSOUND_SAMPLE* mTrack; // MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs
void* mTrack;
#elif defined ANDROID #elif defined ANDROID
SLObjectItf playerObject; SLObjectItf playerObject;
SLPlayItf playInterface; SLPlayItf playInterface;
SLSeekItf seekInterface; SLSeekItf seekInterface;
SLVolumeItf musicVolumeInterface; SLVolumeItf musicVolumeInterface;
void* mTrack;
#elif (defined QT_CONFIG) #elif (defined QT_CONFIG)
QMediaPlaylist* playlist; QMediaPlaylist* playlist;
QMediaPlayer* player; QMediaPlayer* player;
string fullpath; string fullpath;
void* mTrack;
#elif (defined WIN32) #elif (defined WIN32)
std::string filename; std::string filename;
void* mTrack;
#endif #endif
void* mTrack;
//#endif //WITH_FMOD //#endif //WITH_FMOD
}; };
projects/mtg/bin/createWindowsZip.py
+3 -3
View File
@@ -9,9 +9,9 @@ def createWindowsZipFile(filename, buildpath):
zip_file = zipfile.ZipFile(filename, 'w', zipfile.ZIP_STORED) zip_file = zipfile.ZipFile(filename, 'w', zipfile.ZIP_STORED)
zip_file.write('../../../LICENSE') zip_file.write('../../../LICENSE')
zip_file.write('libpng13.dll') zip_file.write('libpng13.dll')
zip_file.write(buildpath + 'lib/Release/SDL2.dll') zip_file.write(buildpath + '/lib/Release/SDL2.dll')
zip_file.write(buildpath + 'lib/Release/zlib.dll') zip_file.write(buildpath + '/lib/Release/zlib.dll')
zip_file.write(buildpath + 'bin/Release/Wagic.exe') zip_file.write(buildpath + '/bin/Release/Wagic.exe')
zip_file.write('Res/' + getFilename('core') + '.zip') zip_file.write('Res/' + getFilename('core') + '.zip')
zip_file.close() zip_file.close()