andrew-aladev
commented
12 years ago diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index e37cb81..ba25a6a 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -59,6 +59,10 @@ FIND_PACKAGE (CURL REQUIRED) FIND_PACKAGE (JPEG REQUIRED) INCLUDE_DIRECTORIES (${JPEG_INCLUDE_DIR})
+#alsa sound +FIND_PACKAGE (ASOUND REQUIRED) +INCLUDE_DIRECTORIES (${ASOUND_INCLUDE_DIR}) +
Find Vorbis Libs
FIND_PACKAGE (Vorbis REQUIRED) INCLUDE_DIRECTORIES (${VORBIS_INCLUDE_DIR}) @@ -76,7 +80,8 @@ INCLUDE_DIRECTORIES (${OPENAL_INCLUDE_DIR}) IF (UNIX AND NOT APPLE) # Despite being unix, Apple doesn't primarily use X11
X11
FIND_PACKAGE (X11 REQUIRED)- INCLUDE_DIRECTORIES (${X11_INCLUDE_DIR})
- FIND_PACKAGE (XXF86VM REQUIRED)
-
INCLUDE_DIRECTORIES (${X11_INCLUDE_DIR} ${XXF86VM_INCLUDE_DIR}) ENDIF ()
################################################# @@ -486,9 +491,10 @@ ENDIF()
TARGET_LINK_LIBRARIES (doom3 pthread
- Xxf86vm
- ${XXF86VM_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
- ${ASOUND_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OPENAL_LIBRARY} diff --git a/neo/cmake_modules/FindASOUND.cmake b/neo/cmake_modules/FindASOUND.cmake new file mode 100644 index 0000000..a267565 --- /dev/null +++ b/neo/cmake_modules/FindASOUND.cmake @@ -0,0 +1,17 @@ +FIND_PATH(ASOUND_INCLUDE_DIR NAMES alsa/asoundlib.h) +FIND_LIBRARY(ASOUND_LIBRARY NAMES asound) + +IF (ASOUND_INCLUDE_DIR AND ASOUND_LIBRARY)
- SET(ASOUND_FOUND TRUE) +ENDIF (ASOUND_INCLUDE_DIR AND ASOUND_LIBRARY) + +IF (ASOUND_FOUND)
- IF (NOT ASOUND_FIND_QUIETLY)
- MESSAGE(STATUS "Found asound: ${ASOUND_LIBRARY}")
- ENDIF (NOT ASOUND_FIND_QUIETLY) +ELSE (ASOUND_FOUND)
- IF (ASOUND_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find asound-dev")
- ENDIF (ASOUND_FIND_REQUIRED) +ENDIF (ASOUND_FOUND) + diff --git a/neo/cmake_modules/FindXXF86VM.cmake b/neo/cmake_modules/FindXXF86VM.cmake new file mode 100644 index 0000000..2d65dd5 --- /dev/null +++ b/neo/cmake_modules/FindXXF86VM.cmake @@ -0,0 +1,17 @@ +FIND_PATH(XXF86VM_INCLUDE_DIR NAMES X11/extensions/xf86vmode.h) +FIND_LIBRARY(XXF86VM_LIBRARY NAMES Xxf86vm) + +IF (XXF86VM_INCLUDE_DIR AND XXF86VM_LIBRARY)
- SET(XXF86VM_FOUND TRUE) +ENDIF (XXF86VM_INCLUDE_DIR AND XXF86VM_LIBRARY) + +IF (XXF86VM_FOUND)
- IF (NOT XXF86VM_FIND_QUIETLY)
- MESSAGE(STATUS "Found xxf86vm: ${XXF86VM_LIBRARY}")
- ENDIF (NOT XXF86VM_FIND_QUIETLY) +ELSE (XXF86VM_FOUND)
- IF (XXF86VM_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find xxf86vm-dev")
- ENDIF (XXF86VM_FIND_REQUIRED) +ENDIF (XXF86VM_FOUND) +
hello! your cmakelists is good but not perfect. it has no search to libxxf86vm-dev and libasound2-dev and thats why cause errors on build. here is a patch: