X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=1a17e52561f4cc48d5a63884e46bd447f3cfeb59;hb=983e5332a6eefb3c294f9be1f4db5a5ecdbb176a;hp=a75db595f4af920993e50656ebbc13b9ee77047a;hpb=b312d359cb468df54e82d5e327cae4588bb32b42;p=lugaru.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a75db59..1a17e52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
@@ -94,10 +94,7 @@ set(LUGARU_H
 	${SRCDIR}/WinInput.h
 	${SRCDIR}/alstubs.h
 	${SRCDIR}/binio.h
-	${SRCDIR}/fmod.h
-	${SRCDIR}/fmod_errors.h
-	${SRCDIR}/fmod_header.h
-	${SRCDIR}/fmoddyn.h
+	${SRCDIR}/openal_wrapper.h
 	${SRCDIR}/gamegl.h
 	${SRCDIR}/glstubs.h
 	${SRCDIR}/md5.h
@@ -151,7 +148,7 @@ 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)
+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)
 endif (NOT LUGARU_FORCE_INTERNAL_OPENAL)
@@ -436,7 +433,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!
@@ -446,7 +443,7 @@ if(WIN32)
 		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})