J :

* Fix linux compilation that had been broken by the last update.
2010-02-02 08:34:54 +00:00
parent 18c18822c9
commit 02e3932017
3 changed files with 8 additions and 6 deletions
--- a/JGE/Makefile
+++ b/JGE/Makefile
@@ -122,6 +122,6 @@ endif

 Makefile.linux:
 	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)
--- a/JGE/include/JSoundSystem.h
+++ b/JGE/include/JSoundSystem.h
@@ -39,7 +39,9 @@
 	#include "JMP3.h"

 #endif
-
+#ifdef WITH_FMOD
+        #include "../Dependencies/include/fmod.h"
+#endif

 //------------------------------------------------------------------------------------------------
 class JMusic
--- a/JGE/src/pc/JSfx.cpp
+++ b/JGE/src/pc/JSfx.cpp
@@ -115,7 +115,7 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
 {
 #ifndef WITH_FMOD
  return NULL;
-#elif
+#else
  JMusic* music = new JMusic();
  if (music)
    {