From 39c30d3d61a7d8932311a5d0b5985cc487957a1f Mon Sep 17 00:00:00 2001 From: Radegast Date: Tue, 3 Jul 2012 22:23:20 +0200 Subject: [PATCH] SDL.dll gets copied to the build directory --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e636b75..99dfc5e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,4 @@ if(WIN32) - # FIXME: incomplete windows build with bundled libs - #----------------------------------------------------------------- # Build bundled JPEG library #----------------------------------------------------------------- @@ -25,6 +23,11 @@ if(WIN32) DEPENDS ${CMAKE_SOURCE_DIR}/libs/curl/builds/libcurl-release-static-ipv6/lib/libcurl_a.lib ) + #----------------------------------------------------------------- + # Copy bundled SDL library + #----------------------------------------------------------------- + file(COPY ${CMAKE_SOURCE_DIR}/libs/sdl-windows/lib/x86/SDL.dll DESTINATION ${CMAKE_BINARY_DIR}) + # return compiled libs to the parent CMakeLists.txt set(BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/curl/builds/libcurl-release-static-ipv6/lib/libcurl_a.lib" "${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib" @@ -68,7 +71,7 @@ elseif(UNIX) # Build bundled SDL library #----------------------------------------------------------------- add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a - COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-pulseaudio && make + COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/sdl )