SDL.dll gets copied to the build directory

This commit is contained in:
Radegast 2012-07-03 22:23:20 +02:00
parent bf200705b7
commit 39c30d3d61
1 changed files with 6 additions and 3 deletions

View File

@ -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
)