Merged

diff --cc CMakeLists.txt
index 1f5ed78914b8693cb5f88b013cf6a7543b0bcaeb,1a17e52561f4cc48d5a63884e46bd447f3cfeb59..ad651c903a8734b27486d50860738642c9677558
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -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)

diff --cc Source/openal_wrapper.h
Simple merge