Merged

diff --combined CMakeLists.txt
index 1f5ed78914b8693cb5f88b013cf6a7543b0bcaeb,1a17e52561f4cc48d5a63884e46bd447f3cfeb59..ad651c903a8734b27486d50860738642c9677558
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -13,11 -13,11 +13,11 @@@ endif(NOT CMAKE_BUILD_TYPE
  
  if(NOT LUGARU_INSTALL_PREFIX)
    if(WIN32)
-      set(LUGARU_INSTALL_PREFIX C:\Lugaru CACHE PATH
+      set(LUGARU_INSTALL_PREFIX "C:/Lugaru" CACHE PATH
       "LUGARU_INSTALL_PREFIX: Install path prefix, prepended onto install directories."
        FORCE)
    else(WIN32)
-      set(LUGARU_INSTALL_PREFIX /usr/local/lugaru CACHE PATH
+      set(LUGARU_INSTALL_PREFIX "/usr/local/lugaru" CACHE PATH
       "CMAKE_INSTALL_PREFIX: Install path prefix, prepended onto install directories."
        FORCE)
    endif(WIN32)
@@@ -148,11 -148,9 +148,11 @@@ find_package(OpenGL REQUIRED
  # force this include dir no matter what, so we get sane headers.
  include_directories("${DEPDIR}/OpenGL")
  
- option (LUGARU_FORCE_INTERNAL_OPENAL "Force internal OpenAL, even if theer's a system version" False)
+ 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)
@@@ -184,10 -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")
@@@ -226,10 -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")
@@@ -259,10 -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")
@@@ -322,10 -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")
@@@ -349,11 -335,10 +349,11 @@@
  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")
@@@ -374,16 -359,13 +374,16 @@@
          ${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")
@@@ -417,7 -399,7 +417,7 @@@
          ${VORBISDIR}/lib/vorbisfile.c
          ${VORBISDIR}/lib/window.c
      )
 -endif (NOT OggVorbis_FOUND)
 +endif (NOT OGGVORBIS_FOUND)
  
  include_directories(
      ${OPENAL_INCLUDE_DIR}
@@@ -451,7 -433,7 +451,7 @@@ endif(WIN32
  
  # Install target
  if(WIN32)
-       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/Source/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX})
+       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX})
        if(MSVC)
                install(FILES ${SDLDIR}/lib/win32/msvc/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
                #install(FILES ${OPENALDIR}/lib/win32/msvc/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) # FIXME: Add MSVC OpenAL library!
@@@ -461,7 -443,7 +461,7 @@@
                install(FILES ${OPENALDIR}/lib/win32/mingw/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
        endif(MINGW)
  else(WIN32)
-       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/Source/lugaru DESTINATION ${CMAKE_INSTALL_PREFIX})
+       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${CMAKE_INSTALL_PREFIX})
  endif(WIN32)
  
  install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})

diff --combined Source/openal_wrapper.h
index 2b323428cacc211ac6dc445979ff1a454e12f942,07aa867bc52d59c0d33efb805bbaf2777e4a1ef6..e1ca95d5da5e1639db57c9ba4276fdee06ce1351
--- 1/Source/openal_wrapper.h
--- 2/Source/openal_wrapper.h
+++ b/Source/openal_wrapper.h
@@@ -5,8 -5,8 +5,8 @@@
  #include <malloc.h>
  #endif
  
- #include "AL/al.h"
- #include "AL/alc.h"
+ #include "al.h"
+ #include "alc.h"
  
  #include "ogg/ogg.h"
  #include "vorbis/vorbisfile.h"
@@@ -101,8 -101,8 +101,8 @@@ AL_API signed char OPENAL_SetOutput(in
  #  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