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

J :

Browse Source 
* This update has Wagic compile and work under Darwin 64-bits.
  - Linux 64-bits is expected to compile and work from now on, but
    was not tested. As with before, Linux 64 bits can still run
    the 32 bits version.
  - Darwin version is not using Carbon but X emulation.
  - 64-bits versions have no sound because there is no 64-bits
    version of fmod.
  - Windows 64-bits probably does not compile. Windows 64-bits can
    still run the 32 bits version.
  - Darwin 32-bits probably does not work at the moment because the
    libfmod requires another name to work on Macs, but as 64-bits
    disables it it works.
  - Other unix flavors are expected to work as long as they have
    a working OpenGL library, X11, and *either* 64-bits *or* a
    working fmod. Thus in the practice Tru64, Irix and the like
    probably work, as should FreeBSD and other BSDs in 64 bits
    versions, but 32 bits versions will search for a non-existing
    fmod. All of this is pure conjecture and none was tested.
  - All 64-bits versions have no sound.
  - The mac version does not display the particles at the moment.
    This is not critical, but the cause is unknown yet. I would
    like to know if other 64 bits unices share the same bug or if
    it is mac-specific.
* Test is needed in particular to see whether the program still
  compiles and works in Linux and PSP. Windows is probably all
  right, but compiling PSP in windows may be broken by this
  update.
This commit is contained in:
jean.chalard
2010-02-02 08:27:10 +00:00
parent c4043b08a3
commit 18c18822c9
12 changed files with 177 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
JGE/include/JSoundSystem.h
View File

@@ -51,9 +51,13 @@ public:
int getPlayTime();
#if defined (WIN32) || defined (LINUX)
FSOUND_SAMPLE *mTrack; // MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs
#ifdef WITH_FMOD
FSOUND_SAMPLE* mTrack; // MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs
#else
void* mTrack;
#endif
#else
JMP3* mTrack;
JMP3* mTrack;
#endif
};
@@ -62,16 +66,20 @@ public:
//------------------------------------------------------------------------------------------------
class JSample
{
public:
JSample();
~JSample();
public:
JSample();
~JSample();
int mVoice;
int mVoice;
#if defined (WIN32) || defined (LINUX)
FSOUND_SAMPLE *mSample;
#ifdef WITH_FMOD
FSOUND_SAMPLE *mSample;
#else
void* mSample;
#endif
#else
WAVDATA *mSample;
WAVDATA *mSample;
#endif
};

8
JGE/include/JTypes.h
View File

@@ -75,9 +75,9 @@
#include <windows.h>
#endif
#ifdef LINUX
typedef unsigned char byte;
typedef unsigned long DWORD;
typedef unsigned char BYTE;
typedef uint8_t byte;
typedef uint32_t DWORD;
typedef uint8_t BYTE;
typedef bool BOOL;
#endif
@@ -87,8 +87,6 @@
#endif
#if defined (WIN32) || defined (LINUX)
#include "../Dependencies/include/fmod.h"
typedef int8_t s8;
typedef int16_t s16;