Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt (revision 812) +++ src/CMakeLists.txt (working copy) @@ -43,8 +43,6 @@ dialogs/FileDlg.cpp dialogs/ThreeButtonDlg.cpp - ../libltdl/ltdl.c - adobe/adam.cpp adobe/adam_evaluate.cpp adobe/adam_parser.cpp @@ -157,13 +155,6 @@ ) endif () -set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1) -execute_process( - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h -) -set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true) - -set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES}) +set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} /usr/lib/libltdl.so) if (USE_DEVIL) list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY}) Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 812) +++ CMakeLists.txt (working copy) @@ -224,36 +224,6 @@ ######################################## # Header Generation # ######################################## -if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h) - if (UNIX) - message("-- Configuring libltdl using \"libltdl/configure\" ...") - execute_process( - COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl - OUTPUT_QUIET - ) - else () - file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h - "/* WARNING: Generated by GG's build system. All local changes will be lost! */ -#define error_t int -#define HAVE_STDIO_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_ERRNO_H 1 -#define __WIN32__ -#define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 -#define LTDL_OBJDIR \".libs\" -#define LTDL_DLOPEN_DEPLIBS 1 -#define LTDL_SHLIBPATH_VAR \"PATH\" -#define LTDL_SHLIB_EXT \".dll\" -" - ) - endif () -endif () - configure_file( ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in ${CMAKE_HOME_DIRECTORY}/GG/Config.h