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

J :

Browse Source 
* Fix linux compilation that had been broken by the last update.
This commit is contained in:
jean.chalard
2010-02-02 08:34:54 +00:00
parent 18c18822c9
commit 02e3932017
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/Makefile
+1 -1
View File
@@ -122,6 +122,6 @@ endif
Makefile.linux: Makefile.linux:
g++ -o /dev/null src/testfeatures.c -L$(LIBDIR) -lfmod-3.75 g++ -o /dev/null src/testfeatures.c -L$(LIBDIR) -lfmod-3.75
@if [ "0" == "$?" ]; then echo 'FMOD=-DWITH_FMOD'; else echo 'FMOD=-DWITHOUT_FMOD'; fi > $@ @if [ "0" = "$$?" ]; then echo 'FMOD=-DWITH_FMOD'; else echo 'FMOD=-DWITHOUT_FMOD'; fi > $@
-include Makefile.$(TARGET_ARCHITECTURE) -include Makefile.$(TARGET_ARCHITECTURE)
JGE/include/JSoundSystem.h
+3 -1
View File
@@ -39,7 +39,9 @@
#include "JMP3.h" #include "JMP3.h"
#endif #endif
#ifdef WITH_FMOD
#include "../Dependencies/include/fmod.h"
#endif
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
class JMusic class JMusic
JGE/src/pc/JSfx.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
{ {
#ifndef WITH_FMOD #ifndef WITH_FMOD
return NULL; return NULL;
#elif #else
JMusic* music = new JMusic(); JMusic* music = new JMusic();
if (music) if (music)
{ {