diff options
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/FindLTDL.cmake | 30 | ||||
-rw-r--r-- | cmake/mxe.cmake | 2 |
2 files changed, 1 insertions, 31 deletions
diff --git a/cmake/FindLTDL.cmake b/cmake/FindLTDL.cmake deleted file mode 100644 index 051e70c..0000000 --- a/cmake/FindLTDL.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# Find the native LTDL includes and library -# Copied verbatim from -# http://code.metager.de/source/xref/hshannover/trust/tnc-fhh/shared/cmake_modules/FindLTDL.cmake -# The above version was under GPL-2, this one is under GPL-3, for consistency -# with the rest of the colobot project. -# -# This module defines -# LTDL_INCLUDE_DIR, where to find ltdl.h, etc. -# LTDL_LIBRARY, where to find the LTDL library. -# LTDL_FOUND, If false, do not try to use LTDL. - -FIND_PATH(LTDL_INCLUDE_DIR ltdl.h) - -FIND_LIBRARY(LTDL_LIBRARY ltdl) - -IF (LTDL_INCLUDE_DIR AND LTDL_LIBRARY) - SET(LTDL_FOUND TRUE) -ELSE(LTDL_INCLUDE_DIR AND LTDL_LIBRARY) - SET(LTDL_FOUND FALSE) -ENDIF (LTDL_INCLUDE_DIR AND LTDL_LIBRARY) - -IF (LTDL_FOUND) - IF (NOT LTDL_FIND_QUIETLY) - MESSAGE(STATUS "Found LTDL: ${LTDL_LIBRARY}") - ENDIF (NOT LTDL_FIND_QUIETLY) -ELSE (LTDL_FOUND) - IF (LTDL_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find LTDL") - ENDIF (LTDL_FIND_REQUIRED) -ENDIF (LTDL_FOUND) diff --git a/cmake/mxe.cmake b/cmake/mxe.cmake index 4507a80..322ba4a 100644 --- a/cmake/mxe.cmake +++ b/cmake/mxe.cmake @@ -18,11 +18,11 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS)) ${CMAKE_FIND_ROOT_PATH}/lib/libiconv.a ${CMAKE_FIND_ROOT_PATH}/lib/libglew32s.a ${CMAKE_FIND_ROOT_PATH}/lib/libfreetype.a - ${CMAKE_FIND_ROOT_PATH}/lib/libltdl.a ${CMAKE_FIND_ROOT_PATH}/lib/libopengl32.a ${CMAKE_FIND_ROOT_PATH}/lib/libjpeg.a ${CMAKE_FIND_ROOT_PATH}/lib/libwinmm.a ${CMAKE_FIND_ROOT_PATH}/lib/libdxguid.a + ${CMAKE_FIND_ROOT_PATH}/lib/libbz2.a ) else() set(MXE 0) |