* Fix linux32 compilation.
* Wagic+JGE are now expected to compile on any unix that
  has an X and an OpenGL library. If fmod is correctly
  installed it will use it, else there won't be any sound.
This commit is contained in:
jean.chalard
2010-02-02 09:15:39 +00:00
parent 4f0a264146
commit 64260f5787
2 changed files with 7 additions and 14 deletions

View File

@@ -9,7 +9,8 @@
#include "../include/GameOptions.h"
#include "../include/WResourceManager.h"
#include <assert.h>
#ifdef WITH_FMOD
#endif
//WResource
WResource::~WResource(){
@@ -312,20 +313,12 @@ JSample * WCachedSample::Actual(){
return sample;
}
unsigned long WCachedSample::size(){
if(!sample || !sample->mSample)
return 0;
#if defined WIN32 || defined LINUX
#if defined __LP64__
return 0;
#else
return FSOUND_Sample_GetLength(sample->mSample);
#endif
#else
return sample->mSample->fileSize;
#endif
}
return sample->fileSize();
}
bool WCachedSample::isGood(){
if(!sample || !sample->mSample)