unix: do make clean before (re)build

This commit is contained in:
Radegast 2012-12-14 00:32:18 +00:00
parent 80aaff0b11
commit 79551c4efc

View file

@ -62,6 +62,7 @@ elseif(UNIX)
#----------------------------------------------------------------- #-----------------------------------------------------------------
if(BUNDLED_CURL) if(BUNDLED_CURL)
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a
COMMAND make --ignore-errors clean
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure COMMAND ${CROSS_COMPILE32_FLAGS} ./configure
--enable-shared=no --enable-static=yes --enable-shared=no --enable-static=yes
--without-libssh2 --enable-http --enable-ftp --without-libssh2 --enable-http --enable-ftp
@ -84,6 +85,7 @@ elseif(UNIX)
#----------------------------------------------------------------- #-----------------------------------------------------------------
if(BUNDLED_JPEG) if(BUNDLED_JPEG)
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a
COMMAND make --ignore-errors clean
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg
) )
@ -99,6 +101,7 @@ elseif(UNIX)
#----------------------------------------------------------------- #-----------------------------------------------------------------
if(BUNDLED_SDL) if(BUNDLED_SDL)
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a 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 # disable svga and directfb modules for cross-compiling on 64bit Debian Squeezy
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-video-svga --disable-video-directfb && make COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --disable-video-svga --disable-video-directfb && make
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/sdl WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/sdl
@ -134,6 +137,7 @@ elseif(UNIX)
endif() endif()
endif() endif()
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/lua/src/liblua.a 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} COMMAND ${CROSS_COMPILE32_FLAGS} make ${LUA_MAKE_TARGET}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/lua WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/lua
) )