From 79551c4efc1139199d9f02c423c4c88aed63e052 Mon Sep 17 00:00:00 2001 From: Radegast Date: Fri, 14 Dec 2012 00:32:18 +0000 Subject: [PATCH] unix: do make clean before (re)build --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f61d490b..dbc6e009 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ elseif(UNIX) #----------------------------------------------------------------- if(BUNDLED_CURL) add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a + COMMAND make --ignore-errors clean COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --enable-shared=no --enable-static=yes --without-libssh2 --enable-http --enable-ftp @@ -84,6 +85,7 @@ elseif(UNIX) #----------------------------------------------------------------- if(BUNDLED_JPEG) add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a + COMMAND make --ignore-errors clean COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg ) @@ -99,6 +101,7 @@ elseif(UNIX) #----------------------------------------------------------------- if(BUNDLED_SDL) add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a + COMMAND make --ignore-errors clean # disable svga and directfb modules for cross-compiling on 64bit Debian Squeezy COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-video-svga --disable-video-directfb && make WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/sdl @@ -134,6 +137,7 @@ elseif(UNIX) endif() endif() add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/lua/src/liblua.a + COMMAND make --ignore-errors clean COMMAND ${CROSS_COMPILE32_FLAGS} make ${LUA_MAKE_TARGET} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/lua )