Merged

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a17e52561f4cc48d5a63884e46bd447f3cfeb59..ad651c903a8734b27486d50860738642c9677558 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,6 +151,8 @@ include_directories("${DEPDIR}/OpenGL")
 option (LUGARU_FORCE_INTERNAL_OPENAL "Force internal libOpenAL, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_OPENAL)
     find_package(OpenAL REQUIRED)
+else(NOT LUGARU_FORCE_INTERNAL_OPENAL)
+       set(OPENAL_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_OPENAL)
 
 if (NOT OPENAL_FOUND)
@@ -182,7 +184,10 @@ endif (NOT OPENAL_FOUND)
 option (LUGARU_FORCE_INTERNAL_SDL "Force internal libSDL, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_SDL)
     find_package(SDL)
+else(NOT LUGARU_FORCE_INTERNAL_SDL)
+       set(SDL_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_SDL)
+
 if (NOT SDL_FOUND)
     message(STATUS "Using internal copy of SDL")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} SDL")
@@ -221,7 +226,10 @@ endif (NOT SDL_FOUND)
 option (LUGARU_FORCE_INTERNAL_PNG "Force internal libPNG, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_PNG)
     find_package(PNG)
+else(NOT LUGARU_FORCE_INTERNAL_PNG)
+       set(PNG_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_PNG)
+
 if (NOT PNG_FOUND)
     message(STATUS "Using internal copy of libpng")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} PNG")
@@ -251,7 +259,10 @@ endif (NOT PNG_FOUND)
 option (LUGARU_FORCE_INTERNAL_JPEG "Force internal libJPEG, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_JPEG)
     find_package(JPEG)
+else(NOT LUGARU_FORCE_INTERNAL_JPEG)
+       set(JPEG_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_JPEG)
+
 if (NOT JPEG_FOUND)
     message(STATUS "Using internal copy of libjpeg")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} JPEG")
@@ -311,7 +322,10 @@ endif (NOT JPEG_FOUND)
 option (LUGARU_FORCE_INTERNAL_ZLIB "Force internal zlib, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_ZLIB)
     find_package(ZLIB)
+else(NOT LUGARU_FORCE_INTERNAL_ZLIB)
+       set(ZLIB_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_ZLIB)
+
 if (NOT ZLIB_FOUND)
     message(STATUS "Using internal copy of zlib")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} ZLIB")
@@ -335,10 +349,11 @@ if (NOT ZLIB_FOUND)
 endif (NOT ZLIB_FOUND)
 
 option (LUGARU_FORCE_INTERNAL_GLU "Force internal libGLU, even if there's a system version" False)
-if (NOT LUGARU_FORCE_INTERNAL_GLU)
-    find_package(GLU)
-endif (NOT LUGARU_FORCE_INTERNAL_GLU)
-if (NOT GLU_FOUND)
+if (LUGARU_FORCE_INTERNAL_GLU)
+       set(OPENGL_GLU_FOUND False)
+endif (LUGARU_FORCE_INTERNAL_GLU)
+
+if (NOT OPENGL_GLU_FOUND)
     message(STATUS "Using internal copy of libGLU")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} GLU")
     set(GLUDIR "${DEPDIR}/GLU")
@@ -359,13 +374,16 @@ if (NOT GLU_FOUND)
         ${GLUDIR}/tessmono.c
         ${GLUDIR}/util.c
     )
-endif (NOT GLU_FOUND)
+endif (NOT OPENGL_GLU_FOUND)
 
 option (LUGARU_FORCE_INTERNAL_VORBIS "Force internal Vorbis, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_VORBIS)
     find_package(OggVorbis)
+else(NOT LUGARU_FORCE_INTERNAL_VORBIS)
+       set(OGGVORBIS_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_VORBIS)
-if (NOT OggVorbis_FOUND)
+
+if (NOT OGGVORBIS_FOUND)
     message(STATUS "Using internal copy of Ogg Vorbis")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OggVorbis")
     set(OGGDIR "${DEPDIR}/libogg")
@@ -399,7 +417,7 @@ if (NOT OggVorbis_FOUND)
         ${VORBISDIR}/lib/vorbisfile.c
         ${VORBISDIR}/lib/window.c
     )
-endif (NOT OggVorbis_FOUND)
+endif (NOT OGGVORBIS_FOUND)
 
 include_directories(
     ${OPENAL_INCLUDE_DIR}

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index fe9c136c58af36faf85817ed2abb606ea83c8822..be2a006d633eddc0f4f4d18a061bbe90d8125596 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Quaternions.h"
 #include "Lights.h"
 #include "Skeleton.h"
-#include "fmod.h"
 #include "Terrain.h"
 #include "Sprites.h"
 #include "Frustum.h"

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 1ee4964f94c8182969e026bbb9548276c25ac75c..9374b1f8f41d4acbdd1594b4248cd2deecd4e1a7 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -127,8 +127,6 @@ extern float volume;
 #include <shellapi.h>
 #endif
 
-#include "fmod.h"
-
 #include "res/resource.h"
 
 using namespace std;

diff --git a/Source/Person.h b/Source/Person.h
index ae7390f44a0172a7d345a317def7c9488ec6566b..cde2f8f7a93b2b16d6e76b346f1296fbb844b597 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "gamegl.h"
 #include "Quaternions.h"
-#include "fmod.h"
 #include "Skeleton.h"
 #include "Models.h"
 #include "Constants.h"

diff --git a/Source/Skeleton.h b/Source/Skeleton.h
index 4e3a3fc3f49263618b0c7a70ecd7b3934c4257cf..2948b1f8a1d5c6d1307a9073f8d9d4ebe755fb65 100644 (file)
--- a/Source/Skeleton.h
+++ b/Source/Skeleton.h
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /**> HEADER FILES <**/
 #include "gamegl.h"
 #include "Quaternions.h"
-#include "fmod.h"
 #include "Objects.h"
 #include "Sprites.h"
 #include "binio.h"

diff --git a/Source/Weapons.h b/Source/Weapons.h
index 61d6305647bd58ee461277f73dc99256bbca3113..e11a424c7649e319c5cf87200afc0e0cc4598473 100644 (file)
--- a/Source/Weapons.h
+++ b/Source/Weapons.h
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "gamegl.h"
 #include "Quaternions.h"
-#include "fmod.h"
 #include "Skeleton.h"
 #include "Models.h"
 #include "Constants.h"

diff --git a/Source/fmod.h b/Source/fmod.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/Source/fmod_header.h b/Source/fmod_header.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h
index 07aa867bc52d59c0d33efb805bbaf2777e4a1ef6..e1ca95d5da5e1639db57c9ba4276fdee06ce1351 100644 (file)
--- a/Source/openal_wrapper.h
+++ b/Source/openal_wrapper.h
@@ -101,8 +101,8 @@ AL_API signed char OPENAL_SetOutput(int outputtype);
 #  define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e)
 #  define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d)
 #elif !PLATFORM_MACOSX
-#  define OPENAL_Sample_LoadEx(a, b, c, d, e) FSOUND_Sample_Load( a, ConvertFileName( b), c, d, e)
-#  define OPENAL_Stream_OpenEx(a, b, c, d) FSOUND_Stream_Open(ConvertFileName(a), b, c, d)
+#  define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e)
+#  define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d)
 #endif
 
 #endif