diff --git a/CMakeLists.txt b/CMakeLists.txt index b7fb74fc..a0bcf8d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,100 +1,100 @@ if(WIN32) - #----------------------------------------------------------------- - # Build bundled JPEG library - #----------------------------------------------------------------- - add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib - COMMAND NMAKE /f makefile.vc setup-v10 && NMAKE /f makefile.vc - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg - ) + #----------------------------------------------------------------- + # Build bundled JPEG library + #----------------------------------------------------------------- + add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib + COMMAND NMAKE /f makefile.vc setup-v10 && NMAKE /f makefile.vc + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg + ) - add_custom_target(bundled_jpeg - DEPENDS ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib - ) + add_custom_target(bundled_jpeg + DEPENDS ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib + ) - #----------------------------------------------------------------- - # Build bundled cURL library - #----------------------------------------------------------------- - add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib - COMMAND NMAKE /f Makefile vc-dll - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl.dll ${CMAKE_BINARY_DIR} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl - ) + #----------------------------------------------------------------- + # Build bundled cURL library + #----------------------------------------------------------------- + add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib + COMMAND NMAKE /f Makefile vc-dll + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl.dll ${CMAKE_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl + ) - add_custom_target(bundled_curl - DEPENDS ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib - ) + add_custom_target(bundled_curl + DEPENDS ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib + ) - #----------------------------------------------------------------- - # Copy bundled SDL library to the etl.exe location - #----------------------------------------------------------------- - file(COPY ${CMAKE_SOURCE_DIR}/libs/sdl-windows/lib/x86/SDL.dll DESTINATION ${CMAKE_BINARY_DIR}) + #----------------------------------------------------------------- + # Copy bundled SDL library to the etl.exe location + #----------------------------------------------------------------- + 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/lib/release-dll/libcurl_imp.lib" # DLL - "${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib" # static - "${CMAKE_SOURCE_DIR}/libs/sdl-windows/lib/x86/SDL.lib" # DLL - "${CMAKE_SOURCE_DIR}/libs/sdl-windows/lib/x86/SDLmain.lib" # DLL - PARENT_SCOPE - ) + # return compiled libs to the parent CMakeLists.txt + set(BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib" # DLL + "${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib" # static + "${CMAKE_SOURCE_DIR}/libs/sdl-windows/lib/x86/SDL.lib" # DLL + "${CMAKE_SOURCE_DIR}/libs/sdl-windows/lib/x86/SDLmain.lib" # DLL + PARENT_SCOPE + ) elseif(UNIX) - if(CROSS_COMPILE32) - set(CROSS_COMPILE32_FLAGS CFLAGS=-m32 LDFLAGS=-m32) - else(CROSS_COMPILE32) - set(CROSS_COMPILE32_FLAGS "") - endif(CROSS_COMPILE32) + if(CROSS_COMPILE32) + set(CROSS_COMPILE32_FLAGS CFLAGS=-m32 LDFLAGS=-m32) + else(CROSS_COMPILE32) + set(CROSS_COMPILE32_FLAGS "") + endif(CROSS_COMPILE32) - set(OS_LIBRARIES ${OS_LIBRARIES} pthread rt PARENT_SCOPE) # SDL deps + set(OS_LIBRARIES ${OS_LIBRARIES} pthread rt PARENT_SCOPE) # SDL deps - #----------------------------------------------------------------- - # Build bundled cURL library - #----------------------------------------------------------------- - add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a - COMMAND ${CROSS_COMPILE32_FLAGS} ./configure - --enable-shared=no --enable-static=yes - --without-libssh2 --enable-http --enable-ftp - --disable-gopher --enable-file --disable-ldap - --disable-dict --disable-telnet --disable-manual - --enable-libgcc --disable-ipv6 --disable-ares - --without-ssl --without-zlib --without-libidn - --without-librtmp && make - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl - ) + #----------------------------------------------------------------- + # Build bundled cURL library + #----------------------------------------------------------------- + add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a + COMMAND ${CROSS_COMPILE32_FLAGS} ./configure + --enable-shared=no --enable-static=yes + --without-libssh2 --enable-http --enable-ftp + --disable-gopher --enable-file --disable-ldap + --disable-dict --disable-telnet --disable-manual + --enable-libgcc --disable-ipv6 --disable-ares + --without-ssl --without-zlib --without-libidn + --without-librtmp && make + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl + ) - add_custom_target(bundled_curl - DEPENDS ${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a - ) - - #----------------------------------------------------------------- - # Build bundled JPEG library - #----------------------------------------------------------------- - add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a - COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg - ) + add_custom_target(bundled_curl + DEPENDS ${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a + ) + + #----------------------------------------------------------------- + # Build bundled JPEG library + #----------------------------------------------------------------- + add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a + COMMAND ${CROSS_COMPILE32_FLAGS} ./configure && make + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg + ) - add_custom_target(bundled_jpeg - DEPENDS ${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a - ) + add_custom_target(bundled_jpeg + DEPENDS ${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a + ) - #----------------------------------------------------------------- - # Build bundled SDL library - #----------------------------------------------------------------- - add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a - # 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 - ) + #----------------------------------------------------------------- + # Build bundled SDL library + #----------------------------------------------------------------- + add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a + # 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 + ) - add_custom_target(bundled_sdl - DEPENDS ${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a - ) - - # return compiled libs to the parent CMakeLists.txt - set(BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a" - "${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a" - "${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a" - PARENT_SCOPE - ) + add_custom_target(bundled_sdl + DEPENDS ${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a + ) + + # return compiled libs to the parent CMakeLists.txt + set(BUNDLED_LIBRARIES "${CMAKE_SOURCE_DIR}/libs/curl/lib/.libs/libcurl.a" + "${CMAKE_SOURCE_DIR}/libs/jpeg/.libs/libjpeg.a" + "${CMAKE_SOURCE_DIR}/libs/sdl/build/.libs/libSDL.a" + PARENT_SCOPE + ) endif() # return include dirs to the parent CMakeLists.txt