X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=7a55bda573c9c5773458a48dfb92dfbed0daf0ad;hb=b468f24797ff9f29d0949abed89cb3117ea2b08d;hp=a1ee5c868569de05e6d6a0078e8323ecdd8c20e1;hpb=ac54909d55d25f3fda640e67f7ebc0ca342853d4;p=lugaru.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1ee5c8..7a55bda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,45 +139,23 @@ if(MSVC) # MSVC non-C99 support biting us hard
 endif(MSVC)
 
 if(WIN32)
-  if(CMAKE_CROSSCOMPILING)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-						  COMMAND ${CMAKE_RC_COMPILER}
-							  -I${SRCDIR}/win-res
-							  -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-							  -i${SRCDIR}/win-res/Lugaru.rc
-					      DEPENDS ${SRCDIR}/win-res/Lugaru.rc
-						  )
-  endif(CMAKE_CROSSCOMPILING)
-  if(NOT CMAKE_CROSSCOMPILING)
-   if(MSVC)
-    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-						  COMMAND rc
-							  -I${SRCDIR}/win-res
-							  -fo${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-							  ${SRCDIR}/win-res/Lugaru.rc
-					      DEPENDS ${SRCDIR}/win-res/Lugaru.rc
-						  )
-   endif(MSVC)
-   if(MINGW)
-    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-						  COMMAND windres
-							  -I${SRCDIR}/win-res
-							  -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-							  -i${SRCDIR}/win-res/Lugaru.rc
-					      DEPENDS ${SRCDIR}/win-res/Lugaru.rc
-						  )
-   endif(MINGW)
-  endif(NOT CMAKE_CROSSCOMPILING)
-
-  # !!! FIXME: get rid of this.
-  set(LUGARU_SRCS
-	${LUGARU_SRCS}
-	${SRCDIR}/WinDefs.cpp)
-
-  set(LUGARU_H
-    ${LUGARU_H}
-    ${SRCDIR}/WinDefs.h
-    ${SRCDIR}/win-res/resource.h)
+                        COMMAND ${CMAKE_RC_COMPILER}
+                        -I${SRCDIR}/win-res
+                        -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+                        -i${SRCDIR}/win-res/Lugaru.rc
+                        DEPENDS ${SRCDIR}/win-res/Lugaru.rc
+    )
+
+    # !!! FIXME: get rid of this.
+    set(LUGARU_SRCS
+        ${LUGARU_SRCS}
+        ${SRCDIR}/WinDefs.cpp)
+
+    set(LUGARU_H
+        ${LUGARU_H}
+        ${SRCDIR}/WinDefs.h
+        ${SRCDIR}/win-res/resource.h)
 endif(WIN32)
 
 if (APPLE)
@@ -200,11 +178,8 @@ option (LUGARU_FORCE_INTERNAL_OPENAL "Force internal libOpenAL, even if there's
 if (NOT LUGARU_FORCE_INTERNAL_OPENAL)
     # FIXME: We should remove bundled libs and allow building OpenAL from source, for all platforms
     if (WIN32)
-      if(CMAKE_CROSSCOMPILING)
-	pkg_check_modules(OpenAL openal)
-      else(CMAKE_CROSSCOMPILING)
-        find_package(OpenAL)
-      endif(CMAKE_CROSSCOMPILING)
+        pkg_check_modules(OPENAL openal)
+        set(OPENAL_LIBRARY ${OPENAL_LIBRARIES})
     else (WIN32)
         find_package(OpenAL REQUIRED)
     endif()
@@ -216,7 +191,7 @@ if (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL)
     message(STATUS "Using internal copy of OpenAL")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OpenAL")
     set(OPENALDIR "${DEPDIR}/OpenAL")
-    set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include/AL")
+    set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include")
     set(OPENAL_LIBRARY "")
 
     if (WIN32)