Should fix PSP build and Windows ZIP creation

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

View File

@@ -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
};

View File

@@ -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()